merge fix for tempo branch

[ardour.git] / libs / backends / wavesaudio / waves_audiobackend.midi.cc

diff --git a/libs/backends/wavesaudio/waves_audiobackend.midi.cc b/libs/backends/wavesaudio/waves_audiobackend.midi.cc
index 0fa88e9df390832784523471add88ff64bff9f71..47efd2d8601ff798ec0b2dd73271e0989b768ece 100644 (file)
--- a/libs/backends/wavesaudio/waves_audiobackend.midi.cc
+++ b/libs/backends/wavesaudio/waves_audiobackend.midi.cc
@@ -31,7 +31,11 @@ const std::vector<std::string> WavesAudioBackend::__available_midi_options = boo
 
 #elif PLATFORM_WINDOWS
 
+<<<<<<< HEAD
+const std::vector<std::string> WavesAudioBackend::__available_midi_options = boost::assign::list_of ("System MIDI (MME)") ("None");
+=======
 const std::vector<std::string> WavesAudioBackend::__available_midi_options = boost::assign::list_of ("Multimedia Extensions") ("None");
+>>>>>>> remotes/origin/tempo-marker-from-clock
 
 #endif
 
@@ -69,7 +73,7 @@ std::string
 WavesAudioBackend::midi_option () const
 {
     // COMMENTED DBG LOGS */ std::cout << "WavesAudioBackend::midi_option ():" << std::endl;
-    return * (__available_midi_options.begin () + (_use_midi?1:0));
+    return * (__available_midi_options.begin () + (_use_midi?0:1));
 }
 
 
@@ -170,6 +174,7 @@ WavesAudioBackend::_changed_midi_devices ()
         return;
     }
 
+       _unregister_system_midi_ports ();
     _midi_device_manager.stop ();
 
     if (_midi_device_manager.start () != 0) {
@@ -317,8 +322,7 @@ WavesAudioBackend::_read_midi_data_from_devices ()
             
             if (timestamp_st < 0) {
                 timestamp_st = 0;
-            }
-            else if (timestamp_st >= (int32_t)_buffer_size) {
+            } else if (timestamp_st >= (int32_t)_buffer_size) {
                 timestamp_st = _buffer_size - 1;
             }
             waves_midi_event->set_timestamp (timestamp_st);