#include "ardour/audioengine.h"
#include "ardour/port.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
return c;
}
+uint32_t
+Bundle::n_total () const
+{
+ /* Simpler and far more efficient than nchannels.n_total() */
+ return _channel.size();
+}
+
Bundle::PortList const &
Bundle::channel_ports (uint32_t c) const
{
- assert (c < nchannels().n_total());
+ assert (c < n_total());
Glib::Threads::Mutex::Lock lm (_channel_mutex);
return _channel[c].ports;
void
Bundle::add_port_to_channel (uint32_t ch, string portname)
{
- assert (ch < nchannels().n_total());
+ assert (ch < n_total());
assert (portname.find_first_of (':') != string::npos);
{
void
Bundle::remove_port_from_channel (uint32_t ch, string portname)
{
- assert (ch < nchannels().n_total());
+ assert (ch < n_total());
bool changed = false;
void
Bundle::set_port (uint32_t ch, string portname)
{
- assert (ch < nchannels().n_total());
+ assert (ch < n_total());
assert (portname.find_first_of (':') != string::npos);
{
bool
Bundle::port_attached_to_channel (uint32_t ch, std::string portname)
{
- assert (ch < nchannels().n_total());
+ assert (ch < n_total());
Glib::Threads::Mutex::Lock lm (_channel_mutex);
return (std::find (_channel[ch].ports.begin (), _channel[ch].ports.end (), portname) != _channel[ch].ports.end ());
void
Bundle::remove_channel (uint32_t ch)
{
- assert (ch < nchannels().n_total());
+ assert (ch < n_total());
Glib::Threads::Mutex::Lock lm (_channel_mutex);
_channel.erase (_channel.begin () + ch);
std::string
Bundle::channel_name (uint32_t ch) const
{
- assert (ch < nchannels().n_total());
+ assert (ch < n_total());
Glib::Threads::Mutex::Lock lm (_channel_mutex);
return _channel[ch].name;
void
Bundle::set_channel_name (uint32_t ch, std::string const & n)
{
- assert (ch < nchannels().n_total());
+ assert (ch < n_total());
{
Glib::Threads::Mutex::Lock lm (_channel_mutex);
void
Bundle::add_channels_from_bundle (boost::shared_ptr<Bundle> other)
{
- uint32_t const ch = nchannels().n_total();
+ uint32_t const ch = n_total();
- for (uint32_t i = 0; i < other->nchannels().n_total(); ++i) {
+ for (uint32_t i = 0; i < other->n_total(); ++i) {
std::stringstream s;
s << other->name() << " " << other->channel_name(i);
* with another bundle's channels.
* @param other Other bundle.
* @param engine AudioEngine to use to make the connections.
+ * @param allow_partial whether to allow leaving unconnected channels types,
+ * or require that the ChanCounts match exactly (default false).
*/
void
-Bundle::connect (boost::shared_ptr<Bundle> other, AudioEngine & engine)
+Bundle::connect (boost::shared_ptr<Bundle> other, AudioEngine & engine,
+ bool allow_partial)
{
- uint32_t const N = nchannels().n_total();
- assert (N == other->nchannels().n_total());
+ ChanCount our_count = nchannels();
+ ChanCount other_count = other->nchannels();
- for (uint32_t i = 0; i < N; ++i) {
- Bundle::PortList const & our_ports = channel_ports (i);
- Bundle::PortList const & other_ports = other->channel_ports (i);
+ if (!allow_partial && our_count != other_count) {
+ assert (our_count == other_count);
+ return;
+ }
- for (Bundle::PortList::const_iterator j = our_ports.begin(); j != our_ports.end(); ++j) {
- for (Bundle::PortList::const_iterator k = other_ports.begin(); k != other_ports.end(); ++k) {
- engine.connect (*j, *k);
+ for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+ uint32_t N = our_count.n(*t);
+ if (N != other_count.n(*t))
+ continue;
+ for (uint32_t i = 0; i < N; ++i) {
+ Bundle::PortList const & our_ports =
+ channel_ports (type_channel_to_overall(*t, i));
+ Bundle::PortList const & other_ports =
+ other->channel_ports (other->type_channel_to_overall(*t, i));
+
+ for (Bundle::PortList::const_iterator j = our_ports.begin();
+ j != our_ports.end(); ++j) {
+ for (Bundle::PortList::const_iterator k = other_ports.begin();
+ k != other_ports.end(); ++k) {
+ engine.connect (*j, *k);
+ }
}
}
}
void
Bundle::disconnect (boost::shared_ptr<Bundle> other, AudioEngine & engine)
{
- uint32_t const N = nchannels().n_total();
- assert (N == other->nchannels().n_total());
+ uint32_t const N = n_total();
+ assert (N == other->n_total());
for (uint32_t i = 0; i < N; ++i) {
Bundle::PortList const & our_ports = channel_ports (i);
{
{
Glib::Threads::Mutex::Lock lm (_channel_mutex);
- for (uint32_t c = 0; c < _channel.size(); ++c) {
+ for (uint32_t c = 0; c < n_total(); ++c) {
_channel[c].ports.clear ();
}
void
Bundle::remove_ports_from_channel (uint32_t ch)
{
- assert (ch < nchannels().n_total());
+ assert (ch < n_total());
{
Glib::Threads::Mutex::Lock lm (_channel_mutex);
}
}
+/** This must not be called in code executed as a response to a backend event,
+ * as it may query the backend in the same thread where it's waiting for us.
+ * @return true if a Bundle is connected to another.
+ * @param type: if not NIL, restrict the check to channels of that type.
+ * @param exclusive: if true, additionally check if the bundle is connected
+ * only to |other|, and return false if not. */
bool
-Bundle::connected_to (boost::shared_ptr<Bundle> other, AudioEngine & engine)
+Bundle::connected_to (boost::shared_ptr<Bundle> other, AudioEngine & engine,
+ DataType type, bool exclusive)
{
- if (_ports_are_inputs == other->_ports_are_inputs || nchannels() != other->nchannels()) {
+ if (_ports_are_inputs == other->_ports_are_inputs)
return false;
+
+ if (type == DataType::NIL) {
+ for (DataType::iterator t = DataType::begin();
+ t != DataType::end(); ++t) {
+ if (!connected_to(other, engine, *t, exclusive))
+ return false;
+ }
+ return true;
}
- for (uint32_t i = 0; i < nchannels().n_total(); ++i) {
- Bundle::PortList const & A = channel_ports (i);
- Bundle::PortList const & B = other->channel_ports (i);
+ uint32_t N = nchannels().n(type);
+ if (other->nchannels().n(type) != N)
+ return false;
+
+ vector<string> port_connections;
+
+ for (uint32_t i = 0; i < N; ++i) {
+ Bundle::PortList const & our_ports =
+ channel_ports (type_channel_to_overall(type, i));
+ Bundle::PortList const & other_ports =
+ other->channel_ports (other->type_channel_to_overall(type, i));
- for (uint32_t j = 0; j < A.size(); ++j) {
- for (uint32_t k = 0; k < B.size(); ++k) {
+ for (Bundle::PortList::const_iterator j = our_ports.begin();
+ j != our_ports.end(); ++j) {
+ boost::shared_ptr<Port> p = engine.get_port_by_name(*j);
- boost::shared_ptr<Port> p = engine.get_port_by_name (A[j]);
- boost::shared_ptr<Port> q = engine.get_port_by_name (B[k]);
+ for (Bundle::PortList::const_iterator k = other_ports.begin();
+ k != other_ports.end(); ++k) {
+ boost::shared_ptr<Port> q = engine.get_port_by_name(*k);
if (!p && !q) {
return false;
}
- if (p && !p->connected_to (B[k])) {
+ if (p && !p->connected_to (*k)) {
return false;
- } else if (q && !q->connected_to (A[j])) {
+ } else if (q && !q->connected_to (*j)) {
return false;
}
}
+
+ if (exclusive && p) {
+ port_connections.clear();
+ p->get_connections(port_connections);
+ if (port_connections.size() != other_ports.size())
+ return false;
+ }
}
}
{
PortManager& pm (engine);
- for (uint32_t i = 0; i < nchannels().n_total(); ++i) {
+ for (uint32_t i = 0; i < n_total(); ++i) {
Bundle::PortList const & ports = channel_ports (i);
for (uint32_t j = 0; j < ports.size(); ++j) {
bool
Bundle::has_same_ports (boost::shared_ptr<Bundle> b) const
{
- uint32_t const N = nchannels().n_total();
+ uint32_t const N = n_total();
- if (b->nchannels().n_total() != N) {
+ if (b->n_total() != N) {
return false;
}
DataType
Bundle::channel_type (uint32_t c) const
{
- assert (c < nchannels().n_total());
+ assert (c < n_total());
Glib::Threads::Mutex::Lock lm (_channel_mutex);
return _channel[c].type;
operator<< (ostream& os, Bundle const & b)
{
os << "BUNDLE " << b.nchannels() << " channels: ";
- for (uint32_t i = 0; i < b.nchannels().n_total(); ++i) {
+ for (uint32_t i = 0; i < b.n_total(); ++i) {
os << "( ";
Bundle::PortList const & pl = b.channel_ports (i);
for (Bundle::PortList::const_iterator j = pl.begin(); j != pl.end(); ++j) {
if (t == DataType::NIL) {
return c;
}
-
+
Glib::Threads::Mutex::Lock lm (_channel_mutex);
vector<Channel>::const_iterator i = _channel.begin ();
++o;
}
- /* NOTREACHED */
+ abort(); /* NOTREACHED */
return -1;
}
if (t == DataType::NIL) {
return c;
}
-
+
Glib::Threads::Mutex::Lock lm (_channel_mutex);
uint32_t s = 0;
-
+
vector<Channel>::const_iterator i = _channel.begin ();
for (uint32_t j = 0; j < c; ++j) {
if (i->type == t) {
projects / ardour.git / blobdiff