From: DL1YCF <dl1ycf@darc.de>
Date: Sat, 10 Oct 2020 13:12:52 +0000 (+0200)
Subject: Removed audio_open_input from protocol init since local audio options
X-Git-Url: https://git.rkrishnan.org/vdrive/components//%22%22.?a=commitdiff_plain;h=5a20fac803b6af6fdc728428700511c72bccb03d;p=pihpsdr.git

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 9fe58e6..3fefea3 100644
--- 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 2c3a2d1..80ad37b 100644
--- 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 c10550a..0847719 100644
--- 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
 
 }