X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fport.cc;h=06169dd576634441afc378027c5df063ece1bd9f;hb=83ead9ccbb36d2a941df90f2a26aa4f3aea49615;hp=d8a32e346753565bf36e1223eb684fd150c72ae7;hpb=bb826f4beebfcedc50570b818c305560d2233e47;p=ardour.git diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc index d8a32e3467..06169dd576 100644 --- a/libs/ardour/port.cc +++ b/libs/ardour/port.cc @@ -21,10 +21,6 @@ #include "libardour-config.h" #endif -#ifndef PLATFORM_WINDOWS -#include // so that we can test for new functions at runtime -#endif - #include "pbd/compose.h" #include "pbd/error.h" #include "pbd/failed_constructor.h" @@ -77,7 +73,7 @@ Port::Port (std::string const & n, DataType t, PortFlags f) cerr << "Failed to register port \"" << _name << "\", reason is unknown from here\n"; throw failed_constructor (); } - + PortDrop.connect_same_thread (drop_connection, boost::bind (&Port::drop, this)); } @@ -87,6 +83,26 @@ Port::~Port () drop (); } + +std::string +Port::pretty_name(bool fallback_to_name) const +{ + if (_port_handle) { + std::string value; + std::string type; + if (0 == port_engine.get_port_property (_port_handle, + "http://jackaudio.org/metadata/pretty-name", + value, type)) + { + return value; + } + } + if (fallback_to_name) { + return name (); + } + return ""; +} + void Port::drop () { @@ -101,19 +117,33 @@ Port::drop () bool Port::connected () const { - return (port_engine.connected (_port_handle) != 0); + if (_port_handle) { + return (port_engine.connected (_port_handle) != 0); + } + return false; } int Port::disconnect_all () { - port_engine.disconnect_all (_port_handle); - _connections.clear (); + if (_port_handle) { - /* a cheaper, less hacky way to do boost::shared_from_this() ... - */ - boost::shared_ptr pself = port_manager->get_port_by_name (name()); - PostDisconnect (pself, boost::shared_ptr()); // emit signal + std::vector connections; + get_connections (connections); + + port_engine.disconnect_all (_port_handle); + _connections.clear (); + + /* a cheaper, less hacky way to do boost::shared_from_this() ... + */ + boost::shared_ptr pself = port_manager->get_port_by_name (name()); + for (vector::const_iterator c = connections.begin(); c != connections.end() && pself; ++c) { + boost::shared_ptr pother = AudioEngine::instance()->get_port_by_name (*c); + if (pother) { + PostDisconnect (pself, pother); // emit signal + } + } + } return 0; } @@ -124,7 +154,11 @@ Port::disconnect_all () bool Port::connected_to (std::string const & o) const { - if (!port_engine.connected()) { + if (!_port_handle) { + return false; + } + + if (!port_engine.available()) { return false; } @@ -134,12 +168,16 @@ Port::connected_to (std::string const & o) const int Port::get_connections (std::vector & c) const { - if (!port_engine.connected()) { + if (!port_engine.available()) { c.insert (c.end(), _connections.begin(), _connections.end()); return c.size(); } - return port_engine.get_connections (_port_handle, c); + if (_port_handle) { + return port_engine.get_connections (_port_handle, c); + } + + return 0; } int @@ -187,7 +225,7 @@ Port::disconnect (std::string const & other) _connections.erase (other); } - /* a cheaper, less hacky way to do boost::shared_from_this() ... + /* a cheaper, less hacky way to do boost::shared_from_this() ... */ boost::shared_ptr pself = AudioEngine::instance()->get_port_by_name (name()); boost::shared_ptr pother = AudioEngine::instance()->get_port_by_name (other); @@ -197,7 +235,7 @@ Port::disconnect (std::string const & other) a check on whether this may affect anything that we need to know about. */ - PostDisconnect (pself, pother); // emit signal + PostDisconnect (pself, pother); // emit signal } return r; @@ -225,20 +263,26 @@ Port::disconnect (Port* o) void Port::request_input_monitoring (bool yn) { - port_engine.request_input_monitoring (_port_handle, yn); + if (_port_handle) { + port_engine.request_input_monitoring (_port_handle, yn); + } } void Port::ensure_input_monitoring (bool yn) { - port_engine.ensure_input_monitoring (_port_handle, yn); + if (_port_handle) { + port_engine.ensure_input_monitoring (_port_handle, yn); + } } bool Port::monitoring_input () const { - - return port_engine.monitoring_input (_port_handle); + if (_port_handle) { + return port_engine.monitoring_input (_port_handle); + } + return false; } void @@ -272,7 +316,9 @@ Port::set_public_latency_range (LatencyRange& range, bool playback) const name(), range.min, range.max, (playback ? "PLAYBACK" : "CAPTURE")));; - port_engine.set_latency_range (_port_handle, playback, range); + if (_port_handle) { + port_engine.set_latency_range (_port_handle, playback, range); + } } void @@ -324,12 +370,16 @@ Port::public_latency_range (bool /*playback*/) const { LatencyRange r; - r = port_engine.get_latency_range (_port_handle, sends_output() ? true : false); - DEBUG_TRACE (DEBUG::Latency, string_compose ( - "GET PORT %1: %4 PUBLIC latency range %2 .. %3\n", - name(), r.min, r.max, - sends_output() ? "PLAYBACK" : "CAPTURE")); + if (_port_handle) { + r = port_engine.get_latency_range (_port_handle, sends_output() ? true : false); + + DEBUG_TRACE (DEBUG::Latency, string_compose ( + "GET PORT %1: %4 PUBLIC latency range %2 .. %3\n", + name(), r.min, r.max, + sends_output() ? "PLAYBACK" : "CAPTURE")); + } + return r; } @@ -382,7 +432,7 @@ Port::get_connected_latency_range (LatencyRange& range, bool playback) const boost::shared_ptr remote_port = AudioEngine::instance()->get_port_by_name (*c); if (remote_port) { - lr = remote_port->private_latency_range ((playback ? JackPlaybackLatency : JackCaptureLatency)); + lr = remote_port->private_latency_range ((playback ? true : false)); DEBUG_TRACE (DEBUG::Latency, string_compose ( "\t%1 <-LOCAL-> %2 : latter has latency range %3 .. %4\n", name(), *c, lr.min, lr.max)); @@ -439,7 +489,7 @@ Port::reconnect () int Port::set_name (std::string const & n) { - if (n == _name) { + if (n == _name || !_port_handle) { return 0; } @@ -457,6 +507,10 @@ Port::set_name (std::string const & n) bool Port::physically_connected () const { + if (!_port_handle) { + return false; + } + return port_engine.physically_connected (_port_handle); } @@ -474,7 +528,7 @@ Port::get_state () const } vector c; - + get_connections (c); for (vector::const_iterator i = c.begin(); i != c.end(); ++i) { @@ -508,7 +562,7 @@ Port::set_state (const XMLNode& node, int) if ((*c)->name() != X_("Connection")) { continue; } - + if ((prop = (*c)->property (X_("other"))) == 0) { continue; }