]> git.rkrishnan.org Git - pihpsdr.git/commitdiff
Merge branch 'master' of https://github.com/g0orx/pihpsdr
authorDL1YCF <dl1ycf@darc.de>
Sun, 15 Dec 2019 20:27:32 +0000 (21:27 +0100)
committerDL1YCF <dl1ycf@darc.de>
Sun, 15 Dec 2019 20:27:32 +0000 (21:27 +0100)
1  2 
audio.c
new_protocol.c
old_protocol.c
radio_menu.c

diff --cc audio.c
index e3328623348674868ea9e75accca768be5451f78,f60eb6068260e90a9c5b94b549f10aece33a6d8e..a55aad1e0915485e8874f3e9572a51ff3a50a9c9
+++ b/audio.c
@@@ -247,16 -242,9 +250,16 @@@ g_print("audio_open_input: mic_buffer: 
        break;
    }
  
 +g_print("audio_open_input: allocating ring buffer\n");
 +  mic_ring_buffer=(float *) g_new(float,MICRINGLEN);
 +  mic_ring_read_pt = mic_ring_write_pt=0;
 +  if (mic_ring_buffer == NULL) {
 +    return -1;
 +  }
 +
  g_print("audio_open_input: creating mic_read_thread\n");
    GError *error;
-   mic_read_thread_id = g_thread_try_new("local mic",mic_read_thread,NULL,&error);
+   mic_read_thread_id = g_thread_try_new("microphone",mic_read_thread,NULL,&error);
    if(!mic_read_thread_id ) {
      g_print("g_thread_new failed on mic_read_thread: %s\n",error->message);
    }
diff --cc new_protocol.c
Simple merge
diff --cc old_protocol.c
Simple merge
diff --cc radio_menu.c
Simple merge