Remove non-JACK midi++ ports.

git-svn-id: svn://localhost/ardour2/branches/3.0@7377 d708f5d6-7413-0410-9779-e7cbd77b26cf

2 files changed, 8 insertions, 16 deletions

diff --git a/libs/surfaces/mackie/mackie_control_protocol.cc b/libs/surfaces/mackie/mackie_control_protocol.cc
index 3fa1686d9b..a49c67acc5 100644
--- a/libs/surfaces/mackie/mackie_control_protocol.cc
+++ b/libs/surfaces/mackie/mackie_control_protocol.cc
@@ -563,20 +563,14 @@ MackieControlProtocol::connect_session_signals()
 void 
 MackieControlProtocol::add_port (MIDI::Port & midi_port, int number)
 {
-	DEBUG_TRACE (DEBUG::MackieControl, string_compose ("add port %1,%2,%3\n", midi_port.name(), midi_port.device(), midi_port.type()));
-
-	if (string (midi_port.device()) == string ("ardour") && midi_port.type() == MIDI::Port::ALSA_Sequencer) {
-		throw MackieControlException ("The Mackie MCU driver will not use a port with device=ardour");
-	} else if (midi_port.type() == MIDI::Port::ALSA_Sequencer) {
-		throw MackieControlException ("alsa/sequencer ports don't work with the Mackie MCU driver right now");
-	} else {
-		MackiePort * sport = new MackiePort (*this, midi_port, number);
-		_ports.push_back (sport);
-		
-		sport->init_event.connect_same_thread (port_connections, boost::bind (&MackieControlProtocol::handle_port_init, this, sport));
-		sport->active_event.connect_same_thread (port_connections, boost::bind (&MackieControlProtocol::handle_port_active, this, sport));
-		sport->inactive_event.connect_same_thread (port_connections, boost::bind (&MackieControlProtocol::handle_port_inactive, this, sport));
-	}
+	DEBUG_TRACE (DEBUG::MackieControl, string_compose ("add port %1\n", midi_port.name()));
+
+	MackiePort * sport = new MackiePort (*this, midi_port, number);
+	_ports.push_back (sport);
+	
+	sport->init_event.connect_same_thread (port_connections, boost::bind (&MackieControlProtocol::handle_port_init, this, sport));
+	sport->active_event.connect_same_thread (port_connections, boost::bind (&MackieControlProtocol::handle_port_active, this, sport));
+	sport->inactive_event.connect_same_thread (port_connections, boost::bind (&MackieControlProtocol::handle_port_inactive, this, sport));
 }
 
 void 
diff --git a/libs/surfaces/mackie/surface_port.cc b/libs/surfaces/mackie/surface_port.cc
index 8aaea1d5ba..9dd456157e 100644
--- a/libs/surfaces/mackie/surface_port.cc
+++ b/libs/surfaces/mackie/surface_port.cc
@@ -173,8 +173,6 @@ void SurfacePort::write_sysex( MIDI::byte msg )
 ostream & Mackie::operator << ( ostream & os, const SurfacePort & port )
 {
 	os << "{ ";
-	os << "device: " << port.port().device();
-	os << "; ";
 	os << "name: " << port.port().name();
 	os << "; ";
 	os << " }";