Cleanup.

src/config_script/create_default_script.cxx

@@ -196,7 +196,9 @@ static int add_command(FILE *fd, char *cmd, char * param, int indent_level);
 static int add_command(FILE *fd, char *cmd, int indent_level);
 static int add_command(FILE *fd, char *cmd, bool   param, int indent_level);
 static int add_command(FILE *fd, char *cmd, double param, int indent_level);
+#if USE_PORTAUDIO
 static int add_string(FILE *fd, char *cmd, int indent_level);
+#endif
 static void write_macro_list(FILE *fd);
 
 extern pthread_mutex_t mutex_script_io;
@@ -678,6 +680,7 @@ static int add_command(FILE *fd, char *cmd, int indent_level)
 	return ferror(fd);
 }
 
+#if USE_PORTAUDIO
 /** ********************************************************
  * \brief Add command and paramter to script file
  * \param fd File descriptor
@@ -697,4 +700,4 @@ static int add_string(FILE *fd, char *cmd, int indent_level)
 
 	return ferror(fd);
 }
-
+#endif

src/dialogs/confdialog.cxx

@@ -11655,7 +11655,7 @@ i.e. localhost"));
     { btnResetConfig = new Fl_Button(20, 388, 130, 22, _("Restore defaults"));
       btnResetConfig->callback((Fl_Callback*)cb_btnResetConfig);
     } // Fl_Button* btnResetConfig
-    { btnApplyConfig = new Fl_Button(175, 375, 115, 22, _("Apply (dl)"));
+    { btnApplyConfig = new Fl_Button(175, 388, 115, 22, _("Apply (dl)"));
       btnApplyConfig->callback((Fl_Callback*)cb_btnApplyConfig);
       btnApplyConfig->deactivate();
     } // Fl_Button* btnApplyConfig

src/dialogs/confdialog.fl

@@ -7009,7 +7009,7 @@ progdefaults.changed = false;}
       label {Apply (dl)}
       callback {dl_fldigi::commit();
 btnApplyConfig->deactivate();}
-      xywh {175 375 115 22} deactivate
+      xywh {175 388 115 22} deactivate
     }
   }
 } 

src/dialogs/fl_digi.cxx

@@ -6866,7 +6866,6 @@ void create_fl_digi_main_dl_fldigi() {
 	int freqwidth = (int)fl_width("999999999") + 10;
 	fl_font(fnt, fsize);
 
-	int Htext = progStatus.mainH - Hwfall - Hmenu - Hstatus - Hmacros - Hqsoframe - 4;
 	int minRxHeight = 100;
 	int TopFrameHABheight = 120;
 

src/dl_fldigi/location.cxx

@@ -63,7 +63,7 @@ void update_distance_bearing()
     alt2 = balloon_altitude;
 
     double radius, d_lon, sa, sb, bearing, aa, ab, angle_at_centre,
-           great_circle_distance, ta, tb, ea, eb, elevation, distance;
+           ta, tb, ea, eb, elevation, distance;
 
     radius = 6371000.0;
 
@@ -74,7 +74,6 @@ void update_distance_bearing()
     aa = sqrt((sa * sa) + (sb * sb));
     ab = (sin(lat1) * sin(lat2)) + (cos(lat1) * cos(lat2) * cos(d_lon));
     angle_at_centre = atan2(aa, ab);
-    great_circle_distance = angle_at_centre * radius;
 
     ta = radius + alt1;
     tb = radius + alt2;

src/include/globals.h

@@ -226,8 +226,6 @@ enum {
 	MODE_ANALYSIS,
 	MODE_FFTSCAN,
 
-	MODE_FSQ,
-
 	NUM_MODES,
 	NUM_RXTX_MODES = NUM_MODES - 2
 };

src/ssdv/ssdv.c

@@ -710,7 +710,7 @@ static char ssdv_have_marker_data(ssdv_t *s)
 		case 3: l = (s->width >> 3) * (s->height >> 3); break;
 		}
 		
-		fprintf(stderr, "MCU blocks: %i\n", l);
+		fprintf(stderr, "MCU blocks: %i\n", (int)l);
 		
 		if(l > 0xFFFF)
 		{

src/ssdv/ssdv_rx.cxx

@@ -513,6 +513,7 @@ void ssdv_rx::put_byte(uint8_t byte, int lost)
 		if(p[0] != 0x55) { image_lost_packets++; continue; }
 		image_received_packets++;
 		r = ssdv_dec_feed(&dec, p);
+		if (SSDV_ERROR == r) image_lost_packets++;
 	}
 	
 	/* Store the last decoded MCU, for the progress bar */

