X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fport_manager.cc;h=ec8e3024eafd668fc9027ead4b44c6f0eba4e795;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=1557a6106ced9da14ef9194c22ddf5e058e768b7;hpb=9ec3085d71269ab5c155db4284738da6ec7f38ae;p=ardour.git diff --git a/libs/ardour/port_manager.cc b/libs/ardour/port_manager.cc index 1557a6106c..ec8e3024ea 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,8 +27,10 @@ #include "ardour/midi_port.h" #include "ardour/midiport_manager.h" #include "ardour/port_manager.h" +#include "ardour/profile.h" +#include "ardour/session.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace PBD; @@ -73,20 +76,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; @@ -162,21 +159,23 @@ void PortManager::get_physical_outputs (DataType type, std::vector& s) { if (!_backend) { + s.clear (); return; } _backend->get_physical_outputs (type, s); } - + void PortManager::get_physical_inputs (DataType type, std::vector& s) { if (!_backend) { + s.clear (); return; } _backend->get_physical_inputs (type, s); } - + ChanCount PortManager::n_physical_outputs () const { @@ -186,7 +185,7 @@ PortManager::n_physical_outputs () const return _backend->n_physical_outputs (); } - + ChanCount PortManager::n_physical_inputs () const { @@ -238,7 +237,7 @@ PortManager::port_renamed (const std::string& old_relative_name, const std::stri RCUWriter writer (ports); boost::shared_ptr p = writer.get_copy(); Ports::iterator x = p->find (old_relative_name); - + if (x != p->end()) { boost::shared_ptr port = x->second; p->erase (x); @@ -261,6 +260,8 @@ PortManager::get_ports (DataType type, PortList& pl) int PortManager::get_ports (const string& port_name_pattern, DataType type, PortFlags flags, vector& s) { + s.clear(); + if (!_backend) { return 0; } @@ -387,6 +388,40 @@ PortManager::connected (const string& port_name) return _backend->connected (handle); } +bool +PortManager::physically_connected (const string& port_name) +{ + if (!_backend) { + return false; + } + + PortEngine::PortHandle handle = _backend->get_port_by_name (port_name); + + if (!handle) { + return false; + } + + return _backend->physically_connected (handle); +} + +int +PortManager::get_connections (const string& port_name, std::vector& s) +{ + if (!_backend) { + s.clear (); + return 0; + } + + PortEngine::PortHandle handle = _backend->get_port_by_name (port_name); + + if (!handle) { + s.clear (); + return 0; + } + + return _backend->get_connections (handle, s); +} + int PortManager::connect (const string& source, const string& destination) { @@ -487,12 +522,14 @@ PortManager::reconnect_ports () { boost::shared_ptr 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 +558,7 @@ PortManager::connect_callback (const string& a, const string& b, bool conn) port_b, b, conn ); /* EMIT SIGNAL */ -} +} void PortManager::registration_callback () @@ -540,7 +577,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 +591,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 +612,7 @@ PortManager::port_name_size() const if (!_backend) { return 0; } - + return _backend->port_name_size (); } @@ -585,7 +622,7 @@ PortManager::my_name() const if (!_backend) { return string(); } - + return _backend->my_name(); } @@ -629,9 +666,18 @@ PortManager::cycle_end (pframes_t nframes) } void -PortManager::silence (pframes_t nframes) +PortManager::silence (pframes_t nframes, Session *s) { for (Ports::iterator i = _cycle_ports->begin(); i != _cycle_ports->end(); ++i) { + if (s && i->second == s->mtc_output_port ()) { + continue; + } + if (s && i->second == s->midi_clock_output_port ()) { + continue; + } + if (s && i->second == s->ltc_output_port ()) { + continue; + } if (i->second->sends_output()) { i->second->get_buffer(nframes).silence(nframes); } @@ -681,9 +727,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 +744,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 ap = boost::dynamic_pointer_cast (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;