From a9cbbaf77d090e77bd086085de18b5e9eebb64d9 Mon Sep 17 00:00:00 2001
From: James Coxon <jacoxon@googlemail.com>
Date: Tue, 2 Aug 2016 21:38:14 +0100
Subject: [PATCH] updated and merged, rerun fluid to update confdialog

---
 habitat-cpp-connector      |  2 +-
 src/dialogs/confdialog.cxx |  4 +---
 src/dialogs/confdialog.h   | 10 ++++------
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/habitat-cpp-connector b/habitat-cpp-connector
index bb18817c..54a6061b 160000
--- a/habitat-cpp-connector
+++ b/habitat-cpp-connector
@@ -1 +1 @@
-Subproject commit bb18817c6890598a5adad5bbe3ae674be4435a9b
+Subproject commit 54a6061be583f52e3c14db92f79a6a0abdd06dd0
diff --git a/src/dialogs/confdialog.cxx b/src/dialogs/confdialog.cxx
index 7fabae1e..bec19309 100644
--- a/src/dialogs/confdialog.cxx
+++ b/src/dialogs/confdialog.cxx
@@ -6450,7 +6450,6 @@ Fl_Double_Window* ConfigureDialog() {
           { Fl_Check_Button* o = btnNoiseOn = new Fl_Check_Button(93, 269, 70, 15, _("Noise on"));
             btnNoiseOn->down_box(FL_DOWN_BOX);
             btnNoiseOn->callback((Fl_Callback*)cb_btnNoiseOn);
-            btnNoiseOn->deactivate();
             o->value(progdefaults.noise);
           } // Fl_Check_Button* btnNoiseOn
           { Fl_Counter2* o = noiseDB = new Fl_Counter2(340, 264, 130, 21, _("dB"));
@@ -6467,7 +6466,6 @@ Fl_Double_Window* ConfigureDialog() {
             noiseDB->callback((Fl_Callback*)cb_noiseDB);
             noiseDB->align(Fl_Align(FL_ALIGN_LEFT));
             noiseDB->when(FL_WHEN_CHANGED);
-            noiseDB->deactivate();
             o->value(progdefaults.s2n);
             o->lstep(1);
           } // Fl_Counter2* noiseDB
@@ -10850,7 +10848,7 @@ definition"));
         tabSoundCard->hide();
         { tabsSoundCard = new Fl_Tabs(0, 25, 600, 360);
           tabsSoundCard->selection_color(FL_LIGHT1);
-          { tabAudio = new Fl_Group(0, 50, 600, 330, _("Devices"));
+          { tabAudio = new Fl_Group(0, 50, 600, 335, _("Devices"));
             { AudioOSS = new Fl_Group(55, 65, 490, 45);
               AudioOSS->box(FL_ENGRAVED_FRAME);
               { btnAudioIO[0] = new Fl_Round_Button(65, 75, 53, 25, _("OSS"));
diff --git a/src/dialogs/confdialog.h b/src/dialogs/confdialog.h
index 826879eb..f61aac8f 100644
--- a/src/dialogs/confdialog.h
+++ b/src/dialogs/confdialog.h
@@ -528,17 +528,16 @@ extern Fl_Check_Button *chk_flrig_keys_modem;
 extern Fl_Group *tabSoundCard;
 extern Fl_Tabs *tabsSoundCard;
 extern Fl_Group *tabAudio;
-extern Fl_Group *AudioTCP;
-extern Fl_Input2 *inpIPServerHost;
-extern Fl_Input2 *inpIPServerPort;
-extern Fl_Group *AudioUDP;
-extern Fl_Round_Button *btnAudioIO[5];
+extern Fl_Group *AudioOSS;
+#include <FL/Fl_Input_Choice.H>
+extern Fl_Input_Choice *menuOSSDev;
 extern Fl_Group *AudioPort;
 extern Fl_Choice *menuPortInDev;
 extern Fl_Choice *menuPortOutDev;
 extern Fl_Group *AudioPulse;
 extern Fl_Input2 *inpPulseServer;
 extern Fl_Group *AudioNull;
+extern Fl_Round_Button *btnAudioIO[4];
 extern Fl_Group *tabAudioOpt;
 extern Fl_Group *grpAudioSampleRate;
 extern Fl_ListBox *menuInSampleRate;
@@ -670,7 +669,6 @@ extern Fl_Counter2 *cntTrackFreqMax;
 #include <FL/Fl_Float_Input.H>
 extern Fl_Float_Input *stationary_lat;
 extern Fl_Float_Input *stationary_lon;
-#include <FL/Fl_Input_Choice.H>
 extern Fl_Input_Choice *inpGPSdev;
 #include <FL/Fl_Spinner.H>
 extern Fl_Output *gps_pos_lat;