From 713f7e18ed345cfac1d6a91a46c275f133012ba1 Mon Sep 17 00:00:00 2001
From: Stelios Bounanos <vcs@enotty.net>
Date: Sun, 18 May 2008 10:42:54 +0100
Subject: [PATCH] Upstream version 2.11AI

---
 configure.ac               |  2 +-
 src/misc/configuration.cxx | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0f917afe..800476a9 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, [AH])
+m4_define(FLDIGI_PATCH, [AI])
 
 AC_INIT([fldigi], FLDIGI_MAJOR.FLDIGI_MINOR[FLDIGI_PATCH], [w1hkj AT w1hkj DOT com])
 
diff --git a/src/misc/configuration.cxx b/src/misc/configuration.cxx
index 02e6c5f6..47b04567 100644
--- a/src/misc/configuration.cxx
+++ b/src/misc/configuration.cxx
@@ -279,7 +279,7 @@ enum TAG { \
 	HAMRIGNAME, HAMRIGDEVICE, HAMRIGBAUDRATE,
 	PTTDEV,
 	SECONDARYTEXT, 
-	AUDIOIO, OSSDEVICE, PADEVICE, PORTINDEVICE, PORTININTHOR, PORTOUTDEVICE, PORTOUTINTHOR, PULSESERVER,
+	AUDIOIO, OSSDEVICE, PADEVICE, PORTINDEVICE, PORTININDEX, PORTOUTDEVICE, PORTOUTINDEX, PULSESERVER,
 	SAMPLERATE, INSAMPLERATE, OUTSAMPLERATE, SAMPLECONVERTER, RXCORR, TXCORR, TXOFFSET,
 	USELEADINGZEROS, CONTESTSTART, CONTESTDIGITS,
 	USETIMER, MACRONUMBER, TIMEOUT,
@@ -469,9 +469,9 @@ void configuration::writeDefaultsXML()
 	writeXMLstr(f, "OSSDEVICE", OSSdevice);
 	writeXMLstr(f, "PADEVICE", PAdevice);
 	writeXMLstr(f, "PORTINDEVICE", PortInDevice);
-	writeXMLint(f, "PORTININTHOR", PortInIndex);
+	writeXMLint(f, "PORTININDEX", PortInIndex);
 	writeXMLstr(f, "PORTOUTDEVICE", PortOutDevice);
-	writeXMLint(f, "PORTOUTINTHOR", PortOutIndex);
+	writeXMLint(f, "PORTOUTINDEX", PortOutIndex);
 	writeXMLstr(f, "PULSESERVER", PulseServer);
 	writeXMLint(f, "SAMPLERATE", sample_rate);
 	writeXMLint(f, "INSAMPLERATE", in_sample_rate);
@@ -872,13 +872,13 @@ bool configuration::readDefaultsXML()
 					case PORTINDEVICE :
 						PortInDevice = xml->getNodeData();
 						break;
-					case PORTININTHOR :
+					case PORTININDEX :
 						PortInIndex = atoi(xml->getNodeData());
 						break;
 					case PORTOUTDEVICE :
 						PortOutDevice = xml->getNodeData();
 						break;
-					case PORTOUTINTHOR :
+					case PORTOUTINDEX :
 						PortOutIndex = atoi(xml->getNodeData());
 						break;
 					case PULSESERVER :
@@ -1154,9 +1154,9 @@ bool configuration::readDefaultsXML()
 				else if (!strcmp("OSSDEVICE", nodeName)) 	tag = OSSDEVICE;
 				else if (!strcmp("PADEVICE", nodeName)) 	tag = PADEVICE;
 				else if (!strcmp("PORTINDEVICE", nodeName)) 	tag = PORTINDEVICE;
-				else if (!strcmp("PORTININTHOR", nodeName)) 	tag = PORTININTHOR;
+				else if (!strcmp("PORTININDEX", nodeName)) 	tag = PORTININDEX;
 				else if (!strcmp("PORTOUTDEVICE", nodeName)) 	tag = PORTOUTDEVICE;
-				else if (!strcmp("PORTOUTINTHOR", nodeName)) 	tag = PORTOUTINTHOR;
+				else if (!strcmp("PORTOUTINDEX", nodeName)) 	tag = PORTOUTINDEX;
 				else if (!strcmp("SAMPLERATE", nodeName)) 	tag = SAMPLERATE;
 				else if (!strcmp("INSAMPLERATE", nodeName)) 	tag = INSAMPLERATE;
 				else if (!strcmp("OUTSAMPLERATE", nodeName)) 	tag = OUTSAMPLERATE;