X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fardour%2Fmidi_ui.cc;h=0729132d6cf69e490085e219a1edf641cae2e032;hb=7aa46da32f880ad4c7ced29fcea27e002a2c2321;hp=aa81ff206860f1cc178c5100f72858aa54315678;hpb=c83389b8ec5fef9553a401e6123b7e55702af9e2;p=ardour.git

diff --git a/libs/ardour/midi_ui.cc b/libs/ardour/midi_ui.cc
index aa81ff2068..0729132d6c 100644
--- 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"
@@ -34,20 +34,19 @@
 
 using namespace std;
 using namespace ARDOUR;
+using namespace PBD;
 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"))
-	, _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;
 }
 
@@ -60,36 +59,15 @@ 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 ();
-
-	} else if (req->type == CallSlot) {
-
-		req->the_slot ();
-
-	} else if (req->type == Quit) {
-
+	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;
@@ -97,12 +75,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();
+		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);
 	}
 
@@ -123,32 +99,50 @@ 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());
-		} 
+		}
 	}
 }
 
 void
 MidiControlUI::thread_init ()
-{	
+{
 	struct sched_param rtparam;
 
+	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);