X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fio.cc;h=27f8ca819dcdca6889dc87082c364681545ad3c4;hb=c4c40340855dff6191a670d3130d65b1e79dc8a0;hp=f49692a910b9fd4e1449d87fdd1841d8db5d3482;hpb=79f91c7a205d981d2b8cc15e32a6da02d8423065;p=ardour.git diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc index f49692a910..27f8ca819d 100644 --- a/libs/ardour/io.cc +++ b/libs/ardour/io.cc @@ -18,12 +18,12 @@ #include #include +#include + #include #include #include -#include - #include #include @@ -34,6 +34,7 @@ #include "ardour/audioengine.h" #include "ardour/buffer.h" +#include "ardour/debug.h" #include "ardour/io.h" #include "ardour/route.h" #include "ardour/port.h" @@ -41,7 +42,6 @@ #include "ardour/midi_port.h" #include "ardour/session.h" #include "ardour/cycle_timer.h" -#include "ardour/panner.h" #include "ardour/buffer_set.h" #include "ardour/meter.h" #include "ardour/amp.h" @@ -49,19 +49,7 @@ #include "i18n.h" -#include - -/* - A bug in OS X's cmath that causes isnan() and isinf() to be - "undeclared". the following works around that -*/ - -#if defined(__APPLE__) && defined(__MACH__) -extern "C" int isnan (double); -extern "C" int isinf (double); -#endif - -#define BLOCK_PROCESS_CALLBACK() Glib::Mutex::Lock em (_session.engine().process_lock()) +#define BLOCK_PROCESS_CALLBACK() Glib::Mutex::Lock em (AudioEngine::instance()->process_lock()) using namespace std; using namespace ARDOUR; @@ -69,8 +57,8 @@ using namespace PBD; const string IO::state_node_name = "IO"; bool IO::connecting_legal = false; -sigc::signal IO::ConnectingLegal; -sigc::signal IO::PortCountChanged; +PBD::Signal0 IO::ConnectingLegal; +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). @@ -82,7 +70,7 @@ IO::IO (Session& s, const string& name, Direction dir, DataType default_type) { _active = true; pending_state_node = 0; - setup_bundles (); + setup_bundle (); } IO::IO (Session& s, const XMLNode& node, DataType dt) @@ -93,8 +81,8 @@ IO::IO (Session& s, const XMLNode& node, DataType dt) _active = true; pending_state_node = 0; - set_state (node); - setup_bundles (); + set_state (node, Stateful::loading_state_version); + setup_bundle (); } IO::~IO () @@ -108,8 +96,20 @@ IO::~IO () } } +void +IO::increment_port_buffer_offset (pframes_t offset) +{ + /* io_lock, not taken: function must be called from Session::process() calltree */ + + if (_direction == Output) { + for (PortSet::iterator i = _ports.begin(); i != _ports.end(); ++i) { + i->increment_port_buffer_offset (offset); + } + } +} + void -IO::silence (nframes_t nframes) +IO::silence (framecnt_t nframes) { /* io_lock, not taken: function must be called from Session::process() calltree */ @@ -124,16 +124,20 @@ IO::check_bundles_connected () check_bundles (_bundles_connected, ports()); } +/** Check the bundles in list to see which are connected to a given PortSet, + * and update list with those that are connected such that every port on every + * bundle channel x is connected to port x in ports. + */ void -IO::check_bundles (std::vector& list, const PortSet& ports) +IO::check_bundles (std::vector& list, const PortSet& ports) { - std::vector new_list; + std::vector new_list; - for (std::vector::iterator i = list.begin(); i != list.end(); ++i) { + for (std::vector::iterator i = list.begin(); i != list.end(); ++i) { - uint32_t const N = i->bundle->nchannels (); + uint32_t const N = (*i)->bundle->nchannels().n_total(); - if (_ports.num_ports (default_type()) < N) { + if (_ports.num_ports() < N) { continue; } @@ -141,7 +145,7 @@ IO::check_bundles (std::vector& list, const PortSet& ports) for (uint32_t j = 0; j < N; ++j) { /* Every port on bundle channel j must be connected to our input j */ - Bundle::PortList const pl = i->bundle->channel_ports (j); + Bundle::PortList const pl = (*i)->bundle->channel_ports (j); for (uint32_t k = 0; k < pl.size(); ++k) { if (ports.port(j)->connected_to (pl[k]) == false) { ok = false; @@ -157,7 +161,7 @@ IO::check_bundles (std::vector& list, const PortSet& ports) if (ok) { new_list.push_back (*i); } else { - i->changed.disconnect (); + delete *i; } } @@ -172,30 +176,27 @@ IO::disconnect (Port* our_port, string other_port, void* src) return 0; } - { - BLOCK_PROCESS_CALLBACK (); - - { - Glib::Mutex::Lock lm (io_lock); - - /* check that our_port is really one of ours */ - - if ( ! _ports.contains(our_port)) { - return -1; - } - - /* disconnect it from the source */ - - if (our_port->disconnect (other_port)) { - error << string_compose(_("IO: cannot disconnect port %1 from %2"), our_port->name(), other_port) << endmsg; - return -1; - } - - check_bundles_connected (); - } - } + { + Glib::Mutex::Lock lm (io_lock); + + /* check that our_port is really one of ours */ + + if ( ! _ports.contains(our_port)) { + return -1; + } + + /* disconnect it from the source */ + + if (our_port->disconnect (other_port)) { + error << string_compose(_("IO: cannot disconnect port %1 from %2"), our_port->name(), other_port) << endmsg; + return -1; + } + + check_bundles_connected (); + } + + changed (IOChange (IOChange::ConnectionsChanged), src); /* EMIT SIGNAL */ - changed (ConnectionsChanged, src); /* EMIT SIGNAL */ _session.set_dirty (); return 0; @@ -209,26 +210,21 @@ IO::connect (Port* our_port, string other_port, void* src) } { - BLOCK_PROCESS_CALLBACK (); - - { - Glib::Mutex::Lock lm (io_lock); - - /* check that our_port is really one of ours */ - - if ( ! _ports.contains(our_port) ) { - return -1; - } - - /* connect it to the source */ - - if (our_port->connect (other_port)) { - return -1; - } + Glib::Mutex::Lock lm (io_lock); + + /* check that our_port is really one of ours */ + + if ( ! _ports.contains(our_port) ) { + return -1; + } + + /* connect it to the source */ + + if (our_port->connect (other_port)) { + return -1; } } - - changed (ConnectionsChanged, src); /* EMIT SIGNAL */ + changed (IOChange (IOChange::ConnectionsChanged), src); /* EMIT SIGNAL */ _session.set_dirty (); return 0; } @@ -236,20 +232,30 @@ IO::connect (Port* our_port, string other_port, void* src) int IO::remove_port (Port* port, void* src) { - IOChange change (NoChange); + ChanCount before = _ports.count (); + ChanCount after = before; + after.set (port->type(), after.get (port->type()) - 1); + + bool const r = PortCountChanging (after); /* EMIT SIGNAL */ + if (r) { + return -1; + } + + IOChange change; { BLOCK_PROCESS_CALLBACK (); - { Glib::Mutex::Lock lm (io_lock); if (_ports.remove(port)) { - change = IOChange (change|ConfigurationChanged); + change.type = IOChange::Type (change.type | IOChange::ConfigurationChanged); + change.before = before; + change.after = _ports.count (); if (port->connected()) { - change = IOChange (change|ConnectionsChanged); + change.type = IOChange::Type (change.type | IOChange::ConnectionsChanged); } _session.engine().unregister_port (*port); @@ -258,24 +264,27 @@ IO::remove_port (Port* port, void* src) } PortCountChanged (n_ports()); /* EMIT SIGNAL */ + + if (change.type != IOChange::NoChange) { + changed (change, src); + _session.set_dirty (); + } } - if (change & ConfigurationChanged) { - setup_bundles (); + if (change.type & IOChange::ConfigurationChanged) { + setup_bundle (); } - if (change != NoChange) { - changed (change, src); - _session.set_dirty (); - return 0; + if (change.type == IOChange::NoChange) { + return -1; } - return -1; + return 0; } -/** Add an output port. +/** Add a port. * - * @param destination Name of input port to connect new port to. + * @param destination Name of port to connect new port to. * @param src Source for emitted ConfigurationChanged signal. * @param type Data type of port. Default value (NIL) will use this IO's default type. */ @@ -288,6 +297,8 @@ IO::add_port (string destination, void* src, DataType type) type = _default_type; } + IOChange change; + { BLOCK_PROCESS_CALLBACK (); @@ -295,7 +306,7 @@ IO::add_port (string destination, void* src, DataType type) { Glib::Mutex::Lock lm (io_lock); - /* Create a new output port */ + /* Create a new port */ string portname = build_legal_port_name (type); @@ -311,10 +322,16 @@ IO::add_port (string destination, void* src, DataType type) } } + change.before = _ports.count (); _ports.add (our_port); } PortCountChanged (n_ports()); /* EMIT SIGNAL */ + + // pan_changed (src); /* EMIT SIGNAL */ + change.type = IOChange::ConfigurationChanged; + change.after = _ports.count (); + changed (change, src); /* EMIT SIGNAL */ } if (destination.length()) { @@ -323,9 +340,7 @@ IO::add_port (string destination, void* src, DataType type) } } - // pan_changed (src); /* EMIT SIGNAL */ - changed (ConfigurationChanged, src); /* EMIT SIGNAL */ - setup_bundles (); + setup_bundle (); _session.set_dirty (); return 0; @@ -335,27 +350,26 @@ int IO::disconnect (void* src) { { - BLOCK_PROCESS_CALLBACK (); - - { - Glib::Mutex::Lock lm (io_lock); - - for (PortSet::iterator i = _ports.begin(); i != _ports.end(); ++i) { - i->disconnect_all (); - } - - check_bundles_connected (); + Glib::Mutex::Lock lm (io_lock); + + for (PortSet::iterator i = _ports.begin(); i != _ports.end(); ++i) { + i->disconnect_all (); } + + check_bundles_connected (); } - - changed (ConnectionsChanged, src); /* EMIT SIGNAL */ + + changed (IOChange (IOChange::ConnectionsChanged), src); /* EMIT SIGNAL */ return 0; } +/** Caller must hold process lock */ bool IO::ensure_ports_locked (ChanCount count, bool clear, void* /*src*/) { + assert (!AudioEngine::instance()->process_lock().trylock()); + Port* port = 0; bool changed = false; @@ -396,7 +410,7 @@ IO::ensure_ports_locked (ChanCount count, bool clear, void* /*src*/) catch (AudioEngine::PortRegistrationFailure& err) { /* pass it on */ - throw AudioEngine::PortRegistrationFailure(); + throw; } _ports.add (port); @@ -420,37 +434,46 @@ IO::ensure_ports_locked (ChanCount count, bool clear, void* /*src*/) return changed; } - +/** Caller must hold process lock */ int -IO::ensure_ports (ChanCount count, bool clear, bool lockit, void* src) +IO::ensure_ports (ChanCount count, bool clear, void* src) { + assert (!AudioEngine::instance()->process_lock().trylock()); + bool changed = false; if (count == n_ports() && !clear) { return 0; } - if (lockit) { - BLOCK_PROCESS_CALLBACK (); + IOChange change; + + change.before = _ports.count (); + + { Glib::Mutex::Lock im (io_lock); changed = ensure_ports_locked (count, clear, src); - } else { - changed = ensure_ports_locked (count, clear, src); } if (changed) { - this->changed (ConfigurationChanged, src); /* EMIT SIGNAL */ - setup_bundles (); + change.after = _ports.count (); + change.type = IOChange::ConfigurationChanged; + this->changed (change, src); /* EMIT SIGNAL */ + _buffers.attach_buffers (_ports); + setup_bundle (); _session.set_dirty (); } return 0; } +/** Caller must hold process lock */ int IO::ensure_io (ChanCount count, bool clear, void* src) { - return ensure_ports (count, clear, true, src); + assert (!AudioEngine::instance()->process_lock().trylock()); + + return ensure_ports (count, clear, src); } XMLNode& @@ -476,9 +499,9 @@ IO::state (bool /*full_state*/) node->add_property ("direction", enum_2_string (_direction)); node->add_property ("default-type", _default_type.to_string()); - for (std::vector::iterator i = _bundles_connected.begin(); i != _bundles_connected.end(); ++i) { + for (std::vector::iterator i = _bundles_connected.begin(); i != _bundles_connected.end(); ++i) { XMLNode* n = new XMLNode ("Bundle"); - n->add_property ("name", i->bundle->name ()); + n->add_property ("name", (*i)->bundle->name ()); node->add_child_nocopy (*n); } @@ -522,7 +545,7 @@ IO::set_state (const XMLNode& node, int version) * by the caller. */ assert (version >= 3000); - + const XMLProperty* prop; XMLNodeConstIterator iter; LocaleGuard lg (X_("POSIX")); @@ -568,7 +591,7 @@ IO::set_state (const XMLNode& node, int version) pending_state_node = new XMLNode (node); pending_state_node_version = version; pending_state_node_in = false; - connection_legal_c = ConnectingLegal.connect (mem_fun (*this, &IO::connecting_became_legal)); + ConnectingLegal.connect_same_thread (connection_legal_c, boost::bind (&IO::connecting_became_legal, this)); } @@ -590,7 +613,7 @@ IO::set_state_2X (const XMLNode& node, int version, bool in) error << string_compose(_("incorrect XML node \"%1\" passed to IO object"), node.name()) << endmsg; return -1; } - + if ((prop = node.property ("name")) != 0) { set_name (prop->value()); } @@ -611,7 +634,7 @@ IO::set_state_2X (const XMLNode& node, int version, bool in) } if (connecting_legal) { - + if (make_connections_2X (node, version, in)) { return -1; } @@ -621,7 +644,7 @@ IO::set_state_2X (const XMLNode& node, int version, bool in) pending_state_node = new XMLNode (node); pending_state_node_version = version; pending_state_node_in = in; - connection_legal_c = ConnectingLegal.connect (mem_fun (*this, &IO::connecting_became_legal)); + ConnectingLegal.connect_same_thread (connection_legal_c, boost::bind (&IO::connecting_became_legal, this)); } return 0; @@ -676,12 +699,12 @@ IO::find_possible_bundle (const string &desired_name) // see if it's a stereo connection e.g. "in 3+4" if (last_non_digit_pos > 1 && desired_name[last_non_digit_pos] == '+') { - int left_bundle_number = 0; string::size_type left_last_non_digit_pos; left_last_non_digit_pos = desired_name.find_last_not_of(digits, last_non_digit_pos-1); if (left_last_non_digit_pos != string::npos) { + int left_bundle_number = 0; stringstream s; s << desired_name.substr(left_last_non_digit_pos, last_non_digit_pos-1); s >> left_bundle_number; @@ -739,19 +762,23 @@ IO::find_possible_bundle (const string &desired_name) } int -IO::get_port_counts_2X (XMLNode const & node, int version, ChanCount& n, boost::shared_ptr& c) +IO::get_port_counts_2X (XMLNode const & node, int /*version*/, ChanCount& n, boost::shared_ptr& /*c*/) { XMLProperty const * prop; XMLNodeList children = node.children (); uint32_t n_audio = 0; - + for (XMLNodeIterator i = children.begin(); i != children.end(); ++i) { if ((prop = node.property ("inputs")) != 0 && _direction == Input) { n_audio = count (prop->value().begin(), prop->value().end(), '{'); + } else if ((prop = node.property ("input-connection")) != 0 && _direction == Input) { + n_audio = 1; } else if ((prop = node.property ("outputs")) != 0 && _direction == Output) { n_audio = count (prop->value().begin(), prop->value().end(), '{'); + } else if ((prop = node.property ("output-connection")) != 0 && _direction == Output) { + n_audio = 2; } } @@ -768,7 +795,7 @@ IO::get_port_counts (const XMLNode& node, int version, ChanCount& n, boost::shar if (version < 3000) { return get_port_counts_2X (node, version, n, c); } - + XMLProperty const * prop; XMLNodeConstIterator iter; uint32_t n_audio = 0; @@ -780,7 +807,7 @@ IO::get_port_counts (const XMLNode& node, int version, ChanCount& n, boost::shar if ((prop = node.property ("connection")) != 0) { if ((c = find_possible_bundle (prop->value())) != 0) { - n = ChanCount::max (n, ChanCount(c->type(), c->nchannels())); + n = ChanCount::max (n, c->nchannels()); } return 0; } @@ -789,7 +816,7 @@ IO::get_port_counts (const XMLNode& node, int version, ChanCount& n, boost::shar if ((*iter)->name() == X_("Bundle")) { if ((c = find_possible_bundle (prop->value())) != 0) { - n = ChanCount::max (n, ChanCount(c->type(), c->nchannels())); + n = ChanCount::max (n, c->nchannels()); return 0; } else { return -1; @@ -820,12 +847,16 @@ IO::create_ports (const XMLNode& node, int version) { ChanCount n; boost::shared_ptr c; - + get_port_counts (node, version, n, c); - - if (ensure_ports (n, true, true, this)) { - error << string_compose(_("%1: cannot create I/O ports"), _name) << endmsg; - return -1; + + { + Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); + + if (ensure_ports (n, true, this)) { + error << string_compose(_("%1: cannot create I/O ports"), _name) << endmsg; + return -1; + } } /* XXX use c */ @@ -839,7 +870,7 @@ IO::make_connections (const XMLNode& node, int version, bool in) if (version < 3000) { return make_connections_2X (node, version, in); } - + const XMLProperty* prop; for (XMLNodeConstIterator i = node.children().begin(); i != node.children().end(); ++i) { @@ -878,12 +909,12 @@ IO::make_connections (const XMLNode& node, int version, bool in) if ((prop = cnode->property (X_("other"))) == 0) { continue; } - + if (prop) { - p->connect (prop->value()); + connect (p, prop->value(), this); } } - } + } } } @@ -892,12 +923,12 @@ IO::make_connections (const XMLNode& node, int version, bool in) int -IO::make_connections_2X (const XMLNode& node, int version, bool in) +IO::make_connections_2X (const XMLNode& node, int /*version*/, bool in) { const XMLProperty* prop; /* XXX: bundles ("connections" as was) */ - + if ((prop = node.property ("inputs")) != 0 && in) { string::size_type ostart = 0; @@ -908,33 +939,33 @@ IO::make_connections_2X (const XMLNode& node, int version, bool in) vector ports; string const str = prop->value (); - + while ((start = str.find_first_of ('{', ostart)) != string::npos) { start += 1; - + if ((end = str.find_first_of ('}', start)) == string::npos) { error << string_compose(_("IO: badly formed string in XML node for inputs \"%1\""), str) << endmsg; return -1; } - + if ((n = parse_io_string (str.substr (start, end - start), ports)) < 0) { error << string_compose(_("bad input string in XML node \"%1\""), str) << endmsg; - + return -1; - + } else if (n > 0) { for (int x = 0; x < n; ++x) { /* XXX: this is a bit of a hack; need to check if it's always valid */ - string::size_type const p = ports[x].find ("/out"); + string::size_type const p = ports[x].find ("/out"); if (p != string::npos) { ports[x].replace (p, 4, "/audio_out"); } nth(i)->connect (ports[x]); } } - + ostart = end+1; i++; } @@ -949,34 +980,34 @@ IO::make_connections_2X (const XMLNode& node, int version, bool in) int i = 0; int n; vector ports; - + string const str = prop->value (); - + while ((start = str.find_first_of ('{', ostart)) != string::npos) { start += 1; - + if ((end = str.find_first_of ('}', start)) == string::npos) { error << string_compose(_("IO: badly formed string in XML node for outputs \"%1\""), str) << endmsg; return -1; } - + if ((n = parse_io_string (str.substr (start, end - start), ports)) < 0) { error << string_compose(_("IO: bad output string in XML node \"%1\""), str) << endmsg; - + return -1; - + } else if (n > 0) { - + for (int x = 0; x < n; ++x) { /* XXX: this is a bit of a hack; need to check if it's always valid */ - string::size_type const p = ports[x].find ("/in"); + string::size_type const p = ports[x].find ("/in"); if (p != string::npos) { ports[x].replace (p, 3, "/audio_in"); } nth(i)->connect (ports[x]); } } - + ostart = end+1; i++; } @@ -997,9 +1028,13 @@ IO::set_ports (const string& str) return 0; } - // FIXME: audio-only - if (ensure_ports (ChanCount(DataType::AUDIO, nports), true, true, this)) { - return -1; + { + Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); + + // FIXME: audio-only + if (ensure_ports (ChanCount(DataType::AUDIO, nports), true, this)) { + return -1; + } } string::size_type start, end, ostart; @@ -1088,73 +1123,55 @@ IO::set_name (const string& requested_name) { string name = requested_name; - if (name == _name) { + if (_name == name) { return true; } /* replace all colons in the name. i wish we didn't have to do this */ - if (replace_all (name, ":", "-")) { - warning << _("you cannot use colons to name objects with I/O connections") << endmsg; - } + replace_all (name, ":", "-"); for (PortSet::iterator i = _ports.begin(); i != _ports.end(); ++i) { string current_name = i->name(); - current_name.replace (current_name.find (_name), _name.length(), name); + current_name.replace (current_name.find (_name), _name.val().length(), name); i->set_name (current_name); } bool const r = SessionObject::set_name (name); - setup_bundles (); + setup_bundle (); return r; } -void -IO::set_port_latency (nframes_t nframes) -{ - Glib::Mutex::Lock lm (io_lock); - - for (PortSet::iterator i = _ports.begin(); i != _ports.end(); ++i) { - i->set_latency (nframes); - } -} - -nframes_t +framecnt_t IO::latency () const { - nframes_t max_latency; - nframes_t latency; + framecnt_t max_latency; + framecnt_t latency; max_latency = 0; /* io lock not taken - must be protected by other means */ for (PortSet::const_iterator i = _ports.begin(); i != _ports.end(); ++i) { - if ((latency = i->total_latency ()) > max_latency) { + if ((latency = i->private_latency_range (_direction == Output).max) > max_latency) { max_latency = latency; } } + DEBUG_TRACE (DEBUG::Latency, string_compose ("%1: max %4 latency from %2 ports = %3\n", + name(), _ports.num_ports(), max_latency, + ((_direction == Output) ? "PLAYBACK" : "CAPTURE"))); return max_latency; } -void -IO::update_port_total_latencies () -{ - /* io_lock, not taken: function must be called from Session::process() calltree */ - - for (PortSet::iterator i = _ports.begin(); i != _ports.end(); ++i) { - _session.engine().update_total_latency (*i); - } -} - int IO::connect_ports_to_bundle (boost::shared_ptr c, void* src) { + BLOCK_PROCESS_CALLBACK (); + { - BLOCK_PROCESS_CALLBACK (); Glib::Mutex::Lock lm2 (io_lock); c->connect (_bundle, _session.engine()); @@ -1165,27 +1182,28 @@ IO::connect_ports_to_bundle (boost::shared_ptr c, void* src) if (ub) { /* See if we already know about this one */ - std::vector::iterator i = _bundles_connected.begin(); - while (i != _bundles_connected.end() && i->bundle != ub) { + std::vector::iterator i = _bundles_connected.begin(); + while (i != _bundles_connected.end() && (*i)->bundle != ub) { ++i; } if (i == _bundles_connected.end()) { /* We don't, so make a note */ - _bundles_connected.push_back (UserBundleInfo (this, ub)); + _bundles_connected.push_back (new UserBundleInfo (this, ub)); } } } - changed (IOChange (ConfigurationChanged|ConnectionsChanged), src); /* EMIT SIGNAL */ + changed (IOChange (IOChange::ConnectionsChanged), src); /* EMIT SIGNAL */ return 0; } int IO::disconnect_ports_from_bundle (boost::shared_ptr c, void* src) { + BLOCK_PROCESS_CALLBACK (); + { - BLOCK_PROCESS_CALLBACK (); Glib::Mutex::Lock lm2 (io_lock); c->disconnect (_bundle, _session.engine()); @@ -1195,18 +1213,19 @@ IO::disconnect_ports_from_bundle (boost::shared_ptr c, void* src) boost::shared_ptr ub = boost::dynamic_pointer_cast (c); if (ub) { - std::vector::iterator i = _bundles_connected.begin(); - while (i != _bundles_connected.end() && i->bundle != ub) { + std::vector::iterator i = _bundles_connected.begin(); + while (i != _bundles_connected.end() && (*i)->bundle != ub) { ++i; } if (i != _bundles_connected.end()) { + delete *i; _bundles_connected.erase (i); } } } - changed (IOChange (ConfigurationChanged|ConnectionsChanged), src); /* EMIT SIGNAL */ + changed (IOChange (IOChange::ConnectionsChanged), src); /* EMIT SIGNAL */ return 0; } @@ -1222,7 +1241,8 @@ int IO::enable_connecting () { connecting_legal = true; - return ConnectingLegal (); + boost::optional r = ConnectingLegal (); + return r.get_value_or (0); } void @@ -1267,7 +1287,7 @@ IO::build_legal_port_name (DataType type) char buf1[name_size+1]; char buf2[name_size+1]; - snprintf (buf1, name_size+1, ("%.*s/%s"), limit, _name.c_str(), suffix.c_str()); + snprintf (buf1, name_size+1, ("%.*s/%s"), limit, _name.val().c_str(), suffix.c_str()); int port_number = find_port_hole (buf1); snprintf (buf2, name_size+1, "%s %d", buf1, port_number); @@ -1323,11 +1343,11 @@ IO::midi(uint32_t n) const } /** - * Setup bundles that describe our inputs and outputs. Also creates bundles if necessary. + * Setup a bundle that describe our inputs or outputs. Also creates the bundle if necessary. */ void -IO::setup_bundles () +IO::setup_bundle () { char buf[32]; @@ -1337,20 +1357,25 @@ IO::setup_bundles () _bundle->suspend_signals (); - _bundle->set_type (default_type ()); - _bundle->remove_channels (); if (_direction == Input) { - snprintf(buf, sizeof (buf), _("%s in"), _name.c_str()); + snprintf(buf, sizeof (buf), _("%s in"), _name.val().c_str()); } else { - snprintf(buf, sizeof (buf), _("%s out"), _name.c_str()); + snprintf(buf, sizeof (buf), _("%s out"), _name.val().c_str()); } _bundle->set_name (buf); - uint32_t const ni = _ports.num_ports(); - for (uint32_t i = 0; i < ni; ++i) { - _bundle->add_channel (bundle_channel_name (i, ni)); - _bundle->set_port (i, _session.engine().make_port_name_non_relative (_ports.port(i)->name())); + + int c = 0; + for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) { + + uint32_t const N = _ports.count().get (*i); + for (uint32_t j = 0; j < N; ++j) { + _bundle->add_channel (bundle_channel_name (j, N, *i), *i); + _bundle->set_port (c, _session.engine().make_port_name_non_relative (_ports.port(*i, j)->name())); + ++c; + } + } _bundle->resume_signals (); @@ -1363,8 +1388,8 @@ IO::bundles_connected () BundleList bundles; /* User bundles */ - for (std::vector::iterator i = _bundles_connected.begin(); i != _bundles_connected.end(); ++i) { - bundles.push_back (i->bundle); + for (std::vector::iterator i = _bundles_connected.begin(); i != _bundles_connected.end(); ++i) { + bundles.push_back ((*i)->bundle); } /* Session bundles */ @@ -1400,24 +1425,31 @@ IO::bundles_connected () IO::UserBundleInfo::UserBundleInfo (IO* io, boost::shared_ptr b) { bundle = b; - changed = b->Changed.connect ( - sigc::mem_fun (*io, &IO::bundle_changed) - ); + b->Changed.connect_same_thread (changed, boost::bind (&IO::bundle_changed, io, _1)); } std::string -IO::bundle_channel_name (uint32_t c, uint32_t n) const +IO::bundle_channel_name (uint32_t c, uint32_t n, DataType t) const { char buf[32]; - switch (n) { - case 1: - return _("mono"); - case 2: - return c == 0 ? _("L") : _("R"); - default: + if (t == DataType::AUDIO) { + + switch (n) { + case 1: + return _("mono"); + case 2: + return c == 0 ? _("L") : _("R"); + default: + snprintf (buf, sizeof(buf), _("%d"), (c + 1)); + return buf; + } + + } else { + snprintf (buf, sizeof(buf), _("%d"), (c + 1)); return buf; + } return ""; @@ -1445,19 +1477,25 @@ IO::set_name_in_state (XMLNode& node, const string& new_name) } } +bool +IO::connected () const +{ + /* do we have any connections at all? */ + + for (PortSet::const_iterator p = _ports.begin(); p != _ports.end(); ++p) { + if (p->connected()) { + return true; + } + } + + return false; +} + bool IO::connected_to (boost::shared_ptr other) const { if (!other) { - /* do we have any connections at all? */ - - for (PortSet::const_iterator p = _ports.begin(); p != _ports.end(); ++p) { - if (p->connected()) { - return true; - } - } - - return false; + return connected (); } assert (_direction != other->direction()); @@ -1478,18 +1516,16 @@ IO::connected_to (boost::shared_ptr other) const } void -IO::process_input (boost::shared_ptr proc, sframes_t start_frame, sframes_t end_frame, nframes_t nframes) +IO::process_input (boost::shared_ptr proc, framepos_t start_frame, framepos_t end_frame, pframes_t nframes) { - BufferSet bufs; - /* don't read the data into new buffers - just use the port buffers directly */ - bufs.attach_buffers (_ports, nframes, 0); - proc->run (bufs, start_frame, end_frame, nframes); + _buffers.get_jack_port_addresses (_ports, nframes); + proc->run (_buffers, start_frame, end_frame, nframes, true); } void -IO::collect_input (BufferSet& bufs, nframes_t nframes, ChanCount offset) +IO::collect_input (BufferSet& bufs, pframes_t nframes, ChanCount offset) { assert(bufs.available() >= _ports.count()); @@ -1517,7 +1553,7 @@ IO::collect_input (BufferSet& bufs, nframes_t nframes, ChanCount offset) } void -IO::copy_to_outputs (BufferSet& bufs, DataType type, nframes_t nframes, nframes_t offset) +IO::copy_to_outputs (BufferSet& bufs, DataType type, pframes_t nframes, framecnt_t offset) { // Copy any buffers 1:1 to outputs @@ -1558,3 +1594,22 @@ IO::port_by_name (const std::string& str) const return 0; } + +bool +IO::physically_connected () const +{ + for (PortSet::const_iterator i = _ports.begin(); i != _ports.end(); ++i) { + if (i->physically_connected()) { + return true; + } + } + + return false; +} + +bool +IO::has_port (Port* p) const +{ + Glib::Mutex::Lock lm (io_lock); + return _ports.contains (p); +}