Myzel394/Alibi
1
0
Fork 0
mirror of https://github.com/Myzel394/Alibi.git synced 2025-06-19 07:15:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Improve selectedDevice; Use own rememberState; Reset selectedDevice on stop

Browse Source
This commit is contained in:
Myzel394 2023-10-21 19:15:15 +02:00
parent 57424cc1d3
commit a515d2b36c
No known key found for this signature in database
GPG Key ID: 79CC92F37B3E1A2B
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/app/myzel394/alibi/services/AudioRecorderService.kt
View File

@ -12,7 +12,7 @@ import android.os.Build
import app.myzel394.alibi.ui.utils.MicrophoneInfo import app.myzel394.alibi.ui.utils.MicrophoneInfo
import java.lang.IllegalStateException import java.lang.IllegalStateException
class AudioRecorderService: IntervalRecorderService() { class AudioRecorderService : IntervalRecorderService() {
var amplitudesAmount = 1000 var amplitudesAmount = 1000
var selectedDevice: MicrophoneInfo? = null var selectedDevice: MicrophoneInfo? = null
@ -27,11 +27,11 @@ class AudioRecorderService: IntervalRecorderService() {
val audioManger = getSystemService(AUDIO_SERVICE)!! as AudioManager val audioManger = getSystemService(AUDIO_SERVICE)!! as AudioManager
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
if (selectedDevice == null) { if (selectedDevice == null) {
audioManger.clearCommunicationDevice() audioManger.clearCommunicationDevice()
} else { } else {
audioManger.setCommunicationDevice(selectedDevice!!.deviceInfo) audioManger.setCommunicationDevice(selectedDevice!!.deviceInfo)
} }
} else { } else {
if (selectedDevice == null) { if (selectedDevice == null) {
audioManger.stopBluetoothSco() audioManger.stopBluetoothSco()
@ -104,6 +104,7 @@ class AudioRecorderService: IntervalRecorderService() {
super.stop() super.stop()
resetRecorder() resetRecorder()
selectedDevice = null
} }
override fun getAmplitudeAmount(): Int = amplitudesAmount override fun getAmplitudeAmount(): Int = amplitudesAmount

7
app/src/main/java/app/myzel394/alibi/ui/components/AudioRecorder/organisms/RecordingStatus.kt
View File

@ -168,10 +168,13 @@ fun RecordingStatus(
if (microphones.isNotEmpty()) { if (microphones.isNotEmpty()) {
MicrophoneSelection( MicrophoneSelection(
microphones = microphones, microphones = microphones,
selectedMicrophone = audioRecorder.recorderService!!.selectedDevice, selectedMicrophone = audioRecorder.selectedDevice,
onSelect = { onSelect = {
audioRecorder.changeMicrophone(it) audioRecorder.changeMicrophone(it)
audioRecorder.recorderService!!.startNewCycle()
if (!audioRecorder.isPaused) {
audioRecorder.recorderService!!.startNewCycle()
}
} }
) )
} }