X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fport.cc;h=5897015b273baed20c172da4b1bb1decbf92933d;hb=d9cebc2edf8accded23c6f2a1caab73eb47a50fd;hp=b200888508dc240729156e77936a87f9aaf50129;hpb=6e04b4381ce97da1a1a5d0d4517a5ac4f2404d41;p=ardour.git diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc index b200888508..5897015b27 100644 --- a/libs/ardour/port.cc +++ b/libs/ardour/port.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2009 Paul Davis + Copyright (C) 2009 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,96 +17,63 @@ */ +#ifdef WAF_BUILD +#include "libardour-config.h" +#endif + #include "ardour/port.h" #include "ardour/audioengine.h" -#include "ardour/i18n.h" #include "pbd/failed_constructor.h" #include "pbd/error.h" #include "pbd/compose.h" #include -ARDOUR::AudioEngine* ARDOUR::Port::_engine = 0; +#include "i18n.h" + +using namespace std; +using namespace ARDOUR; + +AudioEngine* Port::_engine = 0; +nframes_t Port::_port_offset = 0; +nframes_t Port::_buffer_size = 0; /** @param n Port short name */ -ARDOUR::Port::Port (std::string const & n, DataType t, Flags f, bool e) : _jack_port (0), _last_monitor (false), _latency (0), _name (n), _flags (f) +Port::Port (std::string const & n, DataType t, Flags f) + : _last_monitor (false) + , _name (n) + , _flags (f) { + /* Unfortunately we have to pass the DataType into this constructor so that we can create the right kind of JACK port; aside from this we'll use the virtual function type () - to establish type. */ + to establish type. + */ assert (_name.find_first_of (':') == std::string::npos); - - if (e) { - try { - do_make_external (t); - } - catch (...) { - throw failed_constructor (); - } - } -} - -/** Port destructor */ -ARDOUR::Port::~Port () -{ - if (_jack_port) { - jack_port_unregister (_engine->jack (), _jack_port); - } -} -/** Make this port externally visible by setting it up to use a JACK port. - * @param t Data type, so that we can call this method from the constructor. - */ -void -ARDOUR::Port::do_make_external (DataType t) -{ - if (_jack_port) { - /* already external */ - return; - } - - _jack_port = jack_port_register (_engine->jack (), _name.c_str (), t.to_jack_type (), _flags, 0); - if (_jack_port == 0) { - throw std::runtime_error ("Could not register JACK port"); + if ((_jack_port = jack_port_register (_engine->jack (), _name.c_str (), t.to_jack_type (), _flags, 0)) == 0) { + throw failed_constructor (); } } -void -ARDOUR::Port::make_external () +/** Port destructor */ +Port::~Port () { - do_make_external (type ()); + jack_port_unregister (_engine->jack (), _jack_port); } /** @return true if this port is connected to anything */ bool -ARDOUR::Port::connected () const +Port::connected () const { - if (!_connections.empty ()) { - /* connected to a Port* */ - return true; - } - - if (_jack_port == 0) { - /* not using a JACK port, so can't be connected to anything else */ - return false; - } - return (jack_port_connected (_jack_port) != 0); } int -ARDOUR::Port::disconnect_all () +Port::disconnect_all () { - /* Disconnect from Port* connections */ - for (std::set::iterator i = _connections.begin (); i != _connections.end (); ++i) { - (*i)->_connections.erase (this); - } - - _connections.clear (); - - /* And JACK connections */ jack_port_disconnect (_engine->jack(), _jack_port); - _named_connections.clear (); + _connections.clear (); return 0; } @@ -115,190 +82,114 @@ ARDOUR::Port::disconnect_all () * @return true if this port is connected to o, otherwise false. */ bool -ARDOUR::Port::connected_to (std::string const & o) const +Port::connected_to (std::string const & o) const { - std::string const full = _engine->make_port_name_non_relative (o); - std::string const shrt = _engine->make_port_name_non_relative (o); - - if (_jack_port && jack_port_connected_to (_jack_port, full.c_str ())) { - /* connected via JACK */ - return true; - } - - for (std::set::iterator i = _connections.begin (); i != _connections.end (); ++i) { - if ((*i)->name () == shrt) { - /* connected internally */ - return true; - } - } - - return false; + return jack_port_connected_to (_jack_port, _engine->make_port_name_non_relative(o).c_str ()); } /** @param o Filled in with port full names of ports that we are connected to */ int -ARDOUR::Port::get_connections (std::vector & c) const +Port::get_connections (std::vector & c) const { int n = 0; - /* JACK connections */ - if (_jack_port) { - const char** jc = jack_port_get_connections (_jack_port); - if (jc) { - for (int i = 0; jc[i]; ++i) { - c.push_back (jc[i]); - ++n; - } + const char** jc = jack_port_get_connections (_jack_port); + if (jc) { + for (int i = 0; jc[i]; ++i) { + c.push_back (jc[i]); + ++n; } - } - - /* Internal connections */ - for (std::set::iterator i = _connections.begin (); i != _connections.end (); ++i) { - std::string const full = _engine->make_port_name_non_relative ((*i)->name()); - c.push_back (full); - ++n; + free (jc); } return n; } int -ARDOUR::Port::connect (std::string const & other) +Port::connect (std::string const & other) { /* caller must hold process lock */ std::string const other_shrt = _engine->make_port_name_non_relative (other); - - Port* p = _engine->get_port_by_name_locked (other_shrt); - - int r; - - if (p && !p->external ()) { - /* non-external Ardour port; connect using Port* */ - r = connect (p); - } else { - /* connect using name */ + std::string const this_shrt = _engine->make_port_name_non_relative (_name); - /* for this to work, we must be an external port */ - if (!external ()) { - make_external (); - } - - std::string const this_shrt = _engine->make_port_name_non_relative (_name); + int r = 0; - if (sends_output ()) { - r = jack_connect (_engine->jack (), this_shrt.c_str (), other_shrt.c_str ()); - } else { - r = jack_connect (_engine->jack (), other_shrt.c_str (), this_shrt.c_str()); - } + if (sends_output ()) { + r = jack_connect (_engine->jack (), this_shrt.c_str (), other_shrt.c_str ()); + } else { + r = jack_connect (_engine->jack (), other_shrt.c_str (), this_shrt.c_str()); + } - if (r == 0) { - _named_connections.insert (other); - } + if (r == 0) { + _connections.insert (other); } return r; } int -ARDOUR::Port::disconnect (std::string const & other) +Port::disconnect (std::string const & other) { /* caller must hold process lock */ std::string const other_shrt = _engine->make_port_name_non_relative (other); - - Port* p = _engine->get_port_by_name_locked (other_shrt); - int r; - - if (p && !p->external ()) { - /* non-external Ardour port; disconnect using Port* */ - r = disconnect (p); - } else { - /* disconnect using name */ + std::string const this_shrt = _engine->make_port_name_non_relative (_name); - std::string const this_shrt = _engine->make_port_name_non_relative (_name); + int r = 0; - if (sends_output ()) { - r = jack_disconnect (_engine->jack (), this_shrt.c_str (), other_shrt.c_str ()); - } else { - r = jack_disconnect (_engine->jack (), other_shrt.c_str (), this_shrt.c_str ()); - } + if (sends_output ()) { + r = jack_disconnect (_engine->jack (), this_shrt.c_str (), other_shrt.c_str ()); + } else { + r = jack_disconnect (_engine->jack (), other_shrt.c_str (), this_shrt.c_str ()); + } - if (r == 0) { - _named_connections.erase (other); - } + if (r == 0) { + _connections.erase (other); } - return r; +return r; } bool -ARDOUR::Port::connected_to (Port* o) const +Port::connected_to (Port* o) const { return connected_to (o->name ()); } int -ARDOUR::Port::connect (Port* o) +Port::connect (Port* o) { - /* caller must hold process lock */ - - if (external () && o->external ()) { - /* we're both external; connect using name */ - return connect (o->name ()); - } - - /* otherwise connect by Port* */ - _connections.insert (o); - o->_connections.insert (this); - - return 0; + return connect (o->name ()); } int -ARDOUR::Port::disconnect (Port* o) +Port::disconnect (Port* o) { - if (external () && o->external ()) { - /* we're both external; try disconnecting using name */ - int const r = disconnect (o->name ()); - if (r == 0) { - return 0; - } - } - - _connections.erase (o); - o->_connections.erase (this); - - return 0; + return disconnect (o->name ()); } void -ARDOUR::Port::set_engine (AudioEngine* e) +Port::set_engine (AudioEngine* e) { _engine = e; } void -ARDOUR::Port::ensure_monitor_input (bool yn) +Port::ensure_monitor_input (bool yn) { - if (_jack_port) { - jack_port_ensure_monitor (_jack_port, yn); - } + jack_port_ensure_monitor (_jack_port, yn); } bool -ARDOUR::Port::monitoring_input () const +Port::monitoring_input () const { - if (_jack_port) { - return jack_port_monitoring_input (_jack_port); - } else { - return false; - } + return jack_port_monitoring_input (_jack_port); } void -ARDOUR::Port::reset () +Port::reset () { _last_monitor = false; @@ -308,33 +199,42 @@ ARDOUR::Port::reset () } void -ARDOUR::Port::recompute_total_latency () const +Port::recompute_total_latency () const { -#ifdef HAVE_JACK_RECOMPUTE_LATENCY - if (_jack_port) { - jack_recompute_total_latency (_engine->jack (), _jack_port); +#ifdef HAVE_JACK_RECOMPUTE_LATENCY + jack_client_t* jack = _engine->jack(); + + if (!jack) { + return; } -#endif + + jack_recompute_total_latency (jack, _jack_port); +#endif } nframes_t -ARDOUR::Port::total_latency () const +Port::total_latency () const { - if (_jack_port) { - return jack_port_get_total_latency (_engine->jack (), _jack_port); - } else { - return _latency; + jack_client_t* jack = _engine->jack(); + + if (!jack) { + return 0; } + + return jack_port_get_total_latency (jack, _jack_port); } int -ARDOUR::Port::reestablish () +Port::reestablish () { - if (!_jack_port) { - return 0; + jack_client_t* jack = _engine->jack(); + + if (!jack) { + return -1; } - _jack_port = jack_port_register (_engine->jack(), _name.c_str(), type().to_jack_type(), _flags, 0); + cerr << "RE-REGISTER: " << _name.c_str() << endl; + _jack_port = jack_port_register (jack, _name.c_str(), type().to_jack_type(), _flags, 0); if (_jack_port == 0) { PBD::error << string_compose (_("could not reregister %1"), _name) << endmsg; @@ -348,15 +248,11 @@ ARDOUR::Port::reestablish () int -ARDOUR::Port::reconnect () +Port::reconnect () { /* caller must hold process lock; intended to be used only after reestablish() */ - if (!_jack_port) { - return 0; - } - - for (std::set::iterator i = _named_connections.begin(); i != _named_connections.end(); ++i) { + for (std::set::iterator i = _connections.begin(); i != _connections.end(); ++i) { if (connect (*i)) { return -1; } @@ -365,20 +261,17 @@ ARDOUR::Port::reconnect () return 0; } -/** @param n Short name */ +/** @param n Short port name (no JACK client name) */ int -ARDOUR::Port::set_name (std::string const & n) +Port::set_name (std::string const & n) { - assert (_name.find_first_of (':') == std::string::npos); + if (n == _name) { + return 0; + } - int r = 0; - - if (_jack_port) { - r = jack_port_set_name (_jack_port, n.c_str()); - if (r == 0) { - _name = n; - } - } else { + int const r = jack_port_set_name (_jack_port, n.c_str()); + + if (r == 0) { _name = n; } @@ -386,15 +279,14 @@ ARDOUR::Port::set_name (std::string const & n) } void -ARDOUR::Port::set_latency (nframes_t n) +Port::request_monitor_input (bool yn) { - _latency = n; + jack_port_request_monitor (_jack_port, yn); } void -ARDOUR::Port::request_monitor_input (bool yn) +Port::set_latency (nframes_t n) { - if (_jack_port) { - jack_port_request_monitor (_jack_port, yn); - } + jack_port_set_latency (_jack_port, n); } +