From d826391d169b16420932e0fa39b801a95167f78c Mon Sep 17 00:00:00 2001
From: lwvmobile <lwvmobile@gmail.com>
Date: Wed, 2 Aug 2023 17:17:15 -0400
Subject: [PATCH] Ncurses and Misc Tweaks;

---
 src/dsd_main.c    | 10 +++++-----
 src/dsd_ncurses.c | 26 +++++++++++++++-----------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/dsd_main.c b/src/dsd_main.c
index 9696b7b..e2e311e 100644
--- a/src/dsd_main.c
+++ b/src/dsd_main.c
@@ -555,8 +555,8 @@ initOpts (dsd_opts * opts)
   opts->mbe_out_path[0] = 0;
   opts->mbe_out_f = NULL;
   opts->mbe_out_fR = NULL; //second slot on a TDMA system
-  opts->audio_gain = 0; //0
-  opts->audio_gainR = 0; //0
+  opts->audio_gain = 0;
+  opts->audio_gainR = 0;
   opts->audio_out = 1;
   opts->wav_out_file[0] = 0;
   opts->wav_out_fileR[0] = 0;
@@ -857,8 +857,8 @@ initState (dsd_state * state)
   state->firstframe = 0;
   sprintf (state->slot1light, "%s", "");
   sprintf (state->slot2light, "%s", "");
-  state->aout_gain = 15; //was 0
-  state->aout_gainR = 15; //was 0
+  state->aout_gain = 10;
+  state->aout_gainR = 10;
   memset (state->aout_max_buf, 0, sizeof (float) * 200);
   state->aout_max_buf_p = state->aout_max_buf;
   state->aout_max_buf_idx = 0;
@@ -2719,7 +2719,7 @@ main (int argc, char **argv)
 
     if (opts.playfiles == 1)
     {
-      state.aout_gain = 25; //BUGFIX: No audio output when playing back .amb/.imb files
+
       playMbeFiles (&opts, &state, argc, argv);
     }
 
diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c
index 91aed4c..d4ca0e4 100644
--- a/src/dsd_ncurses.c
+++ b/src/dsd_ncurses.c
@@ -2272,12 +2272,12 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
 
   if (opts->audio_in_type == 8)
   {
-    printw ("| Direct TCP Input: Port [%d] Sample Rate [%d] \n", opts->tcp_portno, opts->wav_sample_rate);
+    printw ("| Direct TCP Input: Port: %d; Sample Rate: %d; \n", opts->tcp_portno, opts->wav_sample_rate);
   }
 
   if (opts->audio_in_type == 2)
   {
-    printw ("| Direct WAV File Input: %s Sample Rate [%d] \n", opts->audio_in_dev, opts->wav_sample_rate);
+    printw ("| Direct WAV File Input: %s; Sample Rate: %d; \n", opts->audio_in_dev, opts->wav_sample_rate);
   }
   if (opts->audio_in_type == 1)
   {
@@ -2386,6 +2386,10 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
   {
     printw ("| Reverse Mute - Muting Unencrypted Voice\n");
   }
+  if (opts->call_alert == 1)
+  {
+    printw ("| Call Alert Tone Enabled\n");
+  }
   if (opts->aggressive_framesync == 0) printw ("| Selective CRC ERR Bypass Enabled (RAS) \n");
   if (state->M == 1)
   {
@@ -2630,17 +2634,17 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
 
     printw ("| ");
     // #ifdef LIMAZULUTWEAKS
-    if (idas == 0) printw ("NXDN - RAN: [%02d] ", state->nxdn_last_ran);
-    if (idas == 1) printw ("IDAS - Area: [%02d] ", state->nxdn_last_ran);
+    if (idas == 0) printw ("NXDN - RAN: %02d; ", state->nxdn_last_ran);
+    if (idas == 1) printw ("IDAS - Area: %02d; ", state->nxdn_last_ran);
     // #else
     // if (idas == 0) printw ("NXDN - RAN: [%02d] ", rn);
     // if (idas == 1) printw ("IDAS - Area: [%02d] ", rn);
     // #endif
     if (state->nxdn_location_site_code != 0)
     {
-      printw ("Cat: [%s] ", state->nxdn_location_category);
-      printw ("Sys Code: [%d] ", state->nxdn_location_sys_code);
-      printw ("Site Code: [%d] ", state->nxdn_location_site_code);
+      printw ("Cat: %s; ", state->nxdn_location_category);
+      printw ("Sys Code: %d; ", state->nxdn_location_sys_code);
+      printw ("Site Code: %d; ", state->nxdn_location_site_code);
     }
 
     //if system supports Direct Frequency Assignment
@@ -2760,7 +2764,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
     printw ("| ");
     if (lls > 1 && lls < 30)
     {
-      printw ("DMR BS - DCC: [%02i] ", dcc);
+      printw ("DMR BS - DCC: %02i; ", dcc);
       // printw ("%s %s", state->dmr_branding, state->dmr_branding_sub);
       printw ("%s ", state->dmr_branding);
       printw ("%s", state->dmr_branding_sub);
@@ -2781,11 +2785,11 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
     }
     else if (lls == 32 || lls == 33 || lls == 34)
     {
-      printw ("DMR MS - DCC: [%02i] ", dcc);
+      printw ("DMR MS - DCC: %02i; ", dcc);
     }
     else if (lls == 0 || lls == 1) //P1
     {
-      printw ("P25p1  - [%05llX][%03llX][%03llX] RFSS: [%lld] SITE: [%lld] ", state->p2_wacn, state->p2_sysid, state->p2_cc, state->p2_rfssid, state->p2_siteid);
+      printw ("P25p1  - %05llX:%03llX:%03llX; RFSS: %lld SITE: %lld ", state->p2_wacn, state->p2_sysid, state->p2_cc, state->p2_rfssid, state->p2_siteid);
       if (state->p25_cc_freq != 0)
       {
         printw ("Freq: %.06lf MHz", (double)state->p25_cc_freq/1000000);
@@ -2793,7 +2797,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
     }
     else if (lls == 35 || lls == 36) //P2
     {
-      printw ("P25p2  - [%05llX][%03llX][%03llX] RFSS: [%lld] SITE: [%lld] ", state->p2_wacn, state->p2_sysid, state->p2_cc, state->p2_rfssid, state->p2_siteid);
+      printw ("P25p2  - %05llX:%03llX:%03llX; RFSS: %lld SITE: %lld ", state->p2_wacn, state->p2_sysid, state->p2_cc, state->p2_rfssid, state->p2_siteid);
       if (state->p2_wacn == 0 || state->p2_sysid == 0 || state->p2_cc == 0)
       {
         attron(COLOR_PAIR(2));