fenix/Simple-Voice-Recorder
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Voice-Recorder.git synced 2025-06-05 21:59:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

commenting out some audio editor stuff, it is way too huge

Browse Source
This commit is contained in:
tibbi
2023-10-09 11:14:05 +02:00
parent 387b9e6b00
commit 8e418971a8
2 changed files with 39 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/src/main/kotlin/com/simplemobiletools/voicerecorder/activities/EditRecordingActivity.kt
View File

@@ -15,14 +15,9 @@ import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.voicerecorder.R import com.simplemobiletools.voicerecorder.R
import com.simplemobiletools.voicerecorder.databinding.ActivityEditRecordingBinding import com.simplemobiletools.voicerecorder.databinding.ActivityEditRecordingBinding
import com.simplemobiletools.voicerecorder.extensions.deleteRecordings
import com.simplemobiletools.voicerecorder.extensions.getAllRecordings import com.simplemobiletools.voicerecorder.extensions.getAllRecordings
import com.simplemobiletools.voicerecorder.helpers.getAudioFileContentUri import com.simplemobiletools.voicerecorder.helpers.getAudioFileContentUri
import com.simplemobiletools.voicerecorder.models.Recording import com.simplemobiletools.voicerecorder.models.Recording
import linc.com.amplituda.Amplituda
import linc.com.amplituda.AmplitudaResult
import linc.com.amplituda.callback.AmplitudaSuccessListener
import linc.com.library.AudioTool
import java.io.File import java.io.File
import java.util.Timer import java.util.Timer
import java.util.TimerTask import java.util.TimerTask
@@ -88,7 +83,7 @@ class EditRecordingActivity : SimpleActivity() {
} }
private fun updateVisualization() { private fun updateVisualization() {
Amplituda(this).apply { /*Amplituda(this).apply {
try { try {
val uri = Uri.parse(currentRecording.path) val uri = Uri.parse(currentRecording.path)
@@ -121,7 +116,7 @@ class EditRecordingActivity : SimpleActivity() {
showErrorToast(e) showErrorToast(e)
return return
} }
} }*/
} }
private fun setupColors() { private fun setupColors() {
@@ -165,14 +160,15 @@ class EditRecordingActivity : SimpleActivity() {
val durationMillisPart = String.format("%.3f", durationMillis - durationMillis.toInt()).replace("0.", "") val durationMillisPart = String.format("%.3f", durationMillis - durationMillis.toInt()).replace("0.", "")
val startFormatted = (startMillis.toInt()).getFormattedDuration(true) + ".$startMillisPart" val startFormatted = (startMillis.toInt()).getFormattedDuration(true) + ".$startMillisPart"
val durationFormatted = (durationMillis.toInt()).getFormattedDuration(true) + ".$durationMillisPart" val durationFormatted = (durationMillis.toInt()).getFormattedDuration(true) + ".$durationMillisPart"
modifyAudioFile(currentRecording) /*modifyAudioFile(currentRecording)
.cutAudio(startFormatted, durationFormatted) { .cutAudio(startFormatted, durationFormatted) {
progressStart = binding.recordingVisualizer.startPosition progressStart = binding.recordingVisualizer.startPosition
playRecording(it.path, null, it.name, durationMillis.toInt(), true) playRecording(it.path, null, it.name, durationMillis.toInt(), true)
} }
.release() .release()*/
// playRecording() // playRecording()
} }
R.id.cut -> { R.id.cut -> {
val start = binding.recordingVisualizer.startPosition val start = binding.recordingVisualizer.startPosition
val end = binding.recordingVisualizer.endPosition val end = binding.recordingVisualizer.endPosition
@@ -193,20 +189,28 @@ class EditRecordingActivity : SimpleActivity() {
fun merge() { fun merge() {
if (leftPart != null && rightPart != null) { if (leftPart != null && rightPart != null) {
ensureBackgroundThread { ensureBackgroundThread {
val tempFile = File.createTempFile("${currentRecording.title}.edit.", ".${currentRecording.title.getFilenameExtension()}", cacheDir) val tempFile =
AudioTool.getInstance(this) File.createTempFile("${currentRecording.title}.edit.", ".${currentRecording.title.getFilenameExtension()}", cacheDir)
/*AudioTool.getInstance(this)
.joinAudios(arrayOf(leftPart, rightPart), tempFile.path) { .joinAudios(arrayOf(leftPart, rightPart), tempFile.path) {
runOnUiThread { runOnUiThread {
currentRecording = Recording(-1, it.name, it.path, it.lastModified().toInt(), (startMillis + realEnd).toInt(), it.getProperSize(false).toInt()) currentRecording = Recording(
-1,
it.name,
it.path,
it.lastModified().toInt(),
(startMillis + realEnd).toInt(),
it.getProperSize(false).toInt()
)
updateVisualization() updateVisualization()
playRecording(currentRecording.path, currentRecording.id, currentRecording.title, currentRecording.duration, true) playRecording(currentRecording.path, currentRecording.id, currentRecording.title, currentRecording.duration, true)
} }
} }*/
} }
} }
} }
modifyAudioFile(currentRecording) /*modifyAudioFile(currentRecording)
.cutAudio("00:00:00", startFormatted) { .cutAudio("00:00:00", startFormatted) {
leftPart = it leftPart = it
merge() merge()
@@ -215,7 +219,7 @@ class EditRecordingActivity : SimpleActivity() {
.cutAudio(endFormatted, realEndFormatted) { .cutAudio(endFormatted, realEndFormatted) {
rightPart = it rightPart = it
merge() merge()
} }*/
} }
// R.id.save -> { // R.id.save -> {
// binding.recordingVisualizer.clearEditing() // binding.recordingVisualizer.clearEditing()
@@ -227,6 +231,7 @@ class EditRecordingActivity : SimpleActivity() {
binding.recordingVisualizer.clearEditing() binding.recordingVisualizer.clearEditing()
playRecording(currentRecording.path, currentRecording.id, currentRecording.title, currentRecording.duration, true) playRecording(currentRecording.path, currentRecording.id, currentRecording.title, currentRecording.duration, true)
} }
R.id.reset -> { R.id.reset -> {
progressStart = 0f progressStart = 0f
binding.recordingVisualizer.clearEditing() binding.recordingVisualizer.clearEditing()
@@ -234,6 +239,7 @@ class EditRecordingActivity : SimpleActivity() {
updateVisualization() updateVisualization()
playRecording(currentRecording.path, currentRecording.id, currentRecording.title, currentRecording.duration, true) playRecording(currentRecording.path, currentRecording.id, currentRecording.title, currentRecording.duration, true)
} }
else -> return@setOnMenuItemClickListener false else -> return@setOnMenuItemClickListener false
} }
return@setOnMenuItemClickListener true return@setOnMenuItemClickListener true
@@ -388,10 +394,10 @@ class EditRecordingActivity : SimpleActivity() {
super.onPause() super.onPause()
} }
private fun modifyAudioFile(recording: Recording): AudioTool { /*private fun modifyAudioFile(recording: Recording): AudioTool {
return AudioTool.getInstance(this) return AudioTool.getInstance(this)
.withAudio(copyToTempFile(recording)) .withAudio(copyToTempFile(recording))
} }*/
private fun copyToTempFile(recording: Recording): File { private fun copyToTempFile(recording: Recording): File {
try { try {

32
gradle/libs.versions.toml
View File

@@ -16,10 +16,10 @@ simple-commons = "8e7dd4508e"
#AudioRecordView #AudioRecordView
audiorecordview = "1.0.4" audiorecordview = "1.0.4"
#AudioTool #AudioTool
audiotool = "1.2.1" #audiotool = "1.2.1"
amplituda = "2.2.2" #amplituda = "2.2.2"
waveformseekbar = "5.0.1" #waveformseekbar = "5.0.1"
mobileffmpeg = "4.4" #mobileffmpeg = "4.4"
#TAndroidLame #TAndroidLame
tandroidlame = "1.1" tandroidlame = "1.1"
#AutofitTextView #AutofitTextView
@@ -52,10 +52,10 @@ eventbus = { module = "org.greenrobot:eventbus", version.ref = "eventbus" }
#AudioRecordView #AudioRecordView
audiorecordview = { module = "com.github.Armen101:AudioRecordView", version.ref = "audiorecordview" } audiorecordview = { module = "com.github.Armen101:AudioRecordView", version.ref = "audiorecordview" }
#AudioTool #AudioTool
audiotool = { module = "com.github.lincollincol:AudioTool", version.ref = "audiotool" } #audiotool = { module = "com.github.lincollincol:AudioTool", version.ref = "audiotool" }
amplituda = { module = "com.github.lincollincol:amplituda", version.ref = "amplituda" } #amplituda = { module = "com.github.lincollincol:amplituda", version.ref = "amplituda" }
mobileffmpeg = { module = "com.arthenica:mobile-ffmpeg-full", version.ref = "mobileffmpeg" } #mobileffmpeg = { module = "com.arthenica:mobile-ffmpeg-full", version.ref = "mobileffmpeg" }
waveformseekbar = { module = "com.github.massoudss:waveformSeekBar", version.ref = "waveformseekbar" } #waveformseekbar = { module = "com.github.massoudss:waveformSeekBar", version.ref = "waveformseekbar" }
#TAndroidLame #TAndroidLame
tandroidlame = { module = "com.github.naman14:TAndroidLame", version.ref = "tandroidlame" } tandroidlame = { module = "com.github.naman14:TAndroidLame", version.ref = "tandroidlame" }
#AutofitTextView #AutofitTextView
@@ -65,14 +65,14 @@ room = [
"androidx-room-ktx", "androidx-room-ktx",
"androidx-room-runtime", "androidx-room-runtime",
] ]
audiotool = [ #audiotool = [
"audiotool", # "audiotool",
"mobileffmpeg", # "mobileffmpeg",
] #]
amplituda = [ #amplituda = [
"amplituda", # "amplituda",
"waveformseekbar", # "waveformseekbar",
] #]
[plugins] [plugins]
android = { id = "com.android.application", version.ref = "gradlePlugins-agp" } android = { id = "com.android.application", version.ref = "gradlePlugins-agp" }
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }