fix another semantically-significant statement buried in an assert() macro

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

diff --git a/libs/ardour/midi_ui.cc b/libs/ardour/midi_ui.cc
index fb85309ee1a7e9203d288ec97b9a2cb7919354c7..78da32e4273472449e6b023f889c24e3e5854c4b 100644 (file)
--- a/libs/ardour/midi_ui.cc
+++ b/libs/ardour/midi_ui.cc
@@ -34,6 +34,7 @@
 
 using namespace std;
 using namespace ARDOUR;
+using namespace PBD;
 using namespace Glib;
 
 #include "i18n.h"
@@ -44,8 +45,8 @@ MidiControlUI* MidiControlUI::_instance = 0;
 #include "pbd/abstract_ui.cc"  /* instantiate the template */
 
 MidiControlUI::MidiControlUI (Session& s)
-       : AbstractUI<MidiUIRequest> (_("midiui"))
-       , _session (s) 
+       : AbstractUI<MidiUIRequest> (X_("midiui"))
+       , _session (s)
 {
        MIDI::Manager::instance()->PortsChanged.connect_same_thread (rebind_connection, boost::bind (&MidiControlUI::change_midi_ports, this));
        _instance = this;
@@ -103,12 +104,10 @@ MidiControlUI::midi_input_handler (IOCondition ioc, MIDI::Port* port)
 
        if (ioc & IO_IN) {
 
-               if (port->must_drain_selectable()) {
-                       CrossThreadChannel::drain (port->selectable());
-               }
+               CrossThreadChannel::drain (port->selectable());
 
                DEBUG_TRACE (DEBUG::MidiIO, string_compose ("data available on %1\n", port->name()));
-               nframes64_t now = _session.engine().frame_time();
+               framepos_t now = _session.engine().frame_time();
                port->parse (now);
        }
 
@@ -131,9 +130,14 @@ MidiControlUI::reset_ports ()
 {
        clear_ports ();
 
-       MIDI::Manager::PortList plist = MIDI::Manager::instance()->get_midi_ports ();
+       boost::shared_ptr<const MIDI::Manager::PortList> plist = MIDI::Manager::instance()->get_midi_ports ();
+
+       for (MIDI::Manager::PortList::const_iterator i = plist->begin(); i != plist->end(); ++i) {
+
+               if (!(*i)->centrally_parsed()) {
+                       continue;
+               }
 
-       for (MIDI::Manager::PortList::iterator i = plist.begin(); i != plist.end(); ++i) {
                int fd;
 
                if ((fd = (*i)->selectable ()) >= 0) {
@@ -146,20 +150,16 @@ MidiControlUI::reset_ports ()
 
                        port_sources.push_back (psrc->gobj());
                        g_source_ref (psrc->gobj());
-               } 
+               }
        }
 }
 
 void
 MidiControlUI::thread_init ()
-{      
+{
        struct sched_param rtparam;
 
-       char* c = new char[7];
-       strcpy (c, X_("midiUI"));
-       pthread_set_name (c);
-
-       cerr << "MIDI UI running\n";
+       pthread_set_name (X_("midiUI"));
 
        PBD::notify_gui_about_thread_creation (X_("gui"), pthread_self(), X_("MIDI"), 2048);
        SessionEvent::create_per_thread_pool (X_("MIDI I/O"), 128);