Some polishing to make the up-coming merge thinner.

diff --git a/dac.h b/dac.h
index 851c4d2fe76b706c79f3d8777bda3d22c6d36c44..a08135f6bec3ad18ed00723054668ba2b659492b 100644 (file)
--- a/dac.h
+++ b/dac.h
@@ -22,7 +22,7 @@
 
 typedef struct _dac {
   gint antenna;
-  double gain;
+  gdouble gain;
 } DAC;
 
 #endif

diff --git a/ext.h b/ext.h
index ff18bb56d36c77379fb02cfe202915f30e7c3cc3..66c74f97970a78b5880d893ae49661788a18a75f 100644 (file)
--- a/ext.h
+++ b/ext.h
@@ -150,4 +150,3 @@ extern void band_plus(int id);
 extern void band_minus(int id);
 extern void num_pad(int num);
 extern void update_vfo_step(int direction);
-

diff --git a/rx_panadapter.c b/rx_panadapter.c
index 93189fe86b0c97ec9004ac7dee8cfa3e264cb3fb..b2d80c5b3379795f3f0db53adb88ad6b4d99d0ee 100644 (file)
--- a/rx_panadapter.c
+++ b/rx_panadapter.c
@@ -591,6 +591,7 @@ void rx_panadapter_update(RECEIVER *rx) {
     cairo_pattern_destroy(gradient);
   }
 
+/*
 #ifdef GPIO
   if(rx->id==0 && controller==CONTROLLER1) {
 
@@ -615,6 +616,7 @@ void rx_panadapter_update(RECEIVER *rx) {
     }
   }
 #endif
+*/
 
   if(display_sequence_errors) {
     if(sequence_errors!=0) {

diff --git a/transmitter.c b/transmitter.c
index 374821431b44c60637e737747040e1210a972ca5..d751cbffcc52735dc10252f56710e7414aa71268 100644 (file)
--- a/transmitter.c
+++ b/transmitter.c
@@ -1422,7 +1422,7 @@ void add_mic_sample(TRANSMITTER *tx,float mic_sample) {
        // side tone
        ramp=cwramp48[cw_shape];
        cwsample=0.00197 * getNextSideToneSample() * cw_keyer_sidetone_volume * ramp;
-       if(active_receiver->local_audio) cw_audio_write(active_receiver, cwsample);
+       if(active_receiver->local_audio) cw_audio_write(active_receiver,cwsample);
         cw_shape_buffer48[tx->samples]=ramp;
        //
        // In the new protocol, we MUST maintain a constant flow of audio samples to the radio