Fix Windows build failures.

drowe67 · Jul 3, 2023 · f36923d · f36923d
1 parent c3a82ec
commit f36923d
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 31 deletions.
diff --git a/src/config/AudioConfiguration.cpp b/src/config/AudioConfiguration.cpp
@@ -22,49 +22,49 @@
 #include "AudioConfiguration.h"
 
 template<>
-const char* AudioConfiguration::AudioDeviceConfigName<1, AudioConfiguration::IN>::GetDeviceNameConfigName()
+const char* AudioConfiguration::AudioDeviceConfigName<1, AudioConfiguration::DIR_IN>::GetDeviceNameConfigName()
 {
     return "/Audio/soundCard1InDeviceName";
 }
 
 template<>
-const char* AudioConfiguration::AudioDeviceConfigName<1, AudioConfiguration::OUT>::GetDeviceNameConfigName()
+const char* AudioConfiguration::AudioDeviceConfigName<1, AudioConfiguration::DIR_OUT>::GetDeviceNameConfigName()
 {
     return "/Audio/soundCard1OutDeviceName";
 }
 
 template<>
-const char* AudioConfiguration::AudioDeviceConfigName<2, AudioConfiguration::IN>::GetDeviceNameConfigName()
+const char* AudioConfiguration::AudioDeviceConfigName<2, AudioConfiguration::DIR_IN>::GetDeviceNameConfigName()
 {
     return "/Audio/soundCard2InDeviceName";
 }
 
 template<>
-const char* AudioConfiguration::AudioDeviceConfigName<2, AudioConfiguration::OUT>::GetDeviceNameConfigName()
+const char* AudioConfiguration::AudioDeviceConfigName<2, AudioConfiguration::DIR_OUT>::GetDeviceNameConfigName()
 {
     return "/Audio/soundCard2OutDeviceName";
 }
 
 template<>
-const char* AudioConfiguration::AudioDeviceConfigName<1, AudioConfiguration::IN>::GetSampleRateConfigName()
+const char* AudioConfiguration::AudioDeviceConfigName<1, AudioConfiguration::DIR_IN>::GetSampleRateConfigName()
 {
     return "/Audio/soundCard1InSampleRate";
 }
 
 template<>
-const char* AudioConfiguration::AudioDeviceConfigName<1, AudioConfiguration::OUT>::GetSampleRateConfigName()
+const char* AudioConfiguration::AudioDeviceConfigName<1, AudioConfiguration::DIR_OUT>::GetSampleRateConfigName()
 {
     return "/Audio/soundCard1OutSampleRate";
 }
 
 template<>
-const char* AudioConfiguration::AudioDeviceConfigName<2, AudioConfiguration::IN>::GetSampleRateConfigName()
+const char* AudioConfiguration::AudioDeviceConfigName<2, AudioConfiguration::DIR_IN>::GetSampleRateConfigName()
 {
     return "/Audio/soundCard2InSampleRate";
 }
 
 template<>
-const char* AudioConfiguration::AudioDeviceConfigName<2, AudioConfiguration::OUT>::GetSampleRateConfigName()
+const char* AudioConfiguration::AudioDeviceConfigName<2, AudioConfiguration::DIR_OUT>::GetSampleRateConfigName()
 {
     return "/Audio/soundCard2OutSampleRate";
 }
@@ -91,4 +91,4 @@ void AudioConfiguration::save(wxConfigBase* config)
     soundCard1Out.save(config);
     soundCard2In.save(config);
     soundCard2Out.save(config);
