Prepeare for merge

diff --git a/noise_menu.c b/noise_menu.c
index f426b977d2c1c80632090b7f822d95816beb3adb..433faa992577012b95017746966b5ff3a06a66cc 100644 (file)
--- a/noise_menu.c
+++ b/noise_menu.c
@@ -47,6 +47,7 @@ static void cleanup() {
     gtk_widget_destroy(dialog);
     dialog=NULL;
     sub_menu=NULL;
+    active_menu=NO_MENU;
   }
 }
 

diff --git a/oc_menu.c b/oc_menu.c
index 3342545ef69e939f12318bf19c545074b8dee94d..5da076ff448af52b291af376ed00ba861fd19f3e 100644 (file)
--- a/oc_menu.c
+++ b/oc_menu.c
@@ -224,7 +224,7 @@ g_print("oc_menu: parent=%p\n",parent);
     BAND *band=band_get_band(i);
     if(strlen(band->title)>0) {
       GtkWidget *band_label=gtk_label_new(NULL);
-      char band_text[24];
+      char band_text[32];
       sprintf(band_text,"<b>%s</b>",band->title);
       gtk_label_set_markup(GTK_LABEL(band_label), band_text);
       //gtk_widget_override_font(band_label, pango_font_description_from_string("Arial 18"));

diff --git a/property.c b/property.c
index 7209fb85c8ec6ca76b4232fa09203fb09a8076b2..860bf91146163a388b42a08f529ad4a686561173 100644 (file)
--- a/property.c
+++ b/property.c
@@ -48,7 +48,7 @@ g_print("clearProperties\n");
 * @param filename
 */
 void loadProperties(char* filename) {
-    char string[256];  // pulseaudio names can be VERY long
+    char string[256];
     char* name;
     char* value;
     FILE* f=fopen(filename,"r");

diff --git a/radio_menu.c b/radio_menu.c
index 9463907c8aea4bd20686087f293784e865da5d88..dfea4cb9afec9f1812965d8548fdf65d261a3071 100644 (file)
--- a/radio_menu.c
+++ b/radio_menu.c
@@ -82,36 +82,26 @@ static gboolean delete_event(GtkWidget *widget, GdkEvent *event, gpointer user_d
 static void rf_gain_value_changed_cb(GtkWidget *widget, gpointer data) {
   ADC *adc=(ADC *)data;
   adc->gain=gtk_spin_button_get_value(GTK_SPIN_BUTTON(widget));
-  
+
   if(radio->device==SOAPYSDR_USB_DEVICE) {
     soapy_protocol_set_gain(receiver[0]);
   }
-
-/*
-  for(int i=0;i<radio->info.soapy.rx_gains;i++) {
-    int value=soapy_protocol_get_gain_element(active_receiver,radio->info.soapy.rx_gain[i]);
-    gtk_spin_button_set_value(GTK_SPIN_BUTTON(rx_gains[i]),(double)value);
-  }
-*/
-
 }
 
 static void rx_gain_value_changed_cb(GtkWidget *widget, gpointer data) {
   ADC *adc=(ADC *)data;
-  int gain;
   if(radio->device==SOAPYSDR_USB_DEVICE) {
-    gain=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
-    soapy_protocol_set_gain_element(receiver[0],(char *)gtk_widget_get_name(widget),gain);
-
+    adc->gain=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
+    soapy_protocol_set_gain_element(receiver[0],(char *)gtk_widget_get_name(widget),adc->gain);
 /*
     for(int i=0;i<radio->info.soapy.rx_gains;i++) {
       if(strcmp(radio->info.soapy.rx_gain[i],(char *)gtk_widget_get_name(widget))==0) {
         adc[0].rx_gain[i]=gain;
+        soapy_protocol_set_gain_element(receiver[0],(char *)gtk_widget_get_name(widget),gain);
         break;
       }
     }
 */
-
   }
 }
 
@@ -150,7 +140,10 @@ static void tx_gain_value_changed_cb(GtkWidget *widget, gpointer data) {
 static void agc_changed_cb(GtkWidget *widget, gpointer data) {
   ADC *adc=(ADC *)data;
   gboolean agc=gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget));
-  soapy_protocol_set_automatic_gain(receiver[0],agc);
+  soapy_protocol_set_automatic_gain(active_receiver,agc);
+  if(!agc) {
+    soapy_protocol_set_gain(active_receiver);
+  }
 }
 
 /*
@@ -179,9 +172,11 @@ static void vfo_divisor_value_changed_cb(GtkWidget *widget, gpointer data) {
   vfo_encoder_divisor=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
 }
 
+#ifdef GPIO
 static void gpio_settle_value_changed_cb(GtkWidget *widget, gpointer data) {
   settle_time=gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget));
 }
+#endif
 
 /*
 static void toolbar_dialog_buttons_cb(GtkWidget *widget, gpointer data) {
@@ -675,23 +670,23 @@ void radio_menu(GtkWidget *parent) {
   row=1;
 
   GtkWidget *rit_label=gtk_label_new(NULL);
-  gtk_label_set_markup(GTK_LABEL(rit_label), "<b>RIT(XIT) step (Hz):</b>");
+  gtk_label_set_markup(GTK_LABEL(rit_label), "<b>RIT/XIT step (Hz):</b>");
   gtk_grid_attach(GTK_GRID(grid),rit_label,col,row,1,1);
   row++;
 
-  GtkWidget *rit_1=gtk_radio_button_new_with_label(NULL,"1(10)");
+  GtkWidget *rit_1=gtk_radio_button_new_with_label(NULL,"1/10");
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rit_1), rit_increment==1);
   gtk_grid_attach(GTK_GRID(grid),rit_1,col,row,1,1);
   g_signal_connect(rit_1,"pressed",G_CALLBACK(rit_cb),(gpointer *)1);
   row++;
 
-  GtkWidget *rit_10=gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(rit_1),"10(100)");
+  GtkWidget *rit_10=gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(rit_1),"10/100");
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rit_10), rit_increment==10);
   gtk_grid_attach(GTK_GRID(grid),rit_10,col,row,1,1);
   g_signal_connect(rit_10,"pressed",G_CALLBACK(rit_cb),(gpointer *)10);
   row++;
 
-  GtkWidget *rit_100=gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(rit_10),"100(1000)");
+  GtkWidget *rit_100=gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(rit_10),"100/1000");
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (rit_100), rit_increment==100);
   gtk_grid_attach(GTK_GRID(grid),rit_100,col,row,1,1);
   g_signal_connect(rit_100,"pressed",G_CALLBACK(rit_cb),(gpointer *)100);

diff --git a/rx_menu.c b/rx_menu.c
index b47ef25177fe52c7e54bb11a97c22a4669a15a3b..4c45d82b1500a85e40b5cbb08ffe034b0fd8c3c8 100644 (file)
--- a/rx_menu.c
+++ b/rx_menu.c
@@ -369,7 +369,7 @@ void rx_menu(GtkWidget *parent) {
 
     output=gtk_combo_box_text_new();
     for(i=0;i<n_output_devices;i++) {
-      gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(output),NULL,output_devices[i].name);
+      gtk_combo_box_text_append(GTK_COMBO_BOX_TEXT(output),NULL,output_devices[i].description);
       if(active_receiver->audio_name!=NULL) {
         if(strcmp(active_receiver->audio_name,output_devices[i].name)==0) {
           gtk_combo_box_set_active(GTK_COMBO_BOX(output),i);

diff --git a/sliders.c b/sliders.c
index ec20ff277214112d3d5741a2b2ae6bd5dbe06056..c8a4c9500d8d1482536bf43731d9040983f45f68 100644 (file)
--- a/sliders.c
+++ b/sliders.c
@@ -123,15 +123,8 @@ int sliders_active_receiver_changed(void *data) {
     if (filter_board == CHARLY25) {
       update_att_preamp();
     } else {
-      gtk_range_set_value (GTK_RANGE(attenuation_scale),(double)adc[active_receiver->adc].attenuation);
-    }
-    char title[64];
-    if (have_rx_gain) {
-       sprintf(title,"RX GAIN");
-    } else {
-        sprintf(title,"ATT (dB)");
+      if(attenuation_scale!=NULL) gtk_range_set_value (GTK_RANGE(attenuation_scale),(double)adc[active_receiver->adc].attenuation);
     }
-    gtk_label_set_text(GTK_LABEL(attenuation_label),title);
     sliders_update();
   }
   return FALSE;
@@ -144,8 +137,7 @@ int scale_timeout_cb(gpointer data) {
 }
 
 static void attenuation_value_changed_cb(GtkWidget *widget, gpointer data) {
-  adc[active_receiver->adc].gain=gtk_range_get_value(GTK_RANGE(attenuation_scale));
-  adc[active_receiver->adc].attenuation=(int)adc[active_receiver->adc].gain;
+  adc[active_receiver->adc].attenuation=gtk_range_get_value(GTK_RANGE(attenuation_scale));
 #ifdef CLIENT_SERVER
   if(radio_is_remote) {
     send_attenuation(client_socket,active_receiver->id,(int)adc[active_receiver->adc].attenuation);
@@ -158,6 +150,7 @@ static void attenuation_value_changed_cb(GtkWidget *widget, gpointer data) {
 }
 
 void set_attenuation_value(double value) {
+  g_print("%s\n",__FUNCTION__);
   adc[active_receiver->adc].attenuation=(int)value;
   set_attenuation(adc[active_receiver->adc].attenuation);
   if(display_sliders) {
@@ -224,9 +217,10 @@ void update_att_preamp(void) {
 }
 
 void att_type_changed(void) {
+  g_print("%s\n",__FUNCTION__);
   if (filter_board == CHARLY25) {
-    gtk_widget_hide(attenuation_label);
-    gtk_widget_hide(attenuation_scale);
+    if(attenuation_label!=NULL) gtk_widget_hide(attenuation_label);
+    if(attenuation_scale!=NULL) gtk_widget_hide(attenuation_scale);
     gtk_widget_show(c25_att_preamp_label);
     gtk_widget_show(c25_att_combobox);
     gtk_widget_show(c25_preamp_combobox);
@@ -235,8 +229,8 @@ void att_type_changed(void) {
     gtk_widget_hide(c25_att_preamp_label);
     gtk_widget_hide(c25_att_combobox);
     gtk_widget_hide(c25_preamp_combobox);
-    gtk_widget_show(attenuation_label);
-    gtk_widget_show(attenuation_scale);
+    if(attenuation_label!=NULL) gtk_widget_show(attenuation_label);
+    if(attenuation_scale!=NULL) gtk_widget_show(attenuation_scale);
   }
 }
 
@@ -292,6 +286,7 @@ static void agcgain_value_changed_cb(GtkWidget *widget, gpointer data) {
 }
 
 void set_agc_gain(int rx,double value) {
+  g_print("%s\n",__FUNCTION__);
   receiver[rx]->agc_gain=value;
   SetRXAAGCTop(receiver[rx]->id, receiver[rx]->agc_gain);
   GetRXAAGCHangLevel(receiver[rx]->id, &receiver[rx]->agc_hang);
@@ -353,6 +348,7 @@ void update_af_gain() {
 }
 
 void set_af_gain(int rx,double value) {
+  g_print("%s\n",__FUNCTION__);
   receiver[rx]->volume=value;
   SetRXAPanelGain1 (receiver[rx]->id, receiver[rx]->volume);
   if(display_sliders) {
@@ -390,25 +386,32 @@ void set_af_gain(int rx,double value) {
 
 static void rf_gain_value_changed_cb(GtkWidget *widget, gpointer data) {
     adc[active_receiver->adc].gain=gtk_range_get_value(GTK_RANGE(rf_gain_scale));
+    switch(protocol) {
 #ifdef SOAPYSDR
-    if(protocol==SOAPYSDR_PROTOCOL) {
-      soapy_protocol_set_gain(active_receiver);
-    }
+      case SOAPYSDR_PROTOCOL:
+        soapy_protocol_set_gain(active_receiver);
+       break;
 #endif
+      default:
+       break;
+    }
 }
 
 void update_rf_gain() {
+  //set_rf_gain(active_receiver->id,active_receiver->rf_gain);
   set_rf_gain(active_receiver->id,adc[active_receiver->id].gain);
 }
 
 void set_rf_gain(int rx,double value) {
+  g_print("%s\n",__FUNCTION__);
   adc[receiver[rx]->adc].gain=value;
 #ifdef SOAPYSDR
   if(protocol==SOAPYSDR_PROTOCOL) {
-    soapy_protocol_set_gain(active_receiver);
+    soapy_protocol_set_gain(receiver[rx]);
   }
 #endif
   if(display_sliders) {
+    //gtk_range_set_value (GTK_RANGE(attenuation_scale),receiver[rx]->rf_gain);
     gtk_range_set_value (GTK_RANGE(rf_gain_scale),adc[receiver[rx]->id].gain);
   } else {
     if(scale_status!=RF_GAIN || scale_rx!=rx) {
@@ -427,6 +430,7 @@ void set_rf_gain(int rx,double value) {
       GtkWidget *content=gtk_dialog_get_content_area(GTK_DIALOG(scale_dialog));
       rf_gain_scale=gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL,0.0, 100.0, 1.00);
       gtk_widget_set_size_request (rf_gain_scale, 400, 30);
+      //gtk_range_set_value (GTK_RANGE(rf_gain_scale),receiver[rx]->rf_gain);
       gtk_range_set_value (GTK_RANGE(rf_gain_scale),adc[receiver[rx]->id].gain);
       gtk_widget_show(rf_gain_scale);
       gtk_container_add(GTK_CONTAINER(content),rf_gain_scale);
@@ -435,6 +439,7 @@ void set_rf_gain(int rx,double value) {
       gtk_dialog_run(GTK_DIALOG(scale_dialog));
     } else {
       g_source_remove(scale_timer);
+      //gtk_range_set_value (GTK_RANGE(rf_gain_scale),receiver[rx]->rf_gain);
       gtk_range_set_value (GTK_RANGE(rf_gain_scale),adc[receiver[rx]->id].gain);
       scale_timer=g_timeout_add(2000,scale_timeout_cb,NULL);
     }
@@ -442,6 +447,7 @@ void set_rf_gain(int rx,double value) {
 }
 
 void set_filter_width(int rx,int width) {
+  g_print("%s\n",__FUNCTION__);
     if(scale_status!=FILTER_WIDTH || scale_rx!=rx) {
       if(scale_status!=NO_FUNCTION) {
         g_source_remove(scale_timer);
@@ -472,6 +478,7 @@ void set_filter_width(int rx,int width) {
 }
 
 void set_filter_shift(int rx,int shift) {
+  g_print("%s\n",__FUNCTION__);
     if(scale_status!=FILTER_SHIFT || scale_rx!=rx) {
       if(scale_status!=NO_FUNCTION) {
         g_source_remove(scale_timer);
@@ -511,6 +518,7 @@ static void micgain_value_changed_cb(GtkWidget *widget, gpointer data) {
 }
 
 void set_mic_gain(double value) {
+  g_print("%s\n",__FUNCTION__);
   if(can_transmit) {
     mic_gain=value;
     SetTXAPanelGain1(transmitter->id,pow(10.0, mic_gain/20.0));
@@ -546,6 +554,7 @@ void set_mic_gain(double value) {
 }
 
 void set_linein_gain(int value) {
+  g_print("%s\n",__FUNCTION__);
   linein_gain=value;
   if(display_sliders) {
     gtk_range_set_value (GTK_RANGE(mic_gain_scale),linein_gain);
@@ -584,6 +593,7 @@ int update_linein_gain(void *data) {
 }
 
 void set_drive(double value) {
+  g_print("%s\n",__FUNCTION__);
   setDrive(value);
   if(display_sliders) {
     gtk_range_set_value (GTK_RANGE(drive_scale),value);
@@ -666,6 +676,7 @@ static void compressor_enable_cb(GtkWidget *widget, gpointer data) {
 }
 
 void set_squelch() {
+  g_print("%s\n",__FUNCTION__);
   setSquelch(active_receiver);
 #ifndef COMPRESSION_SLIDER_INSTEAD_OF_SQUELCH
   if(display_sliders) {
@@ -704,6 +715,7 @@ void set_squelch() {
 }
 
 void set_compression(TRANSMITTER* tx) {
+  g_print("%s\n",__FUNCTION__);
   // Update VFO panel to reflect changed value
   g_idle_add(ext_vfo_update, NULL);
 #ifdef COMPRESSION_SLIDER_INSTEAD_OF_SQUELCH
@@ -741,6 +753,7 @@ void set_compression(TRANSMITTER* tx) {
 }
 
 void show_diversity_gain() {
+  g_print("%s\n",__FUNCTION__);
     if(scale_status!=DIVERSITY_GAIN) {
       if(scale_status!=NO_FUNCTION) {
         g_source_remove(scale_timer);
@@ -768,6 +781,7 @@ void show_diversity_gain() {
 }
 
 void show_diversity_phase() {
+  g_print("%s\n",__FUNCTION__);
     if(scale_status!=DIVERSITY_PHASE) {
       if(scale_status!=NO_FUNCTION) {
         g_source_remove(scale_timer);
@@ -832,31 +846,41 @@ fprintf(stderr,"sliders_init: width=%d height=%d\n", width,height);
   gtk_grid_attach(GTK_GRID(sliders),agc_scale,4,0,2,1);
   g_signal_connect(G_OBJECT(agc_scale),"value_changed",G_CALLBACK(agcgain_value_changed_cb),NULL);
 
-  char title[64];
-  if (have_rx_gain) {
-       sprintf(title,"RX-GAIN:");
-  } else {
-        sprintf(title,"ATT (dB):");
-  }
-  attenuation_label=gtk_label_new(title);
-  gtk_widget_override_font(attenuation_label, pango_font_description_from_string(SLIDERS_FONT));
-  gtk_widget_show(attenuation_label);
-  gtk_grid_attach(GTK_GRID(sliders),attenuation_label,6,0,1,1);
-
-  if (have_rx_gain) {
-       attenuation_scale=gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL,-12.0, 48.0, 1.0);
-       gtk_range_set_value (GTK_RANGE(attenuation_scale),adc[active_receiver->adc].attenuation);
+
+  if(have_rx_gain) {
+    rf_gain_label=gtk_label_new("RX-GAIN:");
+    gtk_widget_override_font(rf_gain_label, pango_font_description_from_string(SLIDERS_FONT));
+    gtk_widget_show(rf_gain_label);
+    gtk_grid_attach(GTK_GRID(sliders),rf_gain_label,6,0,1,1);
+#ifdef SOAPYSDR
+    if(protocol==SOAPYSDR_PROTOCOL) {
+      rf_gain_scale=gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL,adc[0].min_gain, adc[0].max_gain, 1.0);
+      gtk_range_set_value (GTK_RANGE(rf_gain_scale),adc[0].gain);
+    } else {
+#endif
+      rf_gain_scale=gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL,-12.0, 48.0, 1.0);
+      gtk_range_set_value (GTK_RANGE(rf_gain_scale),adc[active_receiver->adc].attenuation);
+#ifdef SOAPYSDR
+    }
+#endif
+    gtk_widget_override_font(rf_gain_scale, pango_font_description_from_string(SLIDERS_FONT));
+    gtk_range_set_increments (GTK_RANGE(rf_gain_scale),1.0,1.0);
+    gtk_widget_show(rf_gain_scale);
+    gtk_grid_attach(GTK_GRID(sliders),rf_gain_scale,7,0,2,1);
+    g_signal_connect(G_OBJECT(rf_gain_scale),"value_changed",G_CALLBACK(rf_gain_value_changed_cb),NULL);
   } else {
-       attenuation_scale=gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL,0.0, 31.0, 1.0);
-       gtk_range_set_value (GTK_RANGE(attenuation_scale),adc[active_receiver->adc].attenuation);
+    attenuation_label=gtk_label_new("ATT (dB):");
+    gtk_widget_override_font(attenuation_label, pango_font_description_from_string(SLIDERS_FONT));
+    gtk_widget_show(attenuation_label);
+    gtk_grid_attach(GTK_GRID(sliders),attenuation_label,6,0,1,1);
+    attenuation_scale=gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL,0.0, 31.0, 1.0);
+    gtk_widget_override_font(attenuation_scale, pango_font_description_from_string(SLIDERS_FONT));
+    gtk_range_set_value (GTK_RANGE(attenuation_scale),adc[active_receiver->adc].attenuation);
+    gtk_range_set_increments (GTK_RANGE(attenuation_scale),1.0,1.0);
+    gtk_widget_show(attenuation_scale);
+    gtk_grid_attach(GTK_GRID(sliders),attenuation_scale,7,0,2,1);
+    g_signal_connect(G_OBJECT(attenuation_scale),"value_changed",G_CALLBACK(attenuation_value_changed_cb),NULL);
   }
-  gtk_range_set_increments (GTK_RANGE(attenuation_scale),1.0,1.0);
- 
-  gtk_widget_override_font(attenuation_scale, pango_font_description_from_string(SLIDERS_FONT));
-  
-  gtk_widget_show(attenuation_scale);
-  gtk_grid_attach(GTK_GRID(sliders),attenuation_scale,7,0,2,1);
-  g_signal_connect(G_OBJECT(attenuation_scale),"value_changed",G_CALLBACK(attenuation_value_changed_cb),NULL);
 
   c25_att_preamp_label = gtk_label_new("Att/PreAmp");
   gtk_widget_override_font(c25_att_preamp_label, pango_font_description_from_string(SLIDERS_FONT));