fenix/Simple-Camera
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Camera.git synced 2025-06-27 09:02:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

handle playing media sounds

Browse Source 
- add MediaSoundHelper to separate logic for playing media action sounds
- add support for playing media action sounds (shutter, start and stop recording) in CameraXPreview
This commit is contained in:
darthpaul
2022-06-25 16:39:29 +01:00
parent 074351b88f
commit c398370446
5 changed files with 93 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
app/src/main/kotlin/com/simplemobiletools/camera/implementations/CameraXPreview.kt
View File

@ -37,6 +37,7 @@ import com.simplemobiletools.camera.R
import com.simplemobiletools.camera.extensions.config
import com.simplemobiletools.camera.extensions.toAppFlashMode
import com.simplemobiletools.camera.extensions.toCameraXFlashMode
import com.simplemobiletools.camera.helpers.MediaSoundHelper
import com.simplemobiletools.camera.interfaces.MyPreview
import com.simplemobiletools.commons.extensions.showErrorToast
import com.simplemobiletools.commons.extensions.toast
@ -63,6 +64,7 @@ class CameraXPreview(
private val config = activity.config
private val contentResolver = activity.contentResolver
private val mainExecutor = activity.mainExecutor
private val mediaSoundHelper = MediaSoundHelper()
private val windowMetricsCalculator = WindowMetricsCalculator.getOrCreate()
private val orientationEventListener = object : OrientationEventListener(activity, SensorManager.SENSOR_DELAY_NORMAL) {
@SuppressLint("RestrictedApi")
@ -109,6 +111,7 @@ class CameraXPreview(
init {
bindToLifeCycle()
mediaSoundHelper.loadSounds()
viewFinder.doOnLayout {
startCamera()
}
@ -315,6 +318,7 @@ class CameraXPreview(
.setMetadata(metadata)
.build()
imageCapture.takePicture(outputOptions, mainExecutor, object : OnImageSavedCallback {
override fun onImageSaved(outputFileResults: OutputFileResults) {
listener.toggleBottomButtons(false)
@ -327,6 +331,7 @@ class CameraXPreview(
Log.e(TAG, "Error", exception)
}
})
playShutterSoundIfEnabled()
}
override fun initPhotoMode() {
@ -368,15 +373,25 @@ class CameraXPreview(
.withAudioEnabled()
.start(mainExecutor) { recordEvent ->
Log.d(TAG, "recordEvent=$recordEvent ")
if (recordEvent !is VideoRecordEvent.Status) {
recordingState = recordEvent
}
recordingState = recordEvent
when(recordEvent){
is VideoRecordEvent.Start -> {
playStartVideoRecordingSoundIfEnabled()
listener.onVideoRecordingStarted()
}
if (recordEvent is VideoRecordEvent.Finalize) {
if (recordEvent.hasError()) {
// TODO: Handle errors
} else {
listener.onMediaCaptured(recordEvent.outputResults.outputUri)
is VideoRecordEvent.Status -> {
listener.onVideoDurationChanged(recordEvent.recordingStats.recordedDurationNanos)
}
is VideoRecordEvent.Finalize -> {
playStopVideoRecordingSoundIfEnabled()
listener.onVideoRecordingStopped()
if (recordEvent.hasError()) {
// TODO: Handle errors
} else {
listener.onMediaCaptured(recordEvent.outputResults.outputUri)
}
}
}
}
@ -391,4 +406,22 @@ class CameraXPreview(
"VID_$timestamp"
}
}
private fun playShutterSoundIfEnabled(){
if(config.isSoundEnabled){
mediaSoundHelper.playShutterSound()
}
}
private fun playStartVideoRecordingSoundIfEnabled(){
if(config.isSoundEnabled){
mediaSoundHelper.playStartVideoRecordingSound()
}
}
private fun playStopVideoRecordingSoundIfEnabled(){
if(config.isSoundEnabled){
mediaSoundHelper.playStopVideoRecordingSound()
}
}
}