src/waterfall/waterfall.cxx

@@ -253,9 +253,6 @@ inline void WFdisp::makeMarker_(int width, const RGB* color, int freq, const RGB
 	if (marker_mode >= MODE_MT63_500S && marker_mode <= MODE_MT63_2000L)
 			bw_upper = (int)(width * 31 / 32);
 
-	if (marker_mode == MODE_FSQ)
-			bw_upper = (int)(width * 32 / 33);
-
 	if (bw_lower + static_cast<int>(freq+0.5) < 0)
 		bw_lower -= bw_lower + static_cast<int>(freq+0.5);
 
@@ -333,7 +330,6 @@ void WFdisp::makeMarker()
 	int bw_hi = marker_width;
 	if (mode >= MODE_MT63_500S && mode <= MODE_MT63_2000L)
 		bw_hi = bw_hi * 31 / 32;
-	if (mode == MODE_FSQ) bw_hi = bw_hi * 32 / 33;
 
 	for (int y = 0; y < WFMARKER - 2; y++) {
 		int incr = y * scale_width;
@@ -886,9 +882,6 @@ case Step: for (int row = 0; row < image_height; row++) { \
 		trx_mode mode = active_modem->get_mode();
 		if (mode >= MODE_MT63_500S && mode <= MODE_MT63_2000L)
 			bw_hi = bw_hi * 31 / 32;
-		if (mode == MODE_FSQ) {
-			bw_hi = bw_lo = 69 * bandwidth / 100;
-		}
 		RGBI  *pos1 = fft_img + (carrierfreq - offset - bw_lo) / step;
 		RGBI  *pos2 = fft_img + (carrierfreq - offset + bw_hi) / step;
 		if (unlikely(pos2 == fft_img + disp_width))
@@ -955,7 +948,6 @@ void WFdisp::drawcolorWF() {
 		int bw_hi = bandwidth / 2;
 		if (mode >= MODE_MT63_500S && mode <= MODE_MT63_2000L)
 			bw_hi = bw_hi * 31 / 32;
-		if (mode == MODE_FSQ) bw_hi = bw_hi * 32 / 33;
 		RGBI  *pos0 = (fft_img + cursorpos);
 		RGBI  *pos1 = (fft_img + cursorpos - bw_lo/step);
 		RGBI  *pos2 = (fft_img + cursorpos + bw_hi/step);
@@ -1036,7 +1028,6 @@ void WFdisp::drawspectrum() {
 		int bw_hi = bandwidth / 2;
 		if (mode >= MODE_MT63_500S && mode <= MODE_MT63_2000L)
 			bw_hi = bw_hi * 31 / 32;
-		if (mode == MODE_FSQ) bw_hi = bw_hi * 32 / 33;
 		uchar  *pos0 = pixmap + cursorpos;
 		uchar  *pos1 = (pixmap + cursorpos - bw_lo/step);
 		uchar  *pos2 = (pixmap + cursorpos + bw_hi/step);

src/widgets/FTextRXTX.cxx

@@ -809,13 +809,6 @@ int FTextTX::handle(int event)
 
 	switch (event) {
 	case FL_KEYBOARD:
-		if (active_modem->get_mode() == MODE_FSQ) {
-			if (Fl::event_key() == FL_Enter || Fl::event_key() == FL_KP_Enter) {
-				this->add("^r");
-				start_tx();
-				return 1;
-			}
-		}
 		return handle_key(Fl::event_key()) ? 1 : FTextEdit::handle(event);
 	case FL_PUSH:
 		if (Fl::event_button() == FL_MIDDLE_MOUSE &&