updated menu to include FreeDV text in General tab. Updated libwdsp.so.

diff --git a/menu.c b/menu.c
index b72b96006fe73761d83165f8dafc4e43a054a2b0..9bc6f5d2d36978a12281148f4c784a77f22b2a28 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -450,7 +450,7 @@ static gboolean menu_pressed_event_cb (GtkWidget *widget,
 
   GtkWidget *general_label=gtk_label_new("General");
   GtkWidget *general_grid=gtk_grid_new();
-  gtk_grid_set_row_homogeneous(GTK_GRID(general_grid),TRUE);
+  //gtk_grid_set_row_homogeneous(GTK_GRID(general_grid),TRUE);
   gtk_grid_set_column_homogeneous(GTK_GRID(general_grid),TRUE);
 
 
@@ -482,6 +482,16 @@ static gboolean menu_pressed_event_cb (GtkWidget *widget,
     gtk_grid_attach(GTK_GRID(general_grid),rx_random_b,0,2,1,1);
     g_signal_connect(rx_random_b,"toggled",G_CALLBACK(rx_random_cb),NULL);
 
+#ifdef FREEDV
+  GtkWidget *freedv_text_label=gtk_label_new("FreeDV Text Message: ");
+  gtk_grid_attach(GTK_GRID(general_grid),freedv_text_label,0,3,1,1);
+
+  GtkWidget *freedv_text=gtk_entry_new();
+  gtk_entry_set_text(GTK_ENTRY(freedv_text),freedv_tx_text_data);
+  gtk_grid_attach(GTK_GRID(general_grid),freedv_text,0,4,1,1);
+  g_signal_connect(freedv_text,"changed",G_CALLBACK(freedv_text_changed_cb),NULL);
+#endif
+
 /*
     GtkWidget *rx_preamp_b=gtk_check_button_new_with_label("Preamp");
     //gtk_widget_override_font(rx_preamp_b, pango_font_description_from_string("Arial 18"));
@@ -1224,21 +1234,6 @@ static gboolean menu_pressed_event_cb (GtkWidget *widget,
 
 
 
-#ifdef FREEDV
-  GtkWidget *freedv_label=gtk_label_new("FREEDV");
-  GtkWidget *freedv_grid=gtk_grid_new();
-
-  GtkWidget *freedv_text_label=gtk_label_new("Text Message: ");
-  gtk_grid_attach(GTK_GRID(freedv_grid),freedv_text_label,0,0,1,1);
-
-  GtkWidget *freedv_text=gtk_entry_new();
-  gtk_entry_set_text(GTK_ENTRY(freedv_text),freedv_tx_text_data);
-  gtk_grid_attach(GTK_GRID(freedv_grid),freedv_text,0,1,4,1);
-  g_signal_connect(freedv_text,"changed",G_CALLBACK(freedv_text_changed_cb),NULL);
-
-  id=gtk_notebook_append_page(GTK_NOTEBOOK(notebook),freedv_grid,freedv_label);
-#endif
-
 
 
   GtkWidget *exit_label=gtk_label_new("Exit");

diff --git a/pihpsdr b/pihpsdr
index 5caddc8cd7d00fa637cef8c4b978c988b93851ec..9f371c3b7a64330e7dd58cc83e3b208de87ec89d 100755 (executable)
Binary files a/pihpsdr and b/pihpsdr differ

diff --git a/release/pihpsdr.tar b/release/pihpsdr.tar
index 3382e1f6998d07dc8e3797e0ed3c425493eeb077..eade2e57f625b2cdf9fccdcf0d0170033a1c075c 100644 (file)
Binary files a/release/pihpsdr.tar and b/release/pihpsdr.tar differ

diff --git a/release/pihpsdr/libwdsp.so b/release/pihpsdr/libwdsp.so
index 09179a90b3e829be5443ad7bea27b3b241687ea7..b092eeca02562e5ed0ab1e740e3b6e88c6045f87 100755 (executable)
Binary files a/release/pihpsdr/libwdsp.so and b/release/pihpsdr/libwdsp.so differ

diff --git a/release/pihpsdr/pihpsdr b/release/pihpsdr/pihpsdr
index 5caddc8cd7d00fa637cef8c4b978c988b93851ec..9f371c3b7a64330e7dd58cc83e3b208de87ec89d 100755 (executable)
Binary files a/release/pihpsdr/pihpsdr and b/release/pihpsdr/pihpsdr differ