fix invalid mapping detection

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

diff --git a/libs/ardour/port_manager.cc b/libs/ardour/port_manager.cc
index a1a4397551be76e88f3dd58252793b531c570db8..874d36d8828ae19730fa968046d25449aa490f22 100644 (file)
--- 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"
@@ -74,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;
@@ -167,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)
 {
@@ -177,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
 {
@@ -187,7 +182,7 @@ PortManager::n_physical_outputs () const
 
        return _backend->n_physical_outputs ();
 }
- 
+
 ChanCount
 PortManager::n_physical_inputs () const
 {
@@ -239,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);
@@ -492,9 +487,9 @@ PortManager::reconnect_ports ()
 
        if (!Profile->get_trx()) {
                /* re-establish connections */
-               
+
                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 ();
                }
@@ -526,7 +521,7 @@ PortManager::connect_callback (const string& a, const string& b, bool conn)
                port_b, b,
                conn
                ); /* EMIT SIGNAL */
-}      
+}
 
 void
 PortManager::registration_callback ()
@@ -545,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
 {
@@ -559,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
 {
@@ -580,7 +575,7 @@ PortManager::port_name_size() const
        if (!_backend) {
                return 0;
        }
-       
+
        return _backend->port_name_size ();
 }
 
@@ -590,7 +585,7 @@ PortManager::my_name() const
        if (!_backend) {
                return string();
        }
-       
+
        return _backend->my_name();
 }
 
@@ -686,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
@@ -703,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;