diff options
| author | Robin Gareus <robin@gareus.org> | 2015-08-04 01:03:57 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-08-04 01:03:57 +0200 |
| commit | c8b207d911ea7d9fc2f4d86b6e4020c14e8b94b7 (patch) | |
| tree | 337103ba01d4c61af4918ffcf0b7f412d2179b9b | |
| parent | e057b873b52708326fb654d9bcbbf84b932c4b02 (diff) | |
Proper solution to replace 9cabc1b hack.
Initialize uninitialized variable (m_started), remove cruft.
| -rw-r--r-- | libs/backends/portaudio/winmmemidi_input_device.cc | 1 | ||||
| -rw-r--r-- | libs/backends/portaudio/winmmemidi_input_device.h | 1 | ||||
| -rw-r--r-- | libs/backends/portaudio/wscript | 3 |
3 files changed, 1 insertions, 4 deletions
diff --git a/libs/backends/portaudio/winmmemidi_input_device.cc b/libs/backends/portaudio/winmmemidi_input_device.cc index 594cf30b4b..d7a0a6dbaa 100644 --- 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 dab8dbfd53..b1a7fb6b88 100644 --- 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 967b6044d5..9c661d83b0 100644 --- 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' ] |