Upstream version 2.11AK

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, [AJ])
+m4_define(FLDIGI_PATCH, [AK])
 
 AC_INIT([fldigi], FLDIGI_MAJOR.FLDIGI_MINOR[FLDIGI_PATCH], [w1hkj AT w1hkj DOT com])
 

src/dialogs/confdialog.cxx

@@ -1786,11 +1786,11 @@ static const char szBaudRates[] = "300|600|1200|2400|4800|9600|19200|38400|57600
             tabAudio->selection_color((Fl_Color)51);
             { AudioOSS = new Fl_Group(5, 58, 391, 35);
               AudioOSS->box(FL_ENGRAVED_FRAME);
-              { btnAudioIO[1] = new Fl_Round_Button(5, 63, 100, 25, "OSS");
-                btnAudioIO[1]->down_box(FL_DIAMOND_DOWN_BOX);
-                btnAudioIO[1]->selection_color((Fl_Color)1);
-                btnAudioIO[1]->callback((Fl_Callback*)cb_btnAudioIO);
-              } // Fl_Round_Button* btnAudioIO[1]
+              { btnAudioIO[0] = new Fl_Round_Button(5, 63, 100, 25, "OSS");
+                btnAudioIO[0]->down_box(FL_DIAMOND_DOWN_BOX);
+                btnAudioIO[0]->selection_color((Fl_Color)1);
+                btnAudioIO[0]->callback((Fl_Callback*)cb_btnAudioIO);
+              } // Fl_Round_Button* btnAudioIO[0]
               { Fl_Input_Choice* o = menuOSSDev = new Fl_Input_Choice(280, 63, 110, 25, "Device");
                 menuOSSDev->callback((Fl_Callback*)cb_menuOSSDev);
                 o->value(progdefaults.OSSdevice.c_str());
@@ -1799,11 +1799,11 @@ static const char szBaudRates[] = "300|600|1200|2400|4800|9600|19200|38400|57600
             } // Fl_Group* AudioOSS
             { AudioPort = new Fl_Group(5, 95, 390, 61);
               AudioPort->box(FL_ENGRAVED_FRAME);
-              { btnAudioIO[0] = new Fl_Round_Button(5, 115, 95, 25, "PortAudio");
-                btnAudioIO[0]->down_box(FL_DIAMOND_DOWN_BOX);
-                btnAudioIO[0]->selection_color((Fl_Color)1);
-                btnAudioIO[0]->callback((Fl_Callback*)cb_btnAudioIO1);
-              } // Fl_Round_Button* btnAudioIO[0]
+              { btnAudioIO[1] = new Fl_Round_Button(5, 115, 95, 25, "PortAudio");
+                btnAudioIO[1]->down_box(FL_DIAMOND_DOWN_BOX);
+                btnAudioIO[1]->selection_color((Fl_Color)1);
+                btnAudioIO[1]->callback((Fl_Callback*)cb_btnAudioIO1);
+              } // Fl_Round_Button* btnAudioIO[1]
               { menuPortInDev = new Fl_Choice(165, 99, 225, 25, "Capture");
                 menuPortInDev->down_box(FL_BORDER_BOX);
                 menuPortInDev->callback((Fl_Callback*)cb_menuPortInDev);

src/dialogs/confdialog.fl

@@ -695,7 +695,7 @@ o->label((inpQRZuserpassword->type() & FL_SECRET_INPUT) ? "Show" : "Hide");}
             Fl_Group AudioOSS {open
               xywh {5 58 391 35} box ENGRAVED_FRAME
             } {
-              Fl_Round_Button {btnAudioIO[1]} {
+              Fl_Round_Button {btnAudioIO[0]} {
                 label OSS
                 callback {sound_update(SND_IDX_OSS);
 progdefaults.changed = true;
@@ -714,7 +714,7 @@ progdefaults.changed = true;} open
             Fl_Group AudioPort {open
               xywh {5 95 390 61} box ENGRAVED_FRAME
             } {
-              Fl_Round_Button {btnAudioIO[0]} {
+              Fl_Round_Button {btnAudioIO[1]} {
                 label PortAudio
                 callback {sound_update(SND_IDX_PORT);
 progdefaults.changed = true;

src/include/soundconf.h

@@ -1,7 +1,7 @@
 #ifndef SOUNDCONF_H
 #define SOUNDCONF_H
 
-enum { SND_IDX_UNKNOWN = -1, SND_IDX_PORT, SND_IDX_OSS,
+enum { SND_IDX_UNKNOWN = -1, SND_IDX_OSS, SND_IDX_PORT,
        SND_IDX_PULSE, SND_IDX_NULL, SND_IDX_END
 };
 

src/soundcard/sound.cxx

@@ -31,6 +31,8 @@
 #include <string>
 #include <vector>
 #include <sstream>
+#include <algorithm>
+#include <iterator>
 
 #include <cstdio>
 #include <cstdlib>
@@ -44,7 +46,7 @@
 #include <semaphore.h>
 #include <limits.h>
 
-#include <bits/stream_iterator.h>
+//#include <bits/stream_iterator.h>
 
 #if USE_OSS
 #    include <sys/soundcard.h>
@@ -1216,7 +1218,7 @@ void SoundPort::init_stream(unsigned dir)
 			supported_rates[dir].push_back(*i);
 	ostringstream ss;
 	if (supported_rates[dir].size() > 1)
-		copy(supported_rates[dir].begin(), supported_rates[dir].end(), ostream_iterator<unsigned>(ss, " "));
+		copy(supported_rates[dir].begin(), supported_rates[dir].end(), ostream_iterator<double>(ss, " "));
 	else
 		ss << "Unknown";