From 1887bd8df5185b91ae7de625f2e679826657d327 Mon Sep 17 00:00:00 2001
From: Stelios Bounanos <vcs@enotty.net>
Date: Mon, 26 May 2008 18:49:41 +0100
Subject: [PATCH] Upstream version 2.11AM

---
 configure.ac        |  2 +-
 src/feld/feld.cxx   |  1 +
 src/rsid/rsid.cxx   | 26 ++++++++++++++++++++------
 src/throb/throb.cxx |  2 +-
 4 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 20d8e61a..fc837299 100644
--- a/configure.ac
+++ b/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, [2])
 m4_define(FLDIGI_MINOR, [11])
-m4_define(FLDIGI_PATCH, [AL])
+m4_define(FLDIGI_PATCH, [AM])
 
 AC_INIT([fldigi], FLDIGI_MAJOR.FLDIGI_MINOR[FLDIGI_PATCH], [w1hkj AT w1hkj DOT com])
 
diff --git a/src/feld/feld.cxx b/src/feld/feld.cxx
index 8d42b10d..cf966082 100644
--- a/src/feld/feld.cxx
+++ b/src/feld/feld.cxx
@@ -281,6 +281,7 @@ int feld::rx_process(const double *buf, int len)
 		filter_bandwidth = progdefaults.HELL_BW;
 		lp = 1.5 * filter_bandwidth / 2.0 / samplerate;
 		bpfilt->create_filter(0, lp);
+		wf->redraw_marker();
 	}
 
 	while (len-- > 0) {
diff --git a/src/rsid/rsid.cxx b/src/rsid/rsid.cxx
index 1811d5ad..9c7acfc0 100644
--- a/src/rsid/rsid.cxx
+++ b/src/rsid/rsid.cxx
@@ -53,6 +53,7 @@ RSIDs cRsId::rsid_ids[] = {
 	{ 45, MODE_THROB4 }, // THROB-4
 	{ 46, MODE_THROBX1 }, // THROBX-1
 	{ 47, MODE_THROBX2 }, // THROBX-2
+	{ 146, MODE_THROBX4 }, // THROBX-4
 	{ 49, NUM_MODES }, // CONTESTIA-8-250
 	{ 50, NUM_MODES }, // CONTESTIA-16-500
 	{ 51, NUM_MODES }, // CONTESTIA-32-1000
@@ -93,12 +94,12 @@ RSIDs cRsId::rsid_ids[] = {
 	{ 87, MODE_DOMINOEX11 }, // DOMINOEX-11
 	{ 88, MODE_DOMINOEX16 }, // DOMINOEX-16
 	{ 90, MODE_DOMINOEX22 }, // DOMINOEX-22
-	{ 92, MODE_THOR4 }, // DOMINOEX-4-FEC
-	{ 93, MODE_THOR5 }, // DOMINOEX-5-FEC
-	{ 97, MODE_THOR8 }, // DOMINOEX-8-FEC
-	{ 98, MODE_THOR11 }, // DOMINOEX-11-FEC
-	{ 99, MODE_THOR16 }, // DOMINOEX-16-FEC
-	{ 101, MODE_THOR22 }, // DOMINOEX-22-FEC
+	{ 92, MODE_DOMINOEX4 }, // DOMINOEX-4-FEC
+	{ 93, MODE_DOMINOEX5 }, // DOMINOEX-5-FEC
+	{ 97, MODE_DOMINOEX8 }, // DOMINOEX-8-FEC
+	{ 98, MODE_DOMINOEX11 }, // DOMINOEX-11-FEC
+	{ 99, MODE_DOMINOEX16 }, // DOMINOEX-16-FEC
+	{ 101, MODE_DOMINOEX22 }, // DOMINOEX-22-FEC
 
 	{ 104, MODE_FELDHELL }, // FELD HELL
 	{ 105, NUM_MODES }, // PSK HELL
@@ -107,6 +108,14 @@ RSIDs cRsId::rsid_ids[] = {
 	{ 108, NUM_MODES }, // FM HELL-245
 
 	{ 110, MODE_QPSK31 },
+		
+	{ 136, MODE_THOR4 },
+	{ 137, MODE_THOR8 },
+	{ 138, MODE_THOR16 },
+	{ 139, MODE_THOR5 },
+	{ 143, MODE_THOR11 },
+	{ 145, MODE_THOR22 },
+		
 	{ 0,  NUM_MODES }
 };
 
@@ -352,6 +361,11 @@ void cRsId::apply(int iSymbol, int iBin)
 		progdefaults.rtty_shift = 9;
 	}
 		
+	if (iSymbol == 92 || iSymbol == 93 ||
+	    iSymbol == 97 || iSymbol == 98 ||
+	    iSymbol == 99 || iSymbol == 101 ) // special MultiPsk FEC modes
+		progdefaults.DOMINOEX_FEC = true;
+
 	Fl::add_timeout(0.10, changemodefrequency);	
 	
 	
diff --git a/src/throb/throb.cxx b/src/throb/throb.cxx
index 8efe35e8..698690c1 100644
--- a/src/throb/throb.cxx
+++ b/src/throb/throb.cxx
@@ -500,7 +500,7 @@ int throb::rx_process(const double *buf, int len)
 
 		hilbert->run(z, z);
 		z = mixer(z);
-
+http://www.w1hkj.com/alphateam/fldigi-2.11AL.tar.gz
 		n = fftfilter->run(z, &zp);
 
 		/* DOWN_SAMPLE by 32 and push to the receiver */