Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <fstream>
#include <algorithm>
#include <cmath>
#include <vector>
#include "pbd/replace_all.h"
#include "pbd/unknown_type.h"
#include "pbd/enumwriter.h"
+#include "pbd/locale_guard.h"
+#include "pbd/types_convert.h"
#include "ardour/audioengine.h"
#include "ardour/buffer.h"
#include "ardour/debug.h"
#include "ardour/io.h"
#include "ardour/port.h"
+#include "ardour/profile.h"
#include "ardour/route.h"
#include "ardour/session.h"
+#include "ardour/types_convert.h"
#include "ardour/user_bundle.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
#define BLOCK_PROCESS_CALLBACK() Glib::Threads::Mutex::Lock em (AudioEngine::instance()->process_lock())
{
Glib::Threads::Mutex::Lock lm (io_lock);
+ DEBUG_TRACE (DEBUG::Ports, string_compose ("IO %1 unregisters %2 ports\n", name(), _ports.num_ports()));
+
BLOCK_PROCESS_CALLBACK ();
for (PortSet::iterator i = _ports.begin(); i != _ports.end(); ++i) {
_session.engine().unregister_port (*i);
}
+ delete pending_state_node; pending_state_node = 0;
}
void
IO::disconnect_check (boost::shared_ptr<Port> a, boost::shared_ptr<Port> b)
{
+ if (_session.state_of_the_state () & Session::Deletion) {
+ return;
+ }
/* 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,
* ::disconnect()
*/
if (_ports.contains (a) || _ports.contains (b)) {
- changed (IOChange (IOChange::ConnectionsChanged), this); /* EMIT SIGNAL */
+ changed (IOChange (IOChange::ConnectionsChanged), this); /* EMIT SIGNAL */
}
} else {
/* we didn't get the lock, so assume that we're inside
}
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 (framecnt_t nframes)
+IO::silence (samplecnt_t nframes)
{
/* io_lock, not taken: function must be called from Session::process() calltree */
for (PortSet::iterator i = _ports.begin(); i != _ports.end(); ++i) {
- i->get_buffer(nframes).silence (nframes);
- }
-}
-
-/** Set _bundles_connected to those bundles that are connected such that every
- * port on every bundle channel x is connected to port x in _ports.
- */
-void
-IO::check_bundles_connected ()
-{
- std::vector<UserBundleInfo*> new_list;
-
- for (std::vector<UserBundleInfo*>::iterator i = _bundles_connected.begin(); i != _bundles_connected.end(); ++i) {
-
- uint32_t const N = (*i)->bundle->nchannels().n_total();
-
- if (_ports.num_ports() < N) {
- continue;
- }
-
- bool ok = true;
-
- 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);
- for (uint32_t k = 0; k < pl.size(); ++k) {
- if (_ports.port(j)->connected_to (pl[k]) == false) {
- ok = false;
- break;
- }
- }
-
- if (ok == false) {
- break;
- }
- }
-
- if (ok) {
- new_list.push_back (*i);
- } else {
- delete *i;
+ if (i->port_handle ()) {
+ i->get_buffer(nframes).silence (nframes);
}
}
-
- _bundles_connected = new_list;
}
-
int
IO::disconnect (boost::shared_ptr<Port> our_port, string other_port, void* src)
{
return 0;
}
- {
- Glib::Threads::Mutex::Lock lm (io_lock);
-
- /* check that our_port is really one of ours */
+ {
+ Glib::Threads::Mutex::Lock lm (io_lock);
- if ( ! _ports.contains(our_port)) {
- return -1;
- }
+ /* check that our_port is really one of ours */
- /* disconnect it from the source */
+ if ( ! _ports.contains(our_port)) {
+ return -1;
+ }
- if (our_port->disconnect (other_port)) {
- error << string_compose(_("IO: cannot disconnect port %1 from %2"), our_port->name(), other_port) << endmsg;
- return -1;
- }
+ /* disconnect it from the source */
- check_bundles_connected ();
- }
+ if (our_port->disconnect (other_port)) {
+ error << string_compose(_("IO: cannot disconnect port %1 from %2"), our_port->name(), other_port) << endmsg;
+ return -1;
+ }
+ }
- changed (IOChange (IOChange::ConnectionsChanged), src); /* EMIT SIGNAL */
+ changed (IOChange (IOChange::ConnectionsChanged), src); /* EMIT SIGNAL */
_session.set_dirty ();
}
_session.engine().unregister_port (port);
- check_bundles_connected ();
}
}
}
_session.set_dirty ();
-
+
return 0;
}
ChanCount before = _ports.count ();
ChanCount after = before;
after.set (type, after.get (type) + 1);
-
+
bool const r = PortCountChanging (after); /* EMIT SIGNAL */
if (r) {
return -1;
}
-
+
IOChange change;
{
/* Create a new port */
string portname = build_legal_port_name (type);
-
+
if (_direction == Input) {
if ((our_port = _session.engine().register_input_port (type, portname)) == 0) {
error << string_compose(_("IO: cannot register input port %1"), portname) << endmsg;
change.before = _ports.count ();
_ports.add (our_port);
}
-
+
PortCountChanged (n_ports()); /* EMIT SIGNAL */
change.type = IOChange::ConfigurationChanged;
change.after = _ports.count ();
}
}
+ apply_pretty_name ();
setup_bundle ();
_session.set_dirty ();
for (PortSet::iterator i = _ports.begin(); i != _ports.end(); ++i) {
i->disconnect_all ();
}
-
- check_bundles_connected ();
}
changed (IOChange (IOChange::ConnectionsChanged), src); /* EMIT SIGNAL */
#endif
boost::shared_ptr<Port> port;
+ vector<boost::shared_ptr<Port> > deleted_ports;
changed = false;
assert(port);
_ports.remove(port);
+
+ /* hold a reference to the port so that we can ensure
+ * that this thread, and not a JACK notification thread,
+ * holds the final reference.
+ */
+
+ deleted_ports.push_back (port);
_session.engine().unregister_port (port);
changed = true;
}
+ /* this will drop the final reference to the deleted ports,
+ * which will in turn call their destructors, which will in
+ * turn call the backend to unregister them.
+ *
+ * There will no connect/disconnect or register/unregister
+ * callbacks from the backend until we get here, because
+ * they are driven by the Port destructor. The destructor
+ * will not execute until we drop the final reference,
+ * which all happens right .... here.
+ */
+ deleted_ports.clear ();
+
/* create any necessary new ports */
while (n_ports().get(*t) < n) {
}
if (changed) {
- check_bundles_connected ();
PortCountChanged (n_ports()); /* EMIT SIGNAL */
_session.set_dirty ();
}
XMLNode&
IO::get_state ()
{
- return state (true);
+ return state ();
}
XMLNode&
-IO::state (bool /*full_state*/)
+IO::state ()
{
XMLNode* node = new XMLNode (state_node_name);
- char buf[64];
- string str;
- vector<string>::iterator ci;
int n;
- LocaleGuard lg (X_("POSIX"));
Glib::Threads::Mutex::Lock lm (io_lock);
- node->add_property("name", _name);
- id().print (buf, sizeof (buf));
- node->add_property("id", buf);
- node->add_property ("direction", enum_2_string (_direction));
- node->add_property ("default-type", _default_type.to_string());
+ node->set_property ("name", name());
+ node->set_property ("id", id ());
+ node->set_property ("direction", _direction);
+ node->set_property ("default-type", _default_type);
- for (std::vector<UserBundleInfo*>::iterator i = _bundles_connected.begin(); i != _bundles_connected.end(); ++i) {
- XMLNode* n = new XMLNode ("Bundle");
- n->add_property ("name", (*i)->bundle->name ());
- node->add_child_nocopy (*n);
+ if (!_pretty_name_prefix.empty ()) {
+ node->set_property("pretty-name", _pretty_name_prefix);
}
for (PortSet::iterator i = _ports.begin(); i != _ports.end(); ++i) {
vector<string> connections;
XMLNode* pnode = new XMLNode (X_("Port"));
- pnode->add_property (X_("type"), i->type().to_string());
- pnode->add_property (X_("name"), i->name());
+ pnode->set_property (X_("type"), i->type());
+ pnode->set_property (X_("name"), i->name());
if (i->get_connections (connections)) {
+ vector<string>::const_iterator ci;
+ std::sort (connections.begin(), connections.end());
for (n = 0, ci = connections.begin(); ci != connections.end(); ++ci, ++n) {
XMLNode* cnode = new XMLNode (X_("Connection"));
- cnode->add_property (X_("other"), _session.engine().make_port_name_relative (*ci));
+ cnode->set_property (X_("other"), _session.engine().make_port_name_relative (*ci));
pnode->add_child_nocopy (*cnode);
}
}
node->add_child_nocopy (*pnode);
}
- snprintf (buf, sizeof (buf), "%" PRId64, _user_latency);
- node->add_property (X_("user-latency"), buf);
-
+ node->set_property (X_("user-latency"), _user_latency);
+
return *node;
}
*/
assert (version >= 3000);
- const XMLProperty* prop;
- XMLNodeConstIterator iter;
- LocaleGuard lg (X_("POSIX"));
-
/* force use of non-localized representation of decimal point,
since we use it a lot in XML files and so forth.
*/
return -1;
}
- if ((prop = node.property ("name")) != 0) {
- set_name (prop->value());
+ bool ignore_name = node.property ("ignore-name");
+ std::string name;
+ if (node.get_property ("name", name) && !ignore_name) {
+ set_name (name);
}
- if ((prop = node.property (X_("default-type"))) != 0) {
- _default_type = DataType(prop->value());
+ if (node.get_property (X_("default-type"), _default_type)) {
assert(_default_type != DataType::NIL);
}
set_id (node);
- if ((prop = node.property ("direction")) != 0) {
- _direction = (Direction) string_2_enum (prop->value(), _direction);
- }
+ node.get_property ("direction", _direction);
if (create_ports (node, version)) {
return -1;
}
+ // after create_ports, updates names
+ if (node.get_property ("pretty-name", name)) {
+ set_pretty_name (name);
+ }
+
if (connecting_legal) {
if (make_connections (node, version, false)) {
} else {
+ delete pending_state_node;
pending_state_node = new XMLNode (node);
pending_state_node_version = version;
pending_state_node_in = false;
ConnectingLegal.connect_same_thread (connection_legal_c, boost::bind (&IO::connecting_became_legal, this));
}
- if ((prop = node.property ("user-latency")) != 0) {
- _user_latency = atoi (prop->value ());
- }
+ node.get_property ("user-latency", _user_latency);
return 0;
}
int
IO::set_state_2X (const XMLNode& node, int version, bool in)
{
- const XMLProperty* prop;
+ XMLProperty const * prop;
XMLNodeConstIterator iter;
- LocaleGuard lg (X_("POSIX"));
+ LocaleGuard lg;
/* force use of non-localized representation of decimal point,
since we use it a lot in XML files and so forth.
} else {
+ delete pending_state_node;
pending_state_node = new XMLNode (node);
pending_state_node_version = version;
pending_state_node_in = in;
int
IO::connecting_became_legal ()
{
- int ret;
+ int ret = 0;
assert (pending_state_node);
connection_legal_c.disconnect ();
- ret = make_connections (*pending_state_node, pending_state_node_version, pending_state_node_in);
+ // it's not required for TracksLive, as long as TracksLive's session does all the connections when it's being loaded
+ if (!Profile->get_trx() ) {
+ ret = make_connections (*pending_state_node, pending_state_node_version, pending_state_node_in);
+ }
delete pending_state_node;
pending_state_node = 0;
string possible_name;
bool stereo = false;
string::size_type last_non_digit_pos;
+ std::string bundle_number_str;
error << string_compose(_("Unknown bundle \"%1\" listed for %2 of %3"), desired_name, bundle_type_name, _name)
<< endmsg;
last_non_digit_pos = desired_name.find_last_not_of(digits);
if (last_non_digit_pos != string::npos) {
- stringstream s;
- s << desired_name.substr(last_non_digit_pos);
- s >> bundle_number;
+ bundle_number_str = desired_name.substr(last_non_digit_pos);
+ bundle_number = string_to<int32_t>(bundle_number_str);
}
// see if it's a stereo connection e.g. "in 3+4"
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;
+ bundle_number_str = desired_name.substr(left_last_non_digit_pos, last_non_digit_pos-1);
+ left_bundle_number = string_to<int32_t>(bundle_number_str);
if (left_bundle_number > 0 && left_bundle_number + 1 == bundle_number) {
bundle_number--;
if (bundle_number & mask) {
bundle_number &= ~mask;
- stringstream s;
- s << default_name << " " << bundle_number + 1;
+ std::string possible_name = default_name + " " + to_string(bundle_number + 1);
if (stereo) {
- s << "+" << bundle_number + 2;
+ possible_name += "+" + to_string(bundle_number + 2);
}
- possible_name = s.str();
-
if ((c = _session.bundle_by_name (possible_name)) != 0) {
break;
}
for (iter = node.children().begin(); iter != node.children().end(); ++iter) {
if ((*iter)->name() == X_("Bundle")) {
+ prop = (*iter)->property ("name");
if ((c = find_possible_bundle (prop->value())) != 0) {
n = ChanCount::max (n, c->nchannels());
return 0;
return make_connections_2X (node, version, in);
}
- const XMLProperty* prop;
+ XMLProperty const * prop;
for (XMLNodeConstIterator i = node.children().begin(); i != node.children().end(); ++i) {
}
if (prop) {
- connect (p, prop->value(), this);
+ connect (p, prop->value(), this);
}
}
}
IO::prepare_for_reset (XMLNode& node, const std::string& name)
{
/* reset name */
- node.add_property ("name", name);
+ node.set_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;
+ 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();
if (slash != string::npos) {
/* port name is of form: <IO-name>/<port-name> */
-
+
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)
{
- const XMLProperty* prop;
+ XMLProperty const * prop;
/* XXX: bundles ("connections" as was) */
if (p != string::npos) {
ports[x].replace (p, 4, "/audio_out");
}
- nth(i)->connect (ports[x]);
+ if (NULL != nth(i).get())
+ nth(i)->connect (ports[x]);
}
}
if (p != string::npos) {
ports[x].replace (p, 3, "/audio_in");
}
- nth(i)->connect (ports[x]);
+ if (NULL != nth(i).get())
+ nth(i)->connect (ports[x]);
}
}
IO::set_ports (const string& str)
{
vector<string> ports;
- int i;
int n;
uint32_t nports;
}
}
- string::size_type start, end, ostart;
-
- ostart = 0;
- start = 0;
- end = 0;
- i = 0;
-
- while ((start = str.find_first_of ('{', ostart)) != string::npos) {
+ string::size_type start = 0;
+ string::size_type end = 0;
+ string::size_type ostart = 0;
+ for (int i = 0; (start = str.find_first_of ('{', ostart)) != string::npos; ++i) {
start += 1;
if ((end = str.find_first_of ('}', start)) == string::npos) {
}
ostart = end+1;
- i++;
}
return 0;
return 0;
}
- pos = 0;
opos = 0;
ports.clear ();
{
string::size_type pos, opos;
- pos = 0;
opos = 0;
ports.clear ();
return r;
}
-framecnt_t
-IO::latency () const
+void
+IO::set_pretty_name (const std::string& str)
+{
+ if (_pretty_name_prefix == str) {
+ return;
+ }
+ _pretty_name_prefix = str;
+ apply_pretty_name ();
+}
+
+void
+IO::apply_pretty_name ()
{
- framecnt_t max_latency;
- framecnt_t latency;
+ uint32_t pn = 1;
+ if (_pretty_name_prefix.empty ()) {
+ return;
+ }
+ for (PortSet::iterator i = _ports.begin (); i != _ports.end(); ++i, ++pn) {
+ (*i)->set_pretty_name (string_compose (("%1/%2 %3"),
+ _pretty_name_prefix,
+ _direction == Output ? _("Out") : _("In"),
+ pn));
+ }
+}
- max_latency = 0;
+samplecnt_t
+IO::latency () const
+{
+ samplecnt_t max_latency = 0;
/* io lock not taken - must be protected by other means */
for (PortSet::const_iterator i = _ports.begin(); i != _ports.end(); ++i) {
+ samplecnt_t latency;
if ((latency = i->private_latency_range (_direction == Output).max) > max_latency) {
- DEBUG_TRACE (DEBUG::Latency, string_compose ("port %1 has %2 latency of %3 - use\n",
- name(),
- ((_direction == Output) ? "PLAYBACK" : "CAPTURE"),
- latency));
+ DEBUG_TRACE (DEBUG::Latency, string_compose ("port %1 has %2 latency of %3 - use\n",
+ name(),
+ ((_direction == Output) ? "PLAYBACK" : "CAPTURE"),
+ 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;
+}
+
+samplecnt_t
+IO::public_latency () const
+{
+ samplecnt_t max_latency = 0;
+
+ /* io lock not taken - must be protected by other means */
+
+ for (PortSet::const_iterator i = _ports.begin(); i != _ports.end(); ++i) {
+ samplecnt_t latency;
+ if ((latency = i->public_latency_range (_direction == Output).max) > max_latency) {
+ DEBUG_TRACE (DEBUG::Latency, string_compose ("port %1 has %2 latency of %3 - use\n",
+ name(),
+ ((_direction == Output) ? "PLAYBACK" : "CAPTURE"),
+ 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")));
+ DEBUG_TRACE (DEBUG::Latency, string_compose ("%1: max %4 public latency from %2 ports = %3\n",
+ name(), _ports.num_ports(), max_latency,
+ ((_direction == Output) ? "PLAYBACK" : "CAPTURE")));
+ return max_latency;
+}
+
+samplecnt_t
+IO::connected_latency (bool for_playback) const
+{
+ /* io lock not taken - must be protected by other means */
+ samplecnt_t max_latency = 0;
+ bool connected = false;
+
+ /* if output is not connected to anything, use private latency */
+ for (PortSet::const_iterator i = _ports.begin(); i != _ports.end(); ++i) {
+ if (i->connected()) {
+ connected = true;
+ max_latency = 0;
+ break;
+ }
+ samplecnt_t latency;
+ if ((latency = i->private_latency_range (for_playback).max) > max_latency) {
+ max_latency = latency;
+ }
+ }
+ if (connected) {
+ for (PortSet::const_iterator i = _ports.begin(); i != _ports.end(); ++i) {
+ LatencyRange lr;
+ i->get_connected_latency_range (lr, for_playback);
+ if (lr.max > max_latency) {
+ max_latency = lr.max;
+ }
+ }
+ }
return max_latency;
}
int
-IO::connect_ports_to_bundle (boost::shared_ptr<Bundle> c, bool exclusive, void* src)
+IO::connect_ports_to_bundle (boost::shared_ptr<Bundle> c, bool exclusive, void* src) {
+ return connect_ports_to_bundle(c, exclusive, false, src);
+}
+
+int
+IO::connect_ports_to_bundle (boost::shared_ptr<Bundle> c, bool exclusive,
+ bool allow_partial, void* src)
{
BLOCK_PROCESS_CALLBACK ();
}
}
- c->connect (_bundle, _session.engine());
-
- /* If this is a UserBundle, make a note of what we've done */
-
- boost::shared_ptr<UserBundle> ub = boost::dynamic_pointer_cast<UserBundle> (c);
- if (ub) {
+ c->connect (_bundle, _session.engine(), allow_partial);
- /* See if we already know about this one */
- std::vector<UserBundleInfo*>::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 (new UserBundleInfo (this, ub));
- }
- }
}
changed (IOChange (IOChange::ConnectionsChanged), src); /* EMIT SIGNAL */
/* If this is a UserBundle, make a note of what we've done */
- boost::shared_ptr<UserBundle> ub = boost::dynamic_pointer_cast<UserBundle> (c);
- if (ub) {
-
- std::vector<UserBundleInfo*>::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 (IOChange::ConnectionsChanged), src); /* EMIT SIGNAL */
std::vector<char> buf (AudioEngine::instance()->port_name_size());
PortSet::iterator i = _ports.begin();
- snprintf (&buf[0], jack_port_name_size(), _("%s %u"), base, n);
+ snprintf (&buf[0], buf.size()+1, _("%s %u"), base, n);
for ( ; i != _ports.end(); ++i) {
if (string(i->name()) == string(&buf[0])) {
/**
* Setup a bundle that describe our inputs or outputs. Also creates the bundle if necessary.
*/
-
void
IO::setup_bundle ()
{
- char buf[32];
+ char buf[32];
if (!_bundle) {
_bundle.reset (new Bundle (_direction == Input));
} else {
snprintf(buf, sizeof (buf), _("%s out"), _name.val().c_str());
}
- _bundle->set_name (buf);
+ _bundle->set_name (buf);
int c = 0;
for (DataType::iterator i = DataType::begin(); i != DataType::end(); ++i) {
{
BundleList bundles;
- /* User bundles */
- for (std::vector<UserBundleInfo*>::iterator i = _bundles_connected.begin(); i != _bundles_connected.end(); ++i) {
- bundles.push_back ((*i)->bundle);
- }
-
/* Session bundles */
boost::shared_ptr<ARDOUR::BundleList> b = _session.bundles ();
for (ARDOUR::BundleList::iterator i = b->begin(); i != b->end(); ++i) {
case 2:
return c == 0 ? _("L") : _("R");
default:
- snprintf (buf, sizeof(buf), _("%d"), (c + 1));
+ snprintf (buf, sizeof(buf), "%d", (c + 1));
return buf;
}
} else {
- snprintf (buf, sizeof(buf), _("%d"), (c + 1));
+ snprintf (buf, sizeof(buf), "%d", (c + 1));
return buf;
}
string
IO::name_from_state (const XMLNode& node)
{
- const XMLProperty* prop;
+ XMLProperty const * prop;
if ((prop = node.property ("name")) != 0) {
return prop->value();
void
IO::set_name_in_state (XMLNode& node, const string& new_name)
{
- node.add_property (X_("name"), new_name);
+ node.set_property (X_("name"), new_name);
XMLNodeList children = node.children ();
for (XMLNodeIterator i = children.begin(); i != children.end(); ++i) {
if ((*i)->name() == X_("Port")) {
string const old_name = (*i)->property(X_("name"))->value();
string const old_name_second_part = old_name.substr (old_name.find_first_of ("/") + 1);
- (*i)->add_property (X_("name"), string_compose ("%1/%2", new_name, old_name_second_part));
+ (*i)->set_property (X_("name"), string_compose ("%1/%2", new_name, old_name_second_part));
}
}
}
bool
IO::connected () const
{
- /* do we have any connections at all? */
+ /* do we have any connections at all? */
- for (PortSet::const_iterator p = _ports.begin(); p != _ports.end(); ++p) {
- if (p->connected()) {
- return true;
- }
- }
+ for (PortSet::const_iterator p = _ports.begin(); p != _ports.end(); ++p) {
+ if (p->connected()) {
+ return true;
+ }
+ }
- return false;
+ return false;
}
bool
IO::connected_to (boost::shared_ptr<const IO> other) const
{
if (!other) {
- return connected ();
+ return connected ();
}
assert (_direction != other->direction());
for (i = 0; i < no; ++i) {
for (j = 0; j < ni; ++j) {
- if (nth(i)->connected_to (other->nth(j)->name())) {
- return true;
+ if ((NULL != nth(i).get()) && (NULL != other->nth(j).get())) {
+ if (nth(i)->connected_to (other->nth(j)->name())) {
+ return true;
+ }
}
}
}
return false;
}
-/** Call a processor's ::run() method, giving it our buffers
- * Caller must hold process lock.
- */
-void
-IO::process_input (boost::shared_ptr<Processor> proc, framepos_t start_frame, framepos_t end_frame, pframes_t nframes)
-{
- /* don't read the data into new buffers - just use the port buffers directly */
-
- if (n_ports().n_total() == 0) {
- /* We have no ports, so nothing to process */
- return;
- }
-
- _buffers.get_backend_port_addresses (_ports, nframes);
- if (proc) {
- proc->run (_buffers, start_frame, end_frame, nframes, true);
- }
-}
-
void
IO::collect_input (BufferSet& bufs, pframes_t nframes, ChanCount offset)
{
}
for ( ; i != _ports.end(*t); ++i, ++b) {
- Buffer& bb (i->get_buffer (nframes));
+ const Buffer& bb (i->get_buffer (nframes));
b->read_from (bb, nframes);
}
}
}
void
-IO::copy_to_outputs (BufferSet& bufs, DataType type, pframes_t nframes, framecnt_t offset)
+IO::copy_to_outputs (BufferSet& bufs, DataType type, pframes_t nframes, samplecnt_t offset)
{
- // Copy any buffers 1:1 to outputs
-
PortSet::iterator o = _ports.begin(type);
BufferSet::iterator i = bufs.begin(type);
BufferSet::iterator prev = i;
+ assert(i != bufs.end(type)); // or second loop will crash
+
+ // Copy any buffers 1:1 to outputs
+
while (i != bufs.end(type) && o != _ports.end (type)) {
Buffer& port_buffer (o->get_buffer (nframes));
port_buffer.read_from (*i, nframes, offset);
IO::physically_connected () const
{
for (PortSet::const_iterator i = _ports.begin(); i != _ports.end(); ++i) {
- if (i->physically_connected()) {
- return true;
- }
- }
+ if (i->physically_connected()) {
+ return true;
+ }
+ }
- return false;
+ return false;
}
bool
projects / ardour.git / blobdiff