Reverted "audio_open" modification since it was not necessary

and not implemented correctly.

diff --git a/new_protocol.c b/new_protocol.c
index 3fefea3cccc6e463809f25a8b69990ff35c8ed25..32f88b22f5c47fd48bee2635d8cb1e234bccd510 100644 (file)
--- a/new_protocol.c
+++ b/new_protocol.c
@@ -476,15 +476,19 @@ void new_protocol_init(int pixels) {
 #endif
     micoutputsamples=buffer_size*4;
 
-#if 0
-    // now done in radio.c
+//  if(local_audio) {
+//   if(audio_open_output()!=0) {
+//     g_print("audio_open_output failed\n");
+//     local_audio=0;
+//   }
+//  }
+
     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 80ad37b64f60f1bb39aeada1768637c9da5ec01f..2c3a2d16471811f0d01694801cf98e2371c91df8 100644 (file)
--- a/old_protocol.c
+++ b/old_protocol.c
@@ -296,18 +296,12 @@ 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/radio.c b/radio.c
index fce6eb49a6571dacf083f6a1ddee64397d662370..8ed6956ce6c04e8c8bb5c15790954746a7a2544d 100644 (file)
--- a/radio.c
+++ b/radio.c
@@ -1187,26 +1187,6 @@ void start_radio() {
 
   radioRestoreState();
 
-  //
-  // This must come *after* radioRestoreState since this
-  // reads the local audio settings from the props file
-  // (and this is now removed from *_protocol_init and create_receiver)
-  //
-
-  for(int i=0;i<receivers;i++) {
-    receiver_restore_state(receiver[i]);
-    if(receiver[i]->local_audio) {
-      if (audio_open_output(receiver[i]) < 0) receiver[i]->local_audio=0;
-    }
-  }
-  if(transmitter->local_microphone && can_transmit) {
-    if(audio_open_input()!=0) {
-      g_print("audio_open_input failed\n");
-      transmitter->local_microphone=0;
-    }
-  }
-
-
 //
 // It is possible that an option has been read in
 // which is not compatible with the hardware.

diff --git a/receiver.c b/receiver.c
index f4893e70b2434d2b353a4d486c5b5589f37f546c..3fd94e49a06b29fe3eac7a5c35ffedfc0a50a589 100644 (file)
--- a/receiver.c
+++ b/receiver.c
@@ -1156,13 +1156,10 @@ fprintf(stderr,"RXASetMP %d\n",rx->low_latency);
 
   create_visual(rx);
 
-#if 0
-// now done in radio.c
 fprintf(stderr,"create_receiver: rx=%p id=%d local_audio=%d\n",rx,rx->id,rx->local_audio);
   if(rx->local_audio) {
     if (audio_open_output(rx) < 0) rx->local_audio=0;
   }
-#endif
 
   return rx;
 }

diff --git a/soapy_protocol.c b/soapy_protocol.c
index 08477193f83a5f7c98884b0b605af50519ff9611..c10550ad319edfd951311bfc2bdb63354e0b49c5 100644 (file)
--- a/soapy_protocol.c
+++ b/soapy_protocol.c
@@ -281,8 +281,6 @@ 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) {
@@ -291,7 +289,6 @@ fprintf(stderr,"soapy_protocol_init: SoapySDRDevice_make\n");
       }
     }
   }
-#endif
 
 }