Proper solution to replace 9cabc1b hack.

Initialize uninitialized variable (m_started), remove cruft.

diff --git a/libs/backends/portaudio/winmmemidi_input_device.cc b/libs/backends/portaudio/winmmemidi_input_device.cc
index 594cf30b4b4476bdee87b661cecc7595ec377a14..d7a0a6dbaa674e5db01d22bb42db0fae5d5dcf76 100644 (file)
--- a/libs/backends/portaudio/winmmemidi_input_device.cc
+++ b/libs/backends/portaudio/winmmemidi_input_device.cc
@@ -37,6 +37,7 @@ namespace ARDOUR {
 
 WinMMEMidiInputDevice::WinMMEMidiInputDevice (int index)
        : m_handle(0)
+       , m_started(false)
        , m_midi_buffer(new RingBuffer<uint8_t>(MIDI_BUFFER_SIZE))
        , m_sysex_buffer(new uint8_t[SYSEX_BUFFER_SIZE])
 {

diff --git a/libs/backends/portaudio/winmmemidi_input_device.h b/libs/backends/portaudio/winmmemidi_input_device.h
index dab8dbfd5317b5be6350adc404be66722f1baf7b..b1a7fb6b88e894b3dc28896787d247f4f4bf0f10 100644 (file)
--- a/libs/backends/portaudio/winmmemidi_input_device.h
+++ b/libs/backends/portaudio/winmmemidi_input_device.h
@@ -91,7 +91,6 @@ private: // data
        MIDIHDR m_sysex_header;
 
        bool m_started;
-       bool m_enabled;
 
        std::string m_name;
 

diff --git a/libs/backends/portaudio/wscript b/libs/backends/portaudio/wscript
index 967b6044d5bdef00cbb4dbca5f9acbfbf82d1f8d..9c661d83b00d22216db1fc9beab3ca3b6b0e3fea 100644 (file)
--- a/libs/backends/portaudio/wscript
+++ b/libs/backends/portaudio/wscript
@@ -40,6 +40,3 @@ def build(bld):
                    'ARDOURBACKEND_DLL_EXPORTS',
                    'USE_MMCSS_THREAD_PRIORITIES'
                   ]
-    if bld.env['build_target'] == 'mingw':
-        # MIDI input doesn't work with -O3 or -O2 so override
-        obj.cxxflags = [ '-O0' ]