X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fio.cc;h=ebd295411e9cdfaf3d5198e0c36f0a737cd86d92;hb=4861eca97483128e5febb575b94688581abb0154;hp=2397c7ee067132da932818453b15495d5cdd689f;hpb=508c5eb5bd7e31d721c3a29fc734aab3a44aa8a9;p=ardour.git diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc index 2397c7ee06..ebd295411e 100644 --- a/libs/ardour/io.cc +++ b/libs/ardour/io.cc @@ -19,13 +19,14 @@ #include #include #include +#include #include #include #include #include -#include +#include #include "pbd/xml++.h" #include "pbd/replace_all.h" @@ -34,22 +35,17 @@ #include "ardour/audioengine.h" #include "ardour/buffer.h" +#include "ardour/buffer_set.h" #include "ardour/debug.h" #include "ardour/io.h" -#include "ardour/route.h" #include "ardour/port.h" -#include "ardour/audio_port.h" -#include "ardour/midi_port.h" +#include "ardour/route.h" #include "ardour/session.h" -#include "ardour/cycle_timer.h" -#include "ardour/buffer_set.h" -#include "ardour/meter.h" -#include "ardour/amp.h" #include "ardour/user_bundle.h" #include "i18n.h" -#define BLOCK_PROCESS_CALLBACK() Glib::Mutex::Lock em (AudioEngine::instance()->process_lock()) +#define BLOCK_PROCESS_CALLBACK() Glib::Threads::Mutex::Lock em (AudioEngine::instance()->process_lock()) using namespace std; using namespace ARDOUR; @@ -63,23 +59,27 @@ PBD::Signal1 IO::PortCountChanged; /** @param default_type The type of port that will be created by ensure_io * and friends if no type is explicitly requested (to avoid breakage). */ -IO::IO (Session& s, const string& name, Direction dir, DataType default_type) +IO::IO (Session& s, const string& name, Direction dir, DataType default_type, bool sendish) : SessionObject (s, name) , _direction (dir) , _default_type (default_type) + , _sendish (sendish) { _active = true; + Port::PostDisconnect.connect_same_thread (*this, boost::bind (&IO::disconnect_check, this, _1, _2)); pending_state_node = 0; setup_bundle (); } -IO::IO (Session& s, const XMLNode& node, DataType dt) +IO::IO (Session& s, const XMLNode& node, DataType dt, bool sendish) : SessionObject(s, "unnamed io") , _direction (Input) , _default_type (dt) + , _sendish (sendish) { _active = true; pending_state_node = 0; + Port::PostDisconnect.connect_same_thread (*this, boost::bind (&IO::disconnect_check, this, _1, _2)); set_state (node, Stateful::loading_state_version); setup_bundle (); @@ -87,7 +87,7 @@ IO::IO (Session& s, const XMLNode& node, DataType dt) IO::~IO () { - Glib::Mutex::Lock lm (io_lock); + Glib::Threads::Mutex::Lock lm (io_lock); BLOCK_PROCESS_CALLBACK (); @@ -96,6 +96,31 @@ IO::~IO () } } +void +IO::disconnect_check (boost::shared_ptr a, boost::shared_ptr b) +{ + /* this could be called from within our own ::disconnect() method(s) + or from somewhere that operates directly on a port. so, we don't + know for sure if we can take this lock or not. if we fail, + we assume that its safely locked by our own ::disconnect(). + */ + + Glib::Threads::Mutex::Lock tm (io_lock, Glib::Threads::TRY_LOCK); + + if (tm.locked()) { + /* we took the lock, so we cannot be here from inside + * ::disconnect() + */ + if (_ports.contains (a) || _ports.contains (b)) { + changed (IOChange (IOChange::ConnectionsChanged), this); /* EMIT SIGNAL */ + } + } else { + /* we didn't get the lock, so assume that we're inside + * ::disconnect(), and it will call changed() appropriately. + */ + } +} + void IO::increment_port_buffer_offset (pframes_t offset) { @@ -170,7 +195,7 @@ IO::disconnect (boost::shared_ptr our_port, string other_port, void* src) } { - Glib::Mutex::Lock lm (io_lock); + Glib::Threads::Mutex::Lock lm (io_lock); /* check that our_port is really one of ours */ @@ -203,7 +228,7 @@ IO::connect (boost::shared_ptr our_port, string other_port, void* src) } { - Glib::Mutex::Lock lm (io_lock); + Glib::Threads::Mutex::Lock lm (io_lock); /* check that our_port is really one of ours */ @@ -229,8 +254,8 @@ IO::remove_port (boost::shared_ptr port, void* src) ChanCount after = before; after.set (port->type(), after.get (port->type()) - 1); - bool const r = PortCountChanging (after); /* EMIT SIGNAL */ - if (r) { + boost::optional const r = PortCountChanging (after); /* EMIT SIGNAL */ + if (r.get_value_or (false)) { return -1; } @@ -240,7 +265,7 @@ IO::remove_port (boost::shared_ptr port, void* src) BLOCK_PROCESS_CALLBACK (); { - Glib::Mutex::Lock lm (io_lock); + Glib::Threads::Mutex::Lock lm (io_lock); if (_ports.remove(port)) { change.type = IOChange::Type (change.type | IOChange::ConfigurationChanged); @@ -308,7 +333,7 @@ IO::add_port (string destination, void* src, DataType type) { - Glib::Mutex::Lock lm (io_lock); + Glib::Threads::Mutex::Lock lm (io_lock); /* Create a new port */ @@ -353,7 +378,7 @@ int IO::disconnect (void* src) { { - Glib::Mutex::Lock lm (io_lock); + Glib::Threads::Mutex::Lock lm (io_lock); for (PortSet::iterator i = _ports.begin(); i != _ports.end(); ++i) { i->disconnect_all (); @@ -371,7 +396,9 @@ IO::disconnect (void* src) int IO::ensure_ports_locked (ChanCount count, bool clear, bool& changed) { +#ifndef PLATFORM_WINDOWS assert (!AudioEngine::instance()->process_lock().trylock()); +#endif boost::shared_ptr port; @@ -442,7 +469,9 @@ IO::ensure_ports_locked (ChanCount count, bool clear, bool& changed) int IO::ensure_ports (ChanCount count, bool clear, void* src) { +#ifndef PLATFORM_WINDOWS assert (!AudioEngine::instance()->process_lock().trylock()); +#endif bool changed = false; @@ -455,7 +484,7 @@ IO::ensure_ports (ChanCount count, bool clear, void* src) change.before = _ports.count (); { - Glib::Mutex::Lock im (io_lock); + Glib::Threads::Mutex::Lock im (io_lock); if (ensure_ports_locked (count, clear, changed)) { return -1; } @@ -477,7 +506,9 @@ IO::ensure_ports (ChanCount count, bool clear, void* src) int IO::ensure_io (ChanCount count, bool clear, void* src) { +#ifndef PLATFORM_WINDOWS assert (!AudioEngine::instance()->process_lock().trylock()); +#endif return ensure_ports (count, clear, src); } @@ -497,7 +528,7 @@ IO::state (bool /*full_state*/) vector::iterator ci; int n; LocaleGuard lg (X_("POSIX")); - Glib::Mutex::Lock lm (io_lock); + Glib::Threads::Mutex::Lock lm (io_lock); node->add_property("name", _name); id().print (buf, sizeof (buf)); @@ -859,7 +890,7 @@ IO::create_ports (const XMLNode& node, int version) get_port_counts (node, version, n, c); { - Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); + Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); if (ensure_ports (n, true, this)) { error << string_compose(_("%1: cannot create I/O ports"), _name) << endmsg; @@ -888,7 +919,7 @@ IO::make_connections (const XMLNode& node, int version, bool in) if (prop) { boost::shared_ptr b = find_possible_bundle (prop->value()); if (b) { - connect_ports_to_bundle (b, this); + connect_ports_to_bundle (b, true, this); } } @@ -929,6 +960,44 @@ IO::make_connections (const XMLNode& node, int version, bool in) return 0; } +void +IO::prepare_for_reset (XMLNode& node, const std::string& name) +{ + /* reset name */ + node.add_property ("name", name); + + /* now find connections and reset the name of the port + in one so that when we re-use it it will match + the name of the thing we're applying it to. + */ + + XMLProperty* prop; + XMLNodeList children = node.children(); + + for (XMLNodeIterator i = children.begin(); i != children.end(); ++i) { + + if ((*i)->name() == "Port") { + + prop = (*i)->property (X_("name")); + + if (prop) { + string new_name; + string old = prop->value(); + string::size_type slash = old.find ('/'); + + if (slash != string::npos) { + /* port name is of form: / */ + + new_name = name; + new_name += old.substr (old.find ('/')); + + prop->set_value (new_name); + } + } + } + } +} + int IO::make_connections_2X (const XMLNode& node, int /*version*/, bool in) @@ -1037,7 +1106,7 @@ IO::set_ports (const string& str) } { - Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); + Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); // FIXME: audio-only if (ensure_ports (ChanCount(DataType::AUDIO, nports), true, this)) { @@ -1179,12 +1248,18 @@ IO::latency () const } int -IO::connect_ports_to_bundle (boost::shared_ptr c, void* src) +IO::connect_ports_to_bundle (boost::shared_ptr c, bool exclusive, void* src) { BLOCK_PROCESS_CALLBACK (); { - Glib::Mutex::Lock lm2 (io_lock); + Glib::Threads::Mutex::Lock lm2 (io_lock); + + if (exclusive) { + for (PortSet::iterator i = _ports.begin(); i != _ports.end(); ++i) { + i->disconnect_all (); + } + } c->connect (_bundle, _session.engine()); @@ -1216,7 +1291,7 @@ IO::disconnect_ports_from_bundle (boost::shared_ptr c, void* src) BLOCK_PROCESS_CALLBACK (); { - Glib::Mutex::Lock lm2 (io_lock); + Glib::Threads::Mutex::Lock lm2 (io_lock); c->disconnect (_bundle, _session.engine()); @@ -1252,7 +1327,7 @@ IO::disable_connecting () int IO::enable_connecting () { - Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock()); + Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock()); connecting_legal = true; boost::optional r = ConnectingLegal (); return r.get_value_or (0); @@ -1269,14 +1344,14 @@ IO::bundle_changed (Bundle::Change /*c*/) string IO::build_legal_port_name (DataType type) { - const int name_size = jack_port_name_size(); + const int name_size = AudioEngine::instance()->port_name_size(); int limit; string suffix; if (type == DataType::AUDIO) { - suffix = _("audio"); + suffix = X_("audio"); } else if (type == DataType::MIDI) { - suffix = _("midi"); + suffix = X_("midi"); } else { throw unknown_type(); } @@ -1287,30 +1362,38 @@ IO::build_legal_port_name (DataType type) use the (new) translated name. */ - if (_direction == Input) { - suffix += X_("_in"); + if (_sendish) { + if (_direction == Input) { + suffix += X_("_return"); + } else { + suffix += X_("_send"); + } } else { - suffix += X_("_out"); + if (_direction == Input) { + suffix += X_("_in"); + } else { + suffix += X_("_out"); + } } // allow up to 4 digits for the output port number, plus the slash, suffix and extra space - limit = name_size - _session.engine().client_name().length() - (suffix.length() + 5); + limit = name_size - AudioEngine::instance()->my_name().length() - (suffix.length() + 5); - char buf1[name_size+1]; - char buf2[name_size+1]; + std::vector buf1(name_size+1); + std::vector buf2(name_size+1); /* colons are illegal in port names, so fix that */ string nom = _name.val(); replace_all (nom, ":", ";"); - snprintf (buf1, name_size+1, ("%.*s/%s"), limit, nom.c_str(), suffix.c_str()); + snprintf (&buf1[0], name_size+1, ("%.*s/%s"), limit, nom.c_str(), suffix.c_str()); - int port_number = find_port_hole (buf1); - snprintf (buf2, name_size+1, "%s %d", buf1, port_number); + int port_number = find_port_hole (&buf1[0]); + snprintf (&buf2[0], name_size+1, "%s %d", &buf1[0], port_number); - return string (buf2); + return string (&buf2[0]); } int32_t @@ -1328,13 +1411,13 @@ IO::find_port_hole (const char* base) */ for (n = 1; n < 9999; ++n) { - char buf[jack_port_name_size()]; + std::vector buf (AudioEngine::instance()->port_name_size()); PortSet::iterator i = _ports.begin(); - snprintf (buf, jack_port_name_size(), _("%s %u"), base, n); + snprintf (&buf[0], jack_port_name_size(), _("%s %u"), base, n); for ( ; i != _ports.end(); ++i) { - if (i->name() == buf) { + if (string(i->name()) == string(&buf[0])) { break; } } @@ -1562,8 +1645,10 @@ IO::process_input (boost::shared_ptr proc, framepos_t start_frame, fr return; } - _buffers.get_jack_port_addresses (_ports, nframes); - proc->run (_buffers, start_frame, end_frame, nframes, true); + _buffers.get_backend_port_addresses (_ports, nframes); + if (proc) { + proc->run (_buffers, start_frame, end_frame, nframes, true); + } } void @@ -1650,6 +1735,6 @@ IO::physically_connected () const bool IO::has_port (boost::shared_ptr p) const { - Glib::Mutex::Lock lm (io_lock); + Glib::Threads::Mutex::Lock lm (io_lock); return _ports.contains (p); }