Skip to content

Commit

Permalink
Migrate to Amplituda
Browse files Browse the repository at this point in the history
  • Loading branch information
massoudss authored and Masoud Soleimani committed Sep 10, 2020
1 parent 9354dcb commit 046b028
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 301 deletions.
13 changes: 0 additions & 13 deletions lib/src/main/java/com/masoudss/lib/WaveformOptions.kt
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
package com.masoudss.lib

import android.os.Build
import androidx.annotation.RequiresApi
import com.masoudss.lib.soundParser.SoundFile
import linc.com.amplituda.Amplituda
import java.io.File

object WaveformOptions {

private val amplituda by lazy { Amplituda() }

@RequiresApi(Build.VERSION_CODES.JELLY_BEAN)
@JvmStatic
fun getSampleFrom(file: File, onSuccess:(samples: IntArray) -> Unit) {
amplituda.fromFile(file)
Expand All @@ -19,20 +15,11 @@ object WaveformOptions {
}
}

@RequiresApi(Build.VERSION_CODES.JELLY_BEAN)
@JvmStatic
fun getSampleFrom(path: String, onSuccess: (IntArray) -> Unit) {
amplituda.fromPath(path)
.amplitudesAsList {
onSuccess(it.toIntArray())
}
}

fun addCustomExtension(extension: String) = SoundFile.addCustomExtension(extension)

fun removeCustomExtension(extension: String) = SoundFile.removeCustomExtension(extension)

fun addCustomExtensions(extensions: List<String>) = SoundFile.addCustomExtensions(extensions)

fun removeCustomExtensions(extensions: List<String>) = SoundFile.removeCustomExtensions(extensions)
}
22 changes: 0 additions & 22 deletions lib/src/main/java/com/masoudss/lib/WaveformSeekBar.kt
Original file line number Diff line number Diff line change
Expand Up @@ -195,28 +195,6 @@ class WaveformSeekBar : View {

var onProgressChanged : SeekBarOnProgressChanged? = null

@RequiresApi(Build.VERSION_CODES.JELLY_BEAN)
fun setSampleFrom(path: String, ignoreExtension: Boolean = false) {
WaveformOptions.getSampleFrom(path) {
sample = it
}
}

@RequiresApi(Build.VERSION_CODES.JELLY_BEAN)
fun setSampleFrom(file: File, ignoreExtension: Boolean = false) {
WaveformOptions.getSampleFrom(file) {
sample = it
}
}

fun addCustomExtension(extension: String) = WaveformOptions.addCustomExtension(extension)

fun removeCustomExtension(extension: String) = WaveformOptions.removeCustomExtension(extension)

fun addCustomExtensions(extensions: List<String>) = WaveformOptions.addCustomExtensions(extensions)

fun removeCustomExtensions(extensions: List<String>) = WaveformOptions.removeCustomExtensions(extensions)

var sample: IntArray? = null
set(value){
field = value
Expand Down
266 changes: 0 additions & 266 deletions lib/src/main/java/com/masoudss/lib/soundParser/SoundFile.kt

This file was deleted.

0 comments on commit 046b028

Please sign in to comment.