Upstream version 3.0preK

configure.ac

@@ -9,7 +9,7 @@ dnl major and minor must be integers; patch may
 dnl contain other characters or be empty
 m4_define(FLDIGI_MAJOR, [3])
 m4_define(FLDIGI_MINOR, [0])
-m4_define(FLDIGI_PATCH, [preJ])
+m4_define(FLDIGI_PATCH, [preK])
 
 AC_INIT([fldigi], FLDIGI_MAJOR.FLDIGI_MINOR[FLDIGI_PATCH], [w1hkj AT w1hkj DOT com])
 

src/dialogs/fl_digi.cxx

@@ -108,7 +108,7 @@ Fl_Double_Window	*scopeview = (Fl_Double_Window *)0;
 
 MixerBase* mixer = 0;
 
-bool	useCheckButtons = false;
+bool	useCheckButtons = true;
 bool	twoscopes = false;
 
 
@@ -927,6 +927,7 @@ void cbRSID(Fl_Widget *w, void *) {
 
 void toggleRSID()
 {
+	btnRSID->value(0);
 	cbRSID(NULL, NULL);
 }
 
@@ -1078,7 +1079,6 @@ void cb_btnSideband(Fl_Widget *w, void *d)
 
 void cbMacroTimerButton(Fl_Widget *w, void *d)
 {
-	Fl_Button *b = (Fl_Button *)w;
 	progdefaults.useTimer = false;
 	FL_LOCK_D();
 	btnMacroTimer->hide();

src/main.cxx

@@ -382,8 +382,8 @@ void generate_option_help(void) {
 	     << "  --twoscopes\n"
 	     << "    Dock a second digiscope adjacent to the waterfall\n\n"
 
-	     << "  --usechkbtns\n"
-	     << "    Use check buttons for AFC / SQL.\n";
+	     << "  --uselgtdbtns\n"
+	     << "    Use lighted buttons for AFC / SQL.\n";
 
 
 	option_help = help.str();
@@ -438,7 +438,7 @@ int parse_args(int argc, char **argv, int& idx)
 		{ "window-height", 1, 0, OPT_WINDOW_HEIGHT },
 		{ "profile",	   1, 0, OPT_PROFILE },
 		{ "twoscopes",     0, 0, OPT_TWO_SCOPES },
-		{ "usechkbtns",    0, 0, OPT_USE_CHECK },
+		{ "uselgtdbtns",    0, 0, OPT_USE_CHECK },
 
 		{ "resample",      1, 0, OPT_RESAMPLE },
 
@@ -533,7 +533,7 @@ int parse_args(int argc, char **argv, int& idx)
 			break;
 
 		case OPT_USE_CHECK:
-			useCheckButtons = true;
+			useCheckButtons = false;
 			break;
 
 		case OPT_RESAMPLE:

src/misc/configuration.cxx

@@ -173,7 +173,7 @@ configuration progdefaults = {
 	SAMPLE_RATE_UNSET,		// int		sample_rate;
 	SAMPLE_RATE_UNSET,		// int		in_sample_rate;
 	SAMPLE_RATE_UNSET,		// int		out_sample_rate;
-	SRC_SINC_MEDIUM_QUALITY,	// int		sample_converter;
+	SRC_ZERO_ORDER_HOLD,	// int		sample_converter; bah humbug to crappy computers!
 	0,				// int		RX_corr;
 	0,				// int		TX_corr;
 	0,				// int		TxOffset;
@@ -1525,7 +1525,7 @@ void configuration::initOperator() {
 		ContestDigits = (int)nbrContestDigits->value();
 	FL_UNLOCK();
 }
-
+
 #include "rigio.h"
 
 void configuration::initInterface() {
@@ -1642,7 +1642,7 @@ FL_LOCK();
 FL_UNLOCK();
 }
 #endif
-
+
 void configuration::testCommPorts()
 {
 	char COM[] = "COMx";

src/soundcard/soundconf.cxx

@@ -218,8 +218,6 @@ static void sound_init_options(void)
 
 	const char* cname;
 	for (int i = 0; (cname = src_get_name(i)); i++) {
-//		if (i == SRC_ZERO_ORDER_HOLD || i == SRC_LINEAR)
-//			continue;
 		menuSampleConverter->add(cname);
 	}
 	menuSampleConverter->value(progdefaults.sample_converter);