Remove iq processing debug from new_protocol. Change code to detect vox_menu closing.

diff --git a/new_protocol.c b/new_protocol.c
index 867444fa9933023a9d412c2071e7ecc858232e2e..d324175312974098ade47665451fb226248393c8 100644 (file)
--- a/new_protocol.c
+++ b/new_protocol.c
@@ -808,8 +808,6 @@ static void process_iq_data(int rx,unsigned char *buffer) {
     double leftsampledouble;
     double rightsampledouble;
 
-fprintf(stderr,"process_iq_data: %d\n",rx);
-
     sequence=((buffer[0]&0xFF)<<24)+((buffer[1]&0xFF)<<16)+((buffer[2]&0xFF)<<8)+(buffer[3]&0xFF);
     timestamp=((long long)(buffer[4]&0xFF)<<56)+((long long)(buffer[5]&0xFF)<<48)+((long long)(buffer[6]&0xFF)<<40)+((long long)(buffer[7]&0xFF)<<32);
     ((long long)(buffer[8]&0xFF)<<24)+((long long)(buffer[9]&0xFF)<<16)+((long long)(buffer[10]&0xFF)<<8)+(long long)(buffer[11]&0xFF);

diff --git a/vox_menu.c b/vox_menu.c
index 94b34fd8f4a318f39d0fcff2e7ff2c26f24a261c..464d529f86de3557847f025654653b4d1a3f1deb 100644 (file)
--- a/vox_menu.c
+++ b/vox_menu.c
@@ -44,7 +44,7 @@ static int level_update(void *data) {
 }
 
 static void *level_thread(void* arg) {
-  while(run_level && !gtk_widget_in_destruction(dialog)) {
+  while(run_level) {
     peak=vox_get_peak();
     g_idle_add(level_update,NULL);
     usleep(100000); // 100ms
@@ -62,7 +62,6 @@ static gboolean close_cb (GtkWidget *widget, GdkEventButton *event, gpointer dat
 
 static void start_level_thread() {
   int rc;
-  fprintf(stderr,"start_level_thread\n");
   run_level=1;
   rc=pthread_create(&level_thread_id,NULL,level_thread,NULL);
   if(rc != 0) {
@@ -71,6 +70,10 @@ static void start_level_thread() {
   }
 }
 
+static void destroy_cb(GtkWidget *widget, gpointer data) {
+  run_level=0;
+}
+
 static void vox_cb(GtkWidget *widget, gpointer data) {
   vox_enabled=vox_enabled==1?0:1;
   if(vox_enabled) {
@@ -98,6 +101,7 @@ void vox_menu(GtkWidget *parent) {
   parent_window=parent;
 
   dialog=gtk_dialog_new();
+  g_signal_connect (dialog, "destroy", G_CALLBACK(destroy_cb), NULL);
   gtk_window_set_transient_for(GTK_WINDOW(dialog),GTK_WINDOW(parent_window));
   gtk_window_set_decorated(GTK_WINDOW(dialog),FALSE);