-}
+}
diff --git a/src/config/AudioConfiguration.h b/src/config/AudioConfiguration.h
@@ -28,7 +28,7 @@
 class AudioConfiguration : public WxWidgetsConfigStore
 {
 public:
-    enum Direction { IN, OUT };
+    enum Direction { DIR_IN, DIR_OUT };
 
     template<int DeviceId, AudioConfiguration::Direction AudioDirection>
     class AudioDeviceConfigName
@@ -55,10 +55,10 @@ class AudioConfiguration : public WxWidgetsConfigStore
     AudioConfiguration() = default;
     virtual ~AudioConfiguration() = default;
 
-    SoundDevice<1, AudioConfiguration::IN> soundCard1In;
-    SoundDevice<1, AudioConfiguration::OUT> soundCard1Out;
-    SoundDevice<2, AudioConfiguration::IN> soundCard2In;
-    SoundDevice<2, AudioConfiguration::OUT> soundCard2Out;
+    SoundDevice<1, Direction::DIR_IN> soundCard1In;
+    SoundDevice<1, Direction::DIR_OUT> soundCard1Out;
+    SoundDevice<2, Direction::DIR_IN> soundCard2In;
+    SoundDevice<2, Direction::DIR_OUT> soundCard2Out;
 
     virtual void load(wxConfigBase* config) override;
     virtual void save(wxConfigBase* config) override;
@@ -71,16 +71,16 @@ const char* AudioConfiguration::AudioDeviceConfigName<DeviceId, AudioDirection>:
 }
 
 template<>
-const char* AudioConfiguration::AudioDeviceConfigName<1, AudioConfiguration::IN>::GetDeviceNameConfigName();
+const char* AudioConfiguration::AudioDeviceConfigName<1, AudioConfiguration::DIR_IN>::GetDeviceNameConfigName();
 
 template<>
-const char* AudioConfiguration::AudioDeviceConfigName<1, AudioConfiguration::OUT>::GetDeviceNameConfigName();
+const char* AudioConfiguration::AudioDeviceConfigName<1, AudioConfiguration::DIR_OUT>::GetDeviceNameConfigName();
 
 template<>
-const char* AudioConfiguration::AudioDeviceConfigName<2, AudioConfiguration::IN>::GetDeviceNameConfigName();
+const char* AudioConfiguration::AudioDeviceConfigName<2, AudioConfiguration::DIR_IN>::GetDeviceNameConfigName();
 
 template<>
-const char* AudioConfiguration::AudioDeviceConfigName<2, AudioConfiguration::OUT>::GetDeviceNameConfigName();
+const char* AudioConfiguration::AudioDeviceConfigName<2, AudioConfiguration::DIR_OUT>::GetDeviceNameConfigName();
 
 template<int DeviceId, AudioConfiguration::Direction AudioDirection>
 const char* AudioConfiguration::AudioDeviceConfigName<DeviceId, AudioDirection>::GetSampleRateConfigName()
@@ -89,20 +89,20 @@ const char* AudioConfiguration::AudioDeviceConfigName<DeviceId, AudioDirection>:
 }
 
 template<>
-const char* AudioConfiguration::AudioDeviceConfigName<1, AudioConfiguration::IN>::GetSampleRateConfigName();
+const char* AudioConfiguration::AudioDeviceConfigName<1, AudioConfiguration::DIR_IN>::GetSampleRateConfigName();
 
 template<>
-const char* AudioConfiguration::AudioDeviceConfigName<1, AudioConfiguration::OUT>::GetSampleRateConfigName();
+const char* AudioConfiguration::AudioDeviceConfigName<1, AudioConfiguration::DIR_OUT>::GetSampleRateConfigName();
 
 template<>
-const char* AudioConfiguration::AudioDeviceConfigName<2, AudioConfiguration::IN>::GetSampleRateConfigName();
+const char* AudioConfiguration::AudioDeviceConfigName<2, AudioConfiguration::DIR_IN>::GetSampleRateConfigName();
 
 template<>
-const char* AudioConfiguration::AudioDeviceConfigName<2, AudioConfiguration::OUT>::GetSampleRateConfigName();
+const char* AudioConfiguration::AudioDeviceConfigName<2, AudioConfiguration::DIR_OUT>::GetSampleRateConfigName();
 
 template<int DeviceId, AudioConfiguration::Direction AudioDirection>
 AudioConfiguration::SoundDevice<DeviceId, AudioDirection>::SoundDevice()
