From 6714761d8eb01ce9fe1ef5e8b35eee289a9a5a14 Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Mon, 26 Sep 2022 19:54:03 -0400 Subject: [PATCH] Mute Audio Bug Fix; Don't process audio when mute --- src/dmr_process_voice.c | 5 ++++- src/dsd_mbe.c | 25 ++++++++++++++++++++----- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/src/dmr_process_voice.c b/src/dmr_process_voice.c index 03e6eeb..7d4d6d3 100644 --- a/src/dmr_process_voice.c +++ b/src/dmr_process_voice.c @@ -371,7 +371,10 @@ if (state->currentslot == 0) state->debug_audio_errors += *errs2; - processAudio(opts, state); + if (opts->audio_out == 1) + { + processAudio(opts, state); + } if (opts->wav_out_f != NULL) { diff --git a/src/dsd_mbe.c b/src/dsd_mbe.c index 400e40b..577b5b2 100644 --- a/src/dsd_mbe.c +++ b/src/dsd_mbe.c @@ -37,7 +37,10 @@ playMbeFiles (dsd_opts * opts, dsd_state * state, int argc, char **argv) { readImbe4400Data (opts, state, imbe_d); mbe_processImbe4400Dataf (state->audio_out_temp_buf, &state->errs, &state->errs2, state->err_str, imbe_d, state->cur_mp, state->prev_mp, state->prev_mp_enhanced, opts->uvquality); - processAudio (opts, state); + if (opts->audio_out == 1) + { + processAudio(opts, state); + } if (opts->wav_out_f != NULL) { writeSynthesizedVoice (opts, state); @@ -54,7 +57,10 @@ playMbeFiles (dsd_opts * opts, dsd_state * state, int argc, char **argv) { readAmbe2450Data (opts, state, ambe_d); mbe_processAmbe2450Dataf (state->audio_out_temp_buf, &state->errs, &state->errs2, state->err_str, ambe_d, state->cur_mp, state->prev_mp, state->prev_mp_enhanced, opts->uvquality); - processAudio (opts, state); + if (opts->audio_out == 1) + { + processAudio(opts, state); + } if (opts->wav_out_f != NULL) { writeSynthesizedVoice (opts, state); @@ -476,7 +482,10 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a if (state->dmr_encL == 0 || opts->dmr_mute_encL == 0) { state->debug_audio_errors += state->errs2; - processAudio (opts, state); + if (opts->audio_out == 1) + { + processAudio(opts, state); + } if (opts->audio_out == 1) { playSynthesizedVoice (opts, state); @@ -511,7 +520,10 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a if (state->dmr_encR == 0 || opts->dmr_mute_encR == 0) { state->debug_audio_errorsR += state->errs2R; - processAudioR (opts, state); + if (opts->audio_out == 1) + { + processAudioR(opts, state); + } if (opts->audio_out == 1) { playSynthesizedVoiceR (opts, state); @@ -523,7 +535,10 @@ processMbeFrame (dsd_opts * opts, dsd_state * state, char imbe_fr[8][23], char a if (opts->dmr_stereo == 0 && (opts->unmute_encrypted_p25 == 1 || state->dmr_encL == 0) ) { state->debug_audio_errors += state->errs2; - processAudio (opts, state); + if (opts->audio_out == 1) + { + processAudio(opts, state); + } if (opts->audio_out == 1) { playSynthesizedVoice (opts, state);