X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fport_manager.cc;h=874d36d8828ae19730fa968046d25449aa490f22;hb=5b40e073e9c973479c3d286a007c57e1e0fa3d0f;hp=1557a6106ced9da14ef9194c22ddf5e058e768b7;hpb=9ec3085d71269ab5c155db4284738da6ec7f38ae;p=ardour.git

diff --git a/libs/ardour/port_manager.cc b/libs/ardour/port_manager.cc
index 1557a6106c..874d36d882 100644
--- a/libs/ardour/port_manager.cc
+++ b/libs/ardour/port_manager.cc
@@ -17,6 +17,7 @@
 
 */
 
+#include "pbd/convert.h"
 #include "pbd/error.h"
 
 #include "ardour/async_midi_port.h"
@@ -26,6 +27,7 @@
 #include "ardour/midi_port.h"
 #include "ardour/midiport_manager.h"
 #include "ardour/port_manager.h"
+#include "ardour/profile.h"
 
 #include "i18n.h"
 
@@ -73,20 +75,14 @@ PortManager::make_port_name_relative (const string& portname) const
 		return portname;
 	}
 
-	string::size_type len;
-	string::size_type n;
-	string self = _backend->my_name();
-
-	len = portname.length();
+	string::size_type colon = portname.find (':');
 
-	for (n = 0; n < len; ++n) {
-		if (portname[n] == ':') {
-			break;
-		}
+	if (colon == string::npos) {
+		return portname;
 	}
 
-	if ((n != len) && (portname.substr (0, n) == self)) {
-		return portname.substr (n+1);
+	if (portname.substr (0, colon) == _backend->my_name()) {
+		return portname.substr (colon+1);
 	}
 
 	return portname;
@@ -166,7 +162,7 @@ PortManager::get_physical_outputs (DataType type, std::vector<std::string>& s)
 	}
 	_backend->get_physical_outputs (type, s);
 }
- 
+
 void
 PortManager::get_physical_inputs (DataType type, std::vector<std::string>& s)
 {
@@ -176,7 +172,7 @@ PortManager::get_physical_inputs (DataType type, std::vector<std::string>& s)
 
 	_backend->get_physical_inputs (type, s);
 }
- 
+
 ChanCount
 PortManager::n_physical_outputs () const
 {
@@ -186,7 +182,7 @@ PortManager::n_physical_outputs () const
 
 	return _backend->n_physical_outputs ();
 }
- 
+
 ChanCount
 PortManager::n_physical_inputs () const
 {
@@ -238,7 +234,7 @@ PortManager::port_renamed (const std::string& old_relative_name, const std::stri
 	RCUWriter<Ports> writer (ports);
 	boost::shared_ptr<Ports> p = writer.get_copy();
 	Ports::iterator x = p->find (old_relative_name);
-	
+
 	if (x != p->end()) {
 		boost::shared_ptr<Port> port = x->second;
 		p->erase (x);
@@ -261,6 +257,8 @@ PortManager::get_ports (DataType type, PortList& pl)
 int
 PortManager::get_ports (const string& port_name_pattern, DataType type, PortFlags flags, vector<string>& s)
 {
+	s.clear();
+
 	if (!_backend) {
 		return 0;
 	}
@@ -487,12 +485,14 @@ PortManager::reconnect_ports ()
 {
 	boost::shared_ptr<Ports> p = ports.reader ();
 
-	/* re-establish connections */
+	if (!Profile->get_trx()) {
+		/* re-establish connections */
 
-	DEBUG_TRACE (DEBUG::Ports, string_compose ("reconnect %1 ports\n", p->size()));
+		DEBUG_TRACE (DEBUG::Ports, string_compose ("reconnect %1 ports\n", p->size()));
 
-	for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
-		i->second->reconnect ();
+		for (Ports::iterator i = p->begin(); i != p->end(); ++i) {
+			i->second->reconnect ();
+		}
 	}
 
 	return 0;
@@ -521,7 +521,7 @@ PortManager::connect_callback (const string& a, const string& b, bool conn)
 		port_b, b,
 		conn
 		); /* EMIT SIGNAL */
-}	
+}
 
 void
 PortManager::registration_callback ()
@@ -540,7 +540,7 @@ PortManager::can_request_input_monitoring () const
 
 	return _backend->can_monitor_input ();
 }
- 
+
 void
 PortManager::request_input_monitoring (const string& name, bool yn) const
 {
@@ -554,7 +554,7 @@ PortManager::request_input_monitoring (const string& name, bool yn) const
 		_backend->request_input_monitoring (ph, yn);
 	}
 }
- 
+
 void
 PortManager::ensure_input_monitoring (const string& name, bool yn) const
 {
@@ -575,7 +575,7 @@ PortManager::port_name_size() const
 	if (!_backend) {
 		return 0;
 	}
-	
+
 	return _backend->port_name_size ();
 }
 
@@ -585,7 +585,7 @@ PortManager::my_name() const
 	if (!_backend) {
 		return string();
 	}
-	
+
 	return _backend->my_name();
 }
 
@@ -681,9 +681,9 @@ void
 PortManager::check_monitoring ()
 {
 	for (Ports::iterator i = _cycle_ports->begin(); i != _cycle_ports->end(); ++i) {
-		
+
 		bool x;
-		
+
 		if (i->second->last_monitor() != (x = i->second->monitoring_input ())) {
 			i->second->set_last_monitor (x);
 			/* XXX I think this is dangerous, due to
@@ -698,14 +698,14 @@ void
 PortManager::fade_out (gain_t base_gain, gain_t gain_step, pframes_t nframes)
 {
 	for (Ports::iterator i = _cycle_ports->begin(); i != _cycle_ports->end(); ++i) {
-		
+
 		if (i->second->sends_output()) {
-			
+
 			boost::shared_ptr<AudioPort> ap = boost::dynamic_pointer_cast<AudioPort> (i->second);
 			if (ap) {
 				Sample* s = ap->engine_get_whole_audio_buffer ();
 				gain_t g = base_gain;
-				
+
 				for (pframes_t n = 0; n < nframes; ++n) {
 					*s++ *= g;
 					g -= gain_step;