-    : deviceName(AudioConfiguration::AudioDeviceConfigName<DeviceId, AudioDirection>::GetDeviceNameConfigName(), _("none"))
+    : deviceName(AudioConfiguration::AudioDeviceConfigName<DeviceId, AudioDirection>::GetDeviceNameConfigName(), "none")
     , sampleRate(AudioConfiguration::AudioDeviceConfigName<DeviceId, AudioDirection>::GetSampleRateConfigName(), -1)
 {
     // empty
@@ -122,4 +122,4 @@ void AudioConfiguration::SoundDevice<DeviceId, AudioDirection>::save(wxConfigBas
     save_(config, sampleRate);
 }
 
-#endif // AUDIO_CONFIGURATION_H
+#endif // AUDIO_CONFIGURATION_H
diff --git a/src/config/RigControlConfiguration.cpp b/src/config/RigControlConfiguration.cpp
@@ -26,20 +26,20 @@ RigControlConfiguration::RigControlConfiguration()
     , hamlibEnableFreqModeChanges("/Hamlib/EnableFreqModeChanges", true)
     , hamlibUseAnalogModes("/Hamlib/UseAnalogModes", false)
     , hamlibIcomCIVAddress("/Hamlib/IcomCIVHex", 0)
-    , hamlibRigName("/Hamlib/RigNameStr", _(""))
+    , hamlibRigName("/Hamlib/RigNameStr", "")
     , hamlibPTTType("/Hamlib/PttType", 0)
     , hamlibSerialRate("/Hamlib/SerialRate", 0)
-    , hamlibSerialPort("/Hamlib/SerialPort", _(""))
+    , hamlibSerialPort("/Hamlib/SerialPort", "")
 
     , useSerialPTT("/Rig/UseSerialPTT", false)
-    , serialPTTPort("/Rig/Port", _(""))
+    , serialPTTPort("/Rig/Port", "")
     , serialPTTUseRTS("/Rig/UseRTS", true)
     , serialPTTPolarityRTS("/Rig/RTSPolarity", true)
     , serialPTTUseDTR("/Rig/UseDTR", false)
     , serialPTTPolarityDTR("/Rig/DTRPolarity", false)
 
     , useSerialPTTInput("/Rig/UseSerialPTTInput", false)
-    , serialPTTInputPort("/Rig/PttInPort", _(""))
+    , serialPTTInputPort("/Rig/PttInPort", "")
     , serialPTTInputPolarityCTS("/Rig/CTSPolarity", false)
 
     , leftChannelVoxTone("/Rig/leftChannelVoxTone",  false)
@@ -95,4 +95,4 @@ void RigControlConfiguration::save(wxConfigBase* config)
     save_(config, serialPTTInputPolarityCTS);
 
     save_(config, leftChannelVoxTone);
-}
+}
diff --git a/src/dlg_options.cpp b/src/dlg_options.cpp
@@ -980,7 +980,7 @@ void OptionsDlg::OnDebugConsole(wxScrollEvent& event) {
         int ret = AllocConsole();
         freopen("CONOUT$", "w", stdout); 
         freopen("CONOUT$", "w", stderr); 
-        if (g_verbose) fprintf(stderr, "AllocConsole: %d m_debug_console: %d\n", ret, wxGetApp().appConfiguration.debugConsoleEnabled);
+        if (g_verbose) fprintf(stderr, "AllocConsole: %d m_debug_console: %d\n", ret, wxGetApp().appConfiguration.debugConsoleEnabled.get());
     } 
 #endif
 }

diff --git a/src/main.cpp b/src/main.cpp
@@ -694,7 +694,7 @@ MainFrame::MainFrame(wxWindow *parent) : TopFrame(parent, wxID_ANY, _("FreeDV ")
         int ret = AllocConsole();
         freopen("CONOUT$", "w", stdout);
         freopen("CONOUT$", "w", stderr);
-        fprintf(stderr, "AllocConsole: %d m_debug_console: %d\n", ret, wxGetApp().appConfiguration.debugConsoleEnabled);
+        fprintf(stderr, "AllocConsole: %d m_debug_console: %d\n", ret, wxGetApp().appConfiguration.debugConsoleEnabled.get());
     }
 #endif