Merge with upstream

src/include/version.h

@@ -2,6 +2,6 @@
 #define _VERSION_H
 
 #define FLDIGI_NAME    "fldigi"
-#define FLDIGI_VERSION "2.04c"
+#define FLDIGI_VERSION "2.04d"
 
 #endif

src/main.cxx

@@ -30,6 +30,8 @@
 #include <sys/ipc.h>
 #include <sys/msg.h>
 #include <sys/utsname.h>
+#include <unistd.h>
+#include <dirent.h>
 
 #include <FL/Fl_Shared_Image.H>
 #ifdef PORTAUDIO
@@ -112,9 +114,11 @@ int main(int argc, char ** argv)
 
 	fl_filename_expand(szHomedir, 119, "$HOME/.fldigi/");
 	HomeDir = szHomedir;
+cout << HomeDir.c_str() << endl;
 
 	generate_option_help();
 	int arg_idx;
+	
 	if (Fl::args(argc, argv, arg_idx, parse_args) != argc) {
 	    cerr << FLDIGI_NAME << ": unrecognized option `" << argv[arg_idx]
 		 << "'\nTry `" << FLDIGI_NAME
@@ -122,11 +126,16 @@ int main(int argc, char ** argv)
 	    exit(EXIT_FAILURE);
 	}
 
-	if (fl_filename_isdir(HomeDir.c_str()) == 0 &&
-	    mkdir(HomeDir.c_str(), 0777) == -1) {
-		cerr << "Could not make directory " << HomeDir << ": "
-		     << strerror(errno) << endl;
-		exit(EXIT_FAILURE);
+	{
+		DIR *dir = opendir(HomeDir.c_str());
+		if (dir == 0) {
+			if ( mkdir(HomeDir.c_str(), 0777) == -1) {
+				cerr << "Could not make directory " << HomeDir << ": "
+				     << strerror(errno) << endl;
+				exit(EXIT_FAILURE);
+			}
+		} else
+			closedir(dir);
 	}
 
 	xmlfname = HomeDir; 

src/misc/configuration.cxx

@@ -97,7 +97,7 @@ configuration progdefaults = {
 	false,			// bool		macroid;
 	false,			// bool		sendtextid;
 	"CQ",			// string	strTextid;
-	2,				// int		videowidth;
+	1,				// int		videowidth;
 	false,			// bool		macrotextid;
 	0,				// int		QRZ;
 	"",				// string	QRZusername;
@@ -150,7 +150,7 @@ configuration progdefaults = {
 	true,			// bool		LineIn;
 	false,			// bool		EnableMixer;
 	true,			// bool 	MuteInput;
-	50.0,			// double	PCMvolume
+	80.0,			// double	PCMvolume
 	{{  0,  0,  0},{  0,  0,  62},{  0,  0,126}, // default palette
 	 {  0,  0,214},{145,142,  96},{181,184, 48},
 	 {223,226,105},{254,254,   4},{255, 58,  0} },
@@ -1193,22 +1193,21 @@ int configuration::openDefaults() {
 			valRcvMixer->value(RcvMixer);
 			valXmtMixer->value(XmtMixer);
 			valPCMvolume->value(PCMvolume);
-                        btnMicIn->value(MicIn);
-                        btnLineIn->value(LineIn);
+            btnMicIn->value(MicIn);
+            btnLineIn->value(LineIn);
 
-                        btnAudioIO[0]->value(0);
-                        btnAudioIO[0]->value(0);
-                        btnAudioIO[btnAudioIOis]->value(1);
+            btnAudioIO[0]->value(0);
+            btnAudioIO[0]->value(0);
+            btnAudioIO[btnAudioIOis]->value(1);
 
-                        menuOSSDev->value(OSSdevice.c_str());
-                        menuPADev->value(PAdevice.c_str());
-                        if (btnAudioIOis == 1)
-                            menuPADev->activate();
+            menuOSSDev->value(OSSdevice.c_str());
+            menuPADev->value(PAdevice.c_str());
+            if (btnAudioIOis == 1)
+                menuPADev->activate();
 
-
-                        btnMixer->value(EnableMixer);
-                        resetMixerControls();
-                        menuMix->value(MXdevice.c_str());
+            btnMixer->value(EnableMixer);
+            resetMixerControls();
+            menuMix->value(MXdevice.c_str());
 
 			cntRxRateCorr->value(RX_corr);
 			cntTxRateCorr->value(TX_corr);

src/misc/macros.cxx

@@ -291,7 +291,7 @@ int MACROTEXT::loadMacros(string filename)
 			sscanf((mLine.substr(3, idx - 3)).c_str(), "%d", &mNumber);
 			if (mNumber < 0 || mNumber > 19)
 				break;
-			name[mNumber] = mLine.substr(idx+1, 8);
+			name[mNumber] = mLine.substr(idx+1, 9);
 			if (mNumber < 10) {
 				FL_LOCK_D();
 				btnMacro[mNumber]->label( (macros.name[mNumber]).c_str());