X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fio.cc;h=6aaca08c909aed08b8993821a06423ecb19ef548;hb=0938a42440cc82ce8d0cb064840c258c863714ab;hp=875fca7fa0f7d7a23a0c2c70f4131fd2f0811789;hpb=c7dd29e1676624a54cbdae28218cb5df91ae9837;p=ardour.git diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc index 875fca7fa0..6aaca08c90 100644 --- a/libs/ardour/io.cc +++ b/libs/ardour/io.cc @@ -96,7 +96,7 @@ IO::~IO () } } -void +void IO::increment_port_buffer_offset (pframes_t offset) { /* io_lock, not taken: function must be called from Session::process() calltree */ @@ -178,23 +178,23 @@ IO::disconnect (Port* our_port, string other_port, void* src) { 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 */ _session.set_dirty (); @@ -211,20 +211,19 @@ IO::connect (Port* our_port, string other_port, void* src) { 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 (IOChange (IOChange::ConnectionsChanged), src); /* EMIT SIGNAL */ _session.set_dirty (); return 0; @@ -268,7 +267,7 @@ IO::remove_port (Port* port, void* src) if (change.type != IOChange::NoChange) { changed (change, src); - _session.set_dirty (); + _buffers.attach_buffers (_ports); } } @@ -280,6 +279,8 @@ IO::remove_port (Port* port, void* src) return -1; } + _session.set_dirty (); + return 0; } @@ -310,7 +311,7 @@ IO::add_port (string destination, void* src, DataType type) /* 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; @@ -326,16 +327,15 @@ 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 */ + PortCountChanged (n_ports()); /* EMIT SIGNAL */ change.type = IOChange::ConfigurationChanged; change.after = _ports.count (); changed (change, src); /* EMIT SIGNAL */ + _buffers.attach_buffers (_ports); } - if (destination.length()) { + if (!destination.empty()) { if (our_port->connect (destination)) { return -1; } @@ -352,27 +352,28 @@ IO::disconnect (void* src) { { Glib::Mutex::Lock lm (io_lock); - + for (PortSet::iterator i = _ports.begin(); i != _ports.end(); ++i) { i->disconnect_all (); } - + check_bundles_connected (); } - + 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*/) +int +IO::ensure_ports_locked (ChanCount count, bool clear, bool& changed) { assert (!AudioEngine::instance()->process_lock().trylock()); - + Port* port = 0; - bool changed = false; + + changed = false; for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) { @@ -432,7 +433,7 @@ IO::ensure_ports_locked (ChanCount count, bool clear, void* /*src*/) } } - return changed; + return 0; } /** Caller must hold process lock */ @@ -440,7 +441,7 @@ int IO::ensure_ports (ChanCount count, bool clear, void* src) { assert (!AudioEngine::instance()->process_lock().trylock()); - + bool changed = false; if (count == n_ports() && !clear) { @@ -450,10 +451,12 @@ IO::ensure_ports (ChanCount count, bool clear, void* src) IOChange change; change.before = _ports.count (); - + { Glib::Mutex::Lock im (io_lock); - changed = ensure_ports_locked (count, clear, src); + if (ensure_ports_locked (count, clear, changed)) { + return -1; + } } if (changed) { @@ -473,7 +476,7 @@ int IO::ensure_io (ChanCount count, bool clear, void* src) { assert (!AudioEngine::instance()->process_lock().trylock()); - + return ensure_ports (count, clear, src); } @@ -535,6 +538,9 @@ IO::state (bool /*full_state*/) node->add_child_nocopy (*pnode); } + snprintf (buf, sizeof (buf), "%" PRId64, _user_latency); + node->add_property (X_("user-latency"), buf); + return *node; } @@ -595,6 +601,9 @@ IO::set_state (const XMLNode& node, int version) 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 ()); + } return 0; } @@ -853,7 +862,7 @@ IO::create_ports (const XMLNode& node, int version) { 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; @@ -910,12 +919,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); } } - } + } } } @@ -1031,7 +1040,7 @@ IO::set_ports (const string& str) { Glib::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); - + // FIXME: audio-only if (ensure_ports (ChanCount(DataType::AUDIO, nports), true, this)) { return -1; @@ -1130,7 +1139,7 @@ IO::set_name (const string& requested_name) /* replace all colons in the name. i wish we didn't have to do this */ - replace_all (name, ":", "-"); + replace_all (name, ":", "-"); for (PortSet::iterator i = _ports.begin(); i != _ports.end(); ++i) { string current_name = i->name(); @@ -1157,11 +1166,15 @@ IO::latency () const for (PortSet::const_iterator i = _ports.begin(); i != _ports.end(); ++i) { 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)); max_latency = latency; } } - DEBUG_TRACE (DEBUG::Latency, string_compose ("%1: max %4 latency from %2 ports = %3\n", + 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; @@ -1288,7 +1301,12 @@ 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.val().c_str(), suffix.c_str()); + /* 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()); int port_number = find_port_hole (buf1); snprintf (buf2, name_size+1, "%s %d", buf1, port_number); @@ -1482,13 +1500,13 @@ 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; } @@ -1516,6 +1534,19 @@ IO::connected_to (boost::shared_ptr other) const return false; } +bool +IO::connected_to (const string& str) const +{ + for (PortSet::const_iterator i = _ports.begin(); i != _ports.end(); ++i) { + if (i->connected_to (str)) { + return true; + } + } + + return false; +} + +/** Caller must hold process lock */ void IO::process_input (boost::shared_ptr proc, framepos_t start_frame, framepos_t end_frame, pframes_t nframes) {