Don't use trylock in assertions on windows as it will fail

[ardour.git] / libs / ardour / midi_ui.cc

diff --git a/libs/ardour/midi_ui.cc b/libs/ardour/midi_ui.cc
index e9e9eafb99da1aec51d207b166b1b469f4396607..82261b58ec05cfb28507cadc1cb1307ed95a0393 100644 (file)
--- a/libs/ardour/midi_ui.cc
+++ b/libs/ardour/midi_ui.cc
@@ -45,7 +45,7 @@ MidiControlUI* MidiControlUI::_instance = 0;
 #include "pbd/abstract_ui.cc"  /* instantiate the template */
 
 MidiControlUI::MidiControlUI (Session& s)
-       : AbstractUI<MidiUIRequest> (_("midiui"))
+       : AbstractUI<MidiUIRequest> (X_("midiui"))
        , _session (s)
 {
        MIDI::Manager::instance()->PortsChanged.connect_same_thread (rebind_connection, boost::bind (&MidiControlUI::change_midi_ports, this));
@@ -104,7 +104,9 @@ MidiControlUI::midi_input_handler (IOCondition ioc, MIDI::Port* port)
 
        if (ioc & IO_IN) {
 
+#ifndef WIN32
                CrossThreadChannel::drain (port->selectable());
+#endif
 
                DEBUG_TRACE (DEBUG::MidiIO, string_compose ("data available on %1\n", port->name()));
                framepos_t now = _session.engine().frame_time();
@@ -134,8 +136,6 @@ MidiControlUI::reset_ports ()
 
        for (MIDI::Manager::PortList::const_iterator i = plist->begin(); i != plist->end(); ++i) {
 
-               cerr << "MIDI UI looking at port " << (*i)->name() << endl;
-
                if (!(*i)->centrally_parsed()) {
                        continue;
                }