From 370d6be28e9eeaf7355a5a22c7f92a3f991c79e5 Mon Sep 17 00:00:00 2001 From: lwvmobile <59371473+lwvmobile@users.noreply.github.com> Date: Tue, 20 Sep 2022 15:46:17 -0400 Subject: [PATCH] NXDN/NCurses/CLI Per Call Bug Fix NXDN/NCurses/CLI Per Call Bug Fix --- src/dsd_main.c | 5 +++-- src/dsd_ncurses.c | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/dsd_main.c b/src/dsd_main.c index 0567508..761511f 100644 --- a/src/dsd_main.c +++ b/src/dsd_main.c @@ -1153,6 +1153,7 @@ main (int argc, char **argv) strncpy(opts.wav_out_file, optarg, 1023); opts.wav_out_file[1023] = '\0'; fprintf (stderr,"Writing + Appending decoded audio to file %s\n", opts.wav_out_file); + opts.dmr_stereo_wav = 0; openWavOutFile (&opts, &state); break; @@ -1584,7 +1585,7 @@ main (int argc, char **argv) opts.playoffset = 0; opts.playoffsetR = 0; opts.delay = 0; - if (strlen(opts.wav_out_file) > 0) + if (strlen(opts.wav_out_file) > 0 && opts.dmr_stereo_wav == 0) { openWavOutFile (&opts, &state); } @@ -1599,7 +1600,7 @@ main (int argc, char **argv) opts.playoffset = 0; opts.playoffsetR = 0; opts.delay = 0; - if (strlen(opts.wav_out_file) > 0) + if (strlen(opts.wav_out_file) > 0 && opts.dmr_stereo_wav == 0) { openWavOutFile (&opts, &state); } diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c index ac66de7..8f39607 100644 --- a/src/dsd_ncurses.c +++ b/src/dsd_ncurses.c @@ -1621,7 +1621,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) call_matrix[9][5] = time(NULL); //open wav file if enabled and both rd and tg are not 0 - if (opts->dmr_stereo_wav == 1 && src != 0 && tgn != 0) + if (opts->dmr_stereo_wav == 1 && src != 0 ) //&& tgn != 0, some TG can be 0 on NXDN { //close old first, assign name based on time and radio, open wav file closeWavOutFileL (opts, state); @@ -1828,14 +1828,14 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) { printw ("| Writing Symbol Capture to Bin File: %s\n", opts->symbol_out_file); } - if (opts->wav_out_file[0] != 0 && opts->dmr_stereo == 0) + if (opts->wav_out_file[0] != 0 && opts->dmr_stereo_wav == 0) { printw ("| Writing Decoded Audio to WAV File: %s\n", opts->wav_out_file); } if (opts->dmr_stereo_wav == 1) //opts->wav_out_file[0] != 0 && { - printw ("| Per Call WAV S1 - %s\n", opts->wav_out_file); - printw ("| Per Call WAV S2 - %s\n", opts->wav_out_fileR); + printw ("| Per Call - %s\n", opts->wav_out_file); + printw ("| Per Call - %s\n", opts->wav_out_fileR); }