From 78fc91593fcf7a3f96196fe5312a27bf57718c19 Mon Sep 17 00:00:00 2001
From: Stelios Bounanos <vcs@enotty.net>
Date: Sun, 9 Mar 2008 21:58:08 +0000
Subject: [PATCH] Upstream version 2.10Y

---
 configure.ac            |  2 +-
 src/dialogs/fl_digi.cxx |  4 ++--
 src/misc/status.cxx     |  1 +
 src/mt63/mt63.cxx       |  3 +++
 src/mt63/mt63base.cxx   | 11 +++++++++--
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index b44df0ad..bee46a45 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, [10])
-m4_define(FLDIGI_PATCH, [X])
+m4_define(FLDIGI_PATCH, [Y])
 
 AC_INIT([fldigi], FLDIGI_MAJOR.FLDIGI_MINOR[FLDIGI_PATCH], [w1hkj AT w1hkj DOT com])
 
diff --git a/src/dialogs/fl_digi.cxx b/src/dialogs/fl_digi.cxx
index 23849293..7fb4763b 100644
--- a/src/dialogs/fl_digi.cxx
+++ b/src/dialogs/fl_digi.cxx
@@ -2065,8 +2065,8 @@ void enableMixer(bool on)
 		mixer->openMixer(progdefaults.MXdevice.c_str());
 
 		mixer->PCMVolume(progdefaults.PCMvolume);
-		mixer->setXmtLevel(valXmtMixer->value());
-		mixer->setRcvGain(valRcvMixer->value());
+		mixer->setXmtLevel(progStatus.XmtMixer); //valXmtMixer->value());
+		mixer->setRcvGain(progStatus.RcvMixer); //valRcvMixer->value());
 		if (progdefaults.LineIn == true)
 			setMixerInput(1);
 		else if (progdefaults.MicIn == true)
diff --git a/src/misc/status.cxx b/src/misc/status.cxx
index 988f0fdc..0dc04602 100644
--- a/src/misc/status.cxx
+++ b/src/misc/status.cxx
@@ -193,6 +193,7 @@ void status::initLastState()
 	sldrSquelch->value(sldrSquelchValue);
 	valRcvMixer->value(RcvMixer);
 	valXmtMixer->value(XmtMixer);
+
 	FL_UNLOCK_D();
 
 	{
diff --git a/src/mt63/mt63.cxx b/src/mt63/mt63.cxx
index 7d3177d2..433464f2 100644
--- a/src/mt63/mt63.cxx
+++ b/src/mt63/mt63.cxx
@@ -68,6 +68,8 @@ int mt63::tx_process()
 	
 	if (stopflag && flush-- == 0) {
 		stopflag = false;
+		Tx->SendJam();
+		ModulateXmtr((Tx->Comb.Output.Data), Tx->Comb.Output.Len);
 		cwid();
 		return -1;	/* we're done */
 	}
@@ -109,6 +111,7 @@ int mt63::rx_process(const double *buf, int len)
 	InpBuff->Len = len;
 
 	InpLevel->Process(InpBuff);
+	
 	Rx->Process(InpBuff);
 
 	snr = Rx->FEC_SNR();
diff --git a/src/mt63/mt63base.cxx b/src/mt63/mt63base.cxx
index 354367f3..9df5c2eb 100644
--- a/src/mt63/mt63base.cxx
+++ b/src/mt63/mt63base.cxx
@@ -34,6 +34,7 @@
 
 #include <stdio.h> // only for control printf's
 // #include <alloc.h>
+#include <iostream>
 
 #include "dsp.h"
 
@@ -137,8 +138,14 @@ int MT63tx::Preset(int BandWidth, int LongInterleave)
 	CarrMarkCode=0x16918BBEL;
 	CarrMarkdspAmpl=0; // WindowLen/32;
 
-	if(LongInterleave) { DataInterleave=64; InterleavePattern=LongIntlvPatt; }
-	else { DataInterleave=32; InterleavePattern=ShortIntlvPatt; }
+	if(LongInterleave) { 
+		DataInterleave=64; 
+		InterleavePattern=LongIntlvPatt; 
+	}
+	else { 
+		DataInterleave=32; 
+		InterleavePattern=ShortIntlvPatt; 
+	}
 
 	if(dspRedspAllocArray(&TxVect,    DataCarriers)) goto Error;
 	if(dspRedspAllocArray(&dspPhaseCorr, DataCarriers)) goto Error;