Removed audio_open_input from protocol init since local audio options

are not yet set when init the protocol. This is now done in radio.c

diff --git a/new_protocol.c b/new_protocol.c
index 9fe58e6873864691bbf21fd524971573c15a9d02..3fefea3cccc6e463809f25a8b69990ff35c8ed25 100644 (file)
--- a/new_protocol.c
+++ b/new_protocol.c
@@ -296,7 +296,7 @@ static mybuffer *get_my_buffer() {
   int i;
   mybuffer *bp=buflist;
   while (bp) {
-    if (bp->free == 1) {
+    if (bp->free) {
       // found free buffer. Mark as used and return that one.
       bp->free=0;
       return bp;
@@ -476,21 +476,15 @@ void new_protocol_init(int pixels) {
 #endif
     micoutputsamples=buffer_size*4;
 
-#ifdef OLD_AUDIO
-    if(local_audio) {
-      if(audio_open_output()!=0) {
-        g_print("audio_open_output failed\n");
-        local_audio=0;
-      }
-    }
-#endif
-
+#if 0
+    // now done in radio.c
     if(transmitter->local_microphone) {
       if(audio_open_input()!=0) {
         g_print("audio_open_input failed\n");
         transmitter->local_microphone=0;
       }
     }
+#endif
 
 #ifdef INCLUDED
     new_protocol_calc_buffers();

diff --git a/old_protocol.c b/old_protocol.c
index 2c3a2d16471811f0d01694801cf98e2371c91df8..80ad37b64f60f1bb39aeada1768637c9da5ec01f 100644 (file)
--- a/old_protocol.c
+++ b/old_protocol.c
@@ -296,12 +296,18 @@ void old_protocol_init(int rx,int pixels,int rate) {
 
   old_protocol_set_mic_sample_rate(rate);
 
+#if 0
+  //
+  // Now done in radio.c, because local mic option is not yet
+  // read in when calling old_protocol_init
+  //
   if(transmitter->local_microphone) {
     if(audio_open_input()!=0) {
       g_print("audio_open_input failed\n");
       transmitter->local_microphone=0;
     }
   }
+#endif
 
   display_width=pixels;
  

diff --git a/soapy_protocol.c b/soapy_protocol.c
index c10550ad319edfd951311bfc2bdb63354e0b49c5..08477193f83a5f7c98884b0b605af50519ff9611 100644 (file)
--- a/soapy_protocol.c
+++ b/soapy_protocol.c
@@ -281,6 +281,8 @@ fprintf(stderr,"soapy_protocol_init: SoapySDRDevice_make\n");
   }
   SoapySDRKwargs_clear(&args);
 
+#if 0
+  // now done in radio.c
   if(can_transmit) {
     if(transmitter->local_microphone) {
       if(audio_open_input()!=0) {
@@ -289,6 +291,7 @@ fprintf(stderr,"soapy_protocol_init: SoapySDRDevice_make\n");
       }
     }
   }
+#endif
 
 }