Myzel394/Alibi
1
0
Fork 0
mirror of https://github.com/Myzel394/Alibi.git synced 2025-06-18 23:05:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: Improve microphone selection

Browse Source
This commit is contained in:
Myzel394 2023-10-21 19:23:53 +02:00
parent 027e41d6b6
commit 5b7ce77ad3
No known key found for this signature in database
GPG Key ID: 79CC92F37B3E1A2B
1 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
app/src/main/java/app/myzel394/alibi/ui/models/AudioRecorderModel.kt
View File

@ -16,13 +16,15 @@ import app.myzel394.alibi.services.AudioRecorderService
import app.myzel394.alibi.services.RecorderService
import app.myzel394.alibi.ui.utils.MicrophoneInfo
class AudioRecorderModel: ViewModel() {
class AudioRecorderModel : ViewModel() {
var recorderState by mutableStateOf(RecorderState.IDLE)
private set
var recordingTime by mutableStateOf<Long?>(null)
private set
var amplitudes by mutableStateOf<List<Int>>(emptyList())
private set
var selectedMicrophone by mutableStateOf<MicrophoneInfo?>(null)
private set
var onAmplitudeChange: () -> Unit = {}
@ -46,28 +48,35 @@ class AudioRecorderModel: ViewModel() {
private val connection = object : ServiceConnection {
override fun onServiceConnected(className: ComponentName, service: IBinder) {
recorderService = ((service as RecorderService.RecorderBinder).getService() as AudioRecorderService).also {recorder ->
recorder.onStateChange = { state ->
recorderState = state
}
recorder.onRecordingTimeChange = { time ->
recordingTime = time
}
recorder.onAmplitudeChange = { amps ->
amplitudes = amps
onAmplitudeChange()
}
recorder.onError = {
recorderService!!.createLastRecording()
onError()
}
}.also {
it.startRecording()
recorderService =
((service as RecorderService.RecorderBinder).getService() as AudioRecorderService).also { recorder ->
// Update UI when the service changes
recorder.onStateChange = { state ->
recorderState = state
}
recorder.onRecordingTimeChange = { time ->
recordingTime = time
}
recorder.onAmplitudeChange = { amps ->
amplitudes = amps
onAmplitudeChange()
}
recorder.onError = {
recorderService!!.createLastRecording()
onError()
}
recorder.onSelectedMicrophoneChange = { microphone ->
selectedMicrophone = microphone
}
}.also {
// Init UI from the service
it.startRecording()
recorderState = it.state
recordingTime = it.recordingTime
amplitudes = it.amplitudes
}
recorderState = it.state
recordingTime = it.recordingTime
amplitudes = it.amplitudes
selectedMicrophone = it.selectedMicrophone
}
}
override fun onServiceDisconnected(arg0: ComponentName) {
@ -80,6 +89,7 @@ class AudioRecorderModel: ViewModel() {
recorderState = RecorderState.IDLE
recordingTime = null
amplitudes = emptyList()
selectedMicrophone = null
}
fun startRecording(context: Context) {
@ -120,7 +130,7 @@ class AudioRecorderModel: ViewModel() {
}
fun changeMicrophone(microphone: MicrophoneInfo?) {
recorderService!!.selectedDevice = microphone
recorderService!!.changeMicrophone(microphone)
}
fun bindToService(context: Context) {