Skip to content

Commit 8e41897

Browse files
committed
commenting out some audio editor stuff, it is way too huge
1 parent 387b9e6 commit 8e41897

File tree

2 files changed

+39
-33
lines changed

2 files changed

+39
-33
lines changed

Diff for: app/src/main/kotlin/com/simplemobiletools/voicerecorder/activities/EditRecordingActivity.kt

+23-17
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,9 @@ import com.simplemobiletools.commons.extensions.*
1515
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
1616
import com.simplemobiletools.voicerecorder.R
1717
import com.simplemobiletools.voicerecorder.databinding.ActivityEditRecordingBinding
18-
import com.simplemobiletools.voicerecorder.extensions.deleteRecordings
1918
import com.simplemobiletools.voicerecorder.extensions.getAllRecordings
2019
import com.simplemobiletools.voicerecorder.helpers.getAudioFileContentUri
2120
import com.simplemobiletools.voicerecorder.models.Recording
22-
import linc.com.amplituda.Amplituda
23-
import linc.com.amplituda.AmplitudaResult
24-
import linc.com.amplituda.callback.AmplitudaSuccessListener
25-
import linc.com.library.AudioTool
2621
import java.io.File
2722
import java.util.Timer
2823
import java.util.TimerTask
@@ -88,7 +83,7 @@ class EditRecordingActivity : SimpleActivity() {
8883
}
8984

9085
private fun updateVisualization() {
91-
Amplituda(this).apply {
86+
/*Amplituda(this).apply {
9287
try {
9388
val uri = Uri.parse(currentRecording.path)
9489
@@ -121,7 +116,7 @@ class EditRecordingActivity : SimpleActivity() {
121116
showErrorToast(e)
122117
return
123118
}
124-
}
119+
}*/
125120
}
126121

127122
private fun setupColors() {
@@ -165,14 +160,15 @@ class EditRecordingActivity : SimpleActivity() {
165160
val durationMillisPart = String.format("%.3f", durationMillis - durationMillis.toInt()).replace("0.", "")
166161
val startFormatted = (startMillis.toInt()).getFormattedDuration(true) + ".$startMillisPart"
167162
val durationFormatted = (durationMillis.toInt()).getFormattedDuration(true) + ".$durationMillisPart"
168-
modifyAudioFile(currentRecording)
163+
/*modifyAudioFile(currentRecording)
169164
.cutAudio(startFormatted, durationFormatted) {
170165
progressStart = binding.recordingVisualizer.startPosition
171166
playRecording(it.path, null, it.name, durationMillis.toInt(), true)
172167
}
173-
.release()
168+
.release()*/
174169
// playRecording()
175170
}
171+
176172
R.id.cut -> {
177173
val start = binding.recordingVisualizer.startPosition
178174
val end = binding.recordingVisualizer.endPosition
@@ -193,20 +189,28 @@ class EditRecordingActivity : SimpleActivity() {
193189
fun merge() {
194190
if (leftPart != null && rightPart != null) {
195191
ensureBackgroundThread {
196-
val tempFile = File.createTempFile("${currentRecording.title}.edit.", ".${currentRecording.title.getFilenameExtension()}", cacheDir)
197-
AudioTool.getInstance(this)
192+
val tempFile =
193+
File.createTempFile("${currentRecording.title}.edit.", ".${currentRecording.title.getFilenameExtension()}", cacheDir)
194+
/*AudioTool.getInstance(this)
198195
.joinAudios(arrayOf(leftPart, rightPart), tempFile.path) {
199196
runOnUiThread {
200-
currentRecording = Recording(-1, it.name, it.path, it.lastModified().toInt(), (startMillis + realEnd).toInt(), it.getProperSize(false).toInt())
197+
currentRecording = Recording(
198+
-1,
199+
it.name,
200+
it.path,
201+
it.lastModified().toInt(),
202+
(startMillis + realEnd).toInt(),
203+
it.getProperSize(false).toInt()
204+
)
201205
updateVisualization()
202206
playRecording(currentRecording.path, currentRecording.id, currentRecording.title, currentRecording.duration, true)
203207
}
204-
}
208+
}*/
205209
}
206210
}
207211
}
208212

209-
modifyAudioFile(currentRecording)
213+
/*modifyAudioFile(currentRecording)
210214
.cutAudio("00:00:00", startFormatted) {
211215
leftPart = it
212216
merge()
@@ -215,7 +219,7 @@ class EditRecordingActivity : SimpleActivity() {
215219
.cutAudio(endFormatted, realEndFormatted) {
216220
rightPart = it
217221
merge()
218-
}
222+
}*/
219223
}
220224
// R.id.save -> {
221225
// binding.recordingVisualizer.clearEditing()
@@ -227,13 +231,15 @@ class EditRecordingActivity : SimpleActivity() {
227231
binding.recordingVisualizer.clearEditing()
228232
playRecording(currentRecording.path, currentRecording.id, currentRecording.title, currentRecording.duration, true)
229233
}
234+
230235
R.id.reset -> {
231236
progressStart = 0f
232237
binding.recordingVisualizer.clearEditing()
233238
currentRecording = recording
234239
updateVisualization()
235240
playRecording(currentRecording.path, currentRecording.id, currentRecording.title, currentRecording.duration, true)
236241
}
242+
237243
else -> return@setOnMenuItemClickListener false
238244
}
239245
return@setOnMenuItemClickListener true
@@ -388,10 +394,10 @@ class EditRecordingActivity : SimpleActivity() {
388394
super.onPause()
389395
}
390396

391-
private fun modifyAudioFile(recording: Recording): AudioTool {
397+
/*private fun modifyAudioFile(recording: Recording): AudioTool {
392398
return AudioTool.getInstance(this)
393399
.withAudio(copyToTempFile(recording))
394-
}
400+
}*/
395401

396402
private fun copyToTempFile(recording: Recording): File {
397403
try {

Diff for: gradle/libs.versions.toml

+16-16
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ simple-commons = "8e7dd4508e"
1616
#AudioRecordView
1717
audiorecordview = "1.0.4"
1818
#AudioTool
19-
audiotool = "1.2.1"
20-
amplituda = "2.2.2"
21-
waveformseekbar = "5.0.1"
22-
mobileffmpeg = "4.4"
19+
#audiotool = "1.2.1"
20+
#amplituda = "2.2.2"
21+
#waveformseekbar = "5.0.1"
22+
#mobileffmpeg = "4.4"
2323
#TAndroidLame
2424
tandroidlame = "1.1"
2525
#AutofitTextView
@@ -52,10 +52,10 @@ eventbus = { module = "org.greenrobot:eventbus", version.ref = "eventbus" }
5252
#AudioRecordView
5353
audiorecordview = { module = "com.github.Armen101:AudioRecordView", version.ref = "audiorecordview" }
5454
#AudioTool
55-
audiotool = { module = "com.github.lincollincol:AudioTool", version.ref = "audiotool" }
56-
amplituda = { module = "com.github.lincollincol:amplituda", version.ref = "amplituda" }
57-
mobileffmpeg = { module = "com.arthenica:mobile-ffmpeg-full", version.ref = "mobileffmpeg" }
58-
waveformseekbar = { module = "com.github.massoudss:waveformSeekBar", version.ref = "waveformseekbar" }
55+
#audiotool = { module = "com.github.lincollincol:AudioTool", version.ref = "audiotool" }
56+
#amplituda = { module = "com.github.lincollincol:amplituda", version.ref = "amplituda" }
57+
#mobileffmpeg = { module = "com.arthenica:mobile-ffmpeg-full", version.ref = "mobileffmpeg" }
58+
#waveformseekbar = { module = "com.github.massoudss:waveformSeekBar", version.ref = "waveformseekbar" }
5959
#TAndroidLame
6060
tandroidlame = { module = "com.github.naman14:TAndroidLame", version.ref = "tandroidlame" }
6161
#AutofitTextView
@@ -65,14 +65,14 @@ room = [
6565
"androidx-room-ktx",
6666
"androidx-room-runtime",
6767
]
68-
audiotool = [
69-
"audiotool",
70-
"mobileffmpeg",
71-
]
72-
amplituda = [
73-
"amplituda",
74-
"waveformseekbar",
75-
]
68+
#audiotool = [
69+
# "audiotool",
70+
# "mobileffmpeg",
71+
#]
72+
#amplituda = [
73+
# "amplituda",
74+
# "waveformseekbar",
75+
#]
7676
[plugins]
7777
android = { id = "com.android.application", version.ref = "gradlePlugins-agp" }
7878
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }

0 commit comments

Comments
 (0)