Merge branch 'master' into cairocanvas

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

diff --git a/libs/ardour/midi_ui.cc b/libs/ardour/midi_ui.cc
index 06c9428ad7b2a2b5b618bce310fac8e0f9305c8c..06940c1e34e29b7aa8447ceafb73e4cf63eda6f8 100644 (file)
--- a/libs/ardour/midi_ui.cc
+++ b/libs/ardour/midi_ui.cc
@@ -22,11 +22,11 @@
 
 #include "pbd/pthread_utils.h"
 
-#include "midi++/manager.h"
-#include "midi++/port.h"
-
+#include "ardour/async_midi_port.h"
 #include "ardour/debug.h"
 #include "ardour/audioengine.h"
+#include "ardour/midi_port.h"
+#include "ardour/midiport_manager.h"
 #include "ardour/midi_ui.h"
 #include "ardour/session.h"
 #include "ardour/session_event.h"
@@ -39,16 +39,14 @@ using namespace Glib;
 
 #include "i18n.h"
 
-BaseUI::RequestType MidiControlUI::PortChange = BaseUI::new_request_type();
 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));
        _instance = this;
 }
 
@@ -61,42 +59,17 @@ MidiControlUI::~MidiControlUI ()
 void
 MidiControlUI::do_request (MidiUIRequest* req)
 {
-       if (req->type == PortChange) {
-
-               /* restart event loop with new ports */
-               DEBUG_TRACE (DEBUG::MidiIO, "reset ports\n");
-               reset_ports ();
-
+       if (req->type == Quit) {
+               BaseUI::quit ();
        } else if (req->type == CallSlot) {
-
-#ifndef NDEBUG
-               if (getenv ("DEBUG_THREADED_SIGNALS")) {
-                       cerr << "MIDI UI calls a slot\n";
-               }
-#endif
-
                req->the_slot ();
-
-       } else if (req->type == Quit) {
-
-               BaseUI::quit ();
-       }
-}
-
-void
-MidiControlUI::change_midi_ports ()
-{
-       MidiUIRequest* req = get_request (PortChange);
-       if (req == 0) {
-               return;
        }
-       send_request (req);
 }
 
 bool
-MidiControlUI::midi_input_handler (IOCondition ioc, MIDI::Port* port)
+MidiControlUI::midi_input_handler (IOCondition ioc, AsyncMIDIPort* port)
 {
-       DEBUG_TRACE (DEBUG::MidiIO, string_compose ("something happend on  %1\n", port->name()));
+       DEBUG_TRACE (DEBUG::MidiIO, string_compose ("something happend on  %1\n", ((ARDOUR::Port*)port)->name()));
 
        if (ioc & ~IO_IN) {
                return false;
@@ -104,10 +77,12 @@ MidiControlUI::midi_input_handler (IOCondition ioc, MIDI::Port* port)
 
        if (ioc & IO_IN) {
 
+#ifndef PLATFORM_WINDOWS
                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();
+               DEBUG_TRACE (DEBUG::MidiIO, string_compose ("data available on %1\n", ((ARDOUR::Port*)port)->name()));
+               framepos_t now = _session.engine().sample_time();
                port->parse (now);
        }
 
@@ -128,21 +103,37 @@ MidiControlUI::clear_ports ()
 void
 MidiControlUI::reset_ports ()
 {
-       clear_ports ();
-
-       MIDI::Manager::PortList plist = MIDI::Manager::instance()->get_midi_ports ();
-
-       for (MIDI::Manager::PortList::iterator i = plist.begin(); i != plist.end(); ++i) {
-               int fd;
+       if (!port_sources.empty()) {
+               return;
+       }
+       
+       vector<AsyncMIDIPort*> ports;
+       AsyncMIDIPort* p;
+       
+       if ((p = dynamic_cast<AsyncMIDIPort*> (_session.midi_input_port()))) {
+               ports.push_back (p);
+       }
+       
+       
+       if ((p = dynamic_cast<AsyncMIDIPort*> (_session.mmc_input_port()))) {
+               ports.push_back (p);
+       }
+       
+       if (ports.empty()) {
+               return;
+       }
+       
+       int fd;
+       for (vector<AsyncMIDIPort*>::const_iterator pi = ports.begin(); pi != ports.end(); ++pi) {
 
-               if ((fd = (*i)->selectable ()) >= 0) {
+               if ((fd = (*pi)->selectable ()) >= 0) {
                        Glib::RefPtr<IOSource> psrc = IOSource::create (fd, IO_IN|IO_HUP|IO_ERR);
-
-                       psrc->connect (sigc::bind (sigc::mem_fun (this, &MidiControlUI::midi_input_handler), *i));
+                       
+                       psrc->connect (sigc::bind (sigc::mem_fun (this, &MidiControlUI::midi_input_handler), *pi));
                        psrc->attach (_main_loop->get_context());
-
+                       
                        // glibmm hack: for now, store only the GSource*
-
+                       
                        port_sources.push_back (psrc->gobj());
                        g_source_ref (psrc->gobj());
                }