diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java index e8c8e52743..507100f0ac 100644 --- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java @@ -1116,19 +1116,9 @@ public class AudioVideoNotesPlugin extends OsmandPlugin { } public void recordAudio(double lat, double lon, final MapActivity mapActivity) { - AudioManager am = (AudioManager)app.getSystemService(Context.AUDIO_SERVICE); - int voiceGuidanceOutput = app.getSettings().AUDIO_STREAM_GUIDANCE.get(); if (ActivityCompat.checkSelfPermission(mapActivity, Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M){ - am.adjustStreamVolume(AudioManager.STREAM_MUSIC, AudioManager.ADJUST_MUTE, 0); - if (voiceGuidanceOutput != AudioManager.STREAM_MUSIC) - am.adjustStreamVolume(voiceGuidanceOutput, AudioManager.ADJUST_MUTE, 0); - } else { - am.setStreamMute(AudioManager.STREAM_MUSIC, true); - if (voiceGuidanceOutput != AudioManager.STREAM_MUSIC) - am.setStreamMute(voiceGuidanceOutput, true); - } + muteStreamMusicAndOutputGuidance(); initRecMenu(AVActionType.REC_AUDIO, lat, lon); MediaRecorder mr = new MediaRecorder(); final File f = getBaseFileName(lat, lon, app, THREEGP_EXTENSION); @@ -1140,6 +1130,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin { try { runMediaRecorder(mapActivity, mr, f); } catch (Exception e) { + unmuteStreamMusicAndOutputGuidance(); log.error("Error starting audio recorder ", e); Toast.makeText(app, app.getString(R.string.recording_error) + " : " + e.getMessage(), Toast.LENGTH_LONG).show(); @@ -1153,6 +1144,34 @@ public class AudioVideoNotesPlugin extends OsmandPlugin { } } + private void muteStreamMusicAndOutputGuidance() { + AudioManager am = (AudioManager)app.getSystemService(Context.AUDIO_SERVICE); + int voiceGuidanceOutput = app.getSettings().AUDIO_STREAM_GUIDANCE.get(); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M){ + am.adjustStreamVolume(AudioManager.STREAM_MUSIC, AudioManager.ADJUST_MUTE, 0); + if (voiceGuidanceOutput != AudioManager.STREAM_MUSIC) + am.adjustStreamVolume(voiceGuidanceOutput, AudioManager.ADJUST_MUTE, 0); + } else { + am.setStreamMute(AudioManager.STREAM_MUSIC, true); + if (voiceGuidanceOutput != AudioManager.STREAM_MUSIC) + am.setStreamMute(voiceGuidanceOutput, true); + } + } + + private void unmuteStreamMusicAndOutputGuidance() { + AudioManager am = (AudioManager) app.getSystemService(Context.AUDIO_SERVICE); + int voiceGuidanceOutput = app.getSettings().AUDIO_STREAM_GUIDANCE.get(); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M){ + am.adjustStreamVolume(AudioManager.STREAM_MUSIC, AudioManager.ADJUST_UNMUTE, 0); + if (voiceGuidanceOutput != AudioManager.STREAM_MUSIC) + am.adjustStreamVolume(voiceGuidanceOutput, AudioManager.ADJUST_UNMUTE, 0); + } else { + am.setStreamMute(AudioManager.STREAM_MUSIC, false); + if (voiceGuidanceOutput != AudioManager.STREAM_MUSIC) + am.setStreamMute(voiceGuidanceOutput, false); + } + } + public void takePhoto(final double lat, final double lon, final MapActivity mapActivity, final boolean forceInternal) { if (ActivityCompat.checkSelfPermission(mapActivity, Manifest.permission.CAMERA) @@ -1540,17 +1559,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin { mapActivity.getMapLayers().getMapInfoLayer().recreateControls(); } if (currentRecording.type == AVActionType.REC_AUDIO) { - AudioManager am = (AudioManager) app.getSystemService(Context.AUDIO_SERVICE); - int voiceGuidanceOutput = app.getSettings().AUDIO_STREAM_GUIDANCE.get(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M){ - am.adjustStreamVolume(AudioManager.STREAM_MUSIC, AudioManager.ADJUST_UNMUTE, 0); - if (voiceGuidanceOutput != AudioManager.STREAM_MUSIC) - am.adjustStreamVolume(voiceGuidanceOutput, AudioManager.ADJUST_UNMUTE, 0); - } else { - am.setStreamMute(AudioManager.STREAM_MUSIC, false); - if (voiceGuidanceOutput != AudioManager.STREAM_MUSIC) - am.setStreamMute(voiceGuidanceOutput, false); - } + unmuteStreamMusicAndOutputGuidance(); } stopCameraRecording(false); if (recordControl != null) {