X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fbundle.cc;h=c27905e2cf4b9ee9a19302e64dc255119c31dc2e;hb=dde13d288e22ba5dd8e23802c47fac288b089c57;hp=1948024d91f7b1bc0100382529844eafaea653a7;hpb=7bdcc127e3e42bd76b997b56ecd938b1127d790b;p=ardour.git diff --git a/libs/ardour/bundle.cc b/libs/ardour/bundle.cc index 1948024d91..c27905e2cf 100644 --- a/libs/ardour/bundle.cc +++ b/libs/ardour/bundle.cc @@ -19,14 +19,11 @@ #include -#include "pbd/failed_constructor.h" -#include "ardour/ardour.h" #include "ardour/bundle.h" #include "ardour/audioengine.h" #include "ardour/port.h" -#include "pbd/xml++.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace std; using namespace ARDOUR; @@ -70,7 +67,7 @@ Bundle::Bundle (boost::shared_ptr other) ChanCount Bundle::nchannels () const { - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); ChanCount c; for (vector::const_iterator i = _channel.begin(); i != _channel.end(); ++i) { @@ -85,7 +82,7 @@ Bundle::channel_ports (uint32_t c) const { assert (c < nchannels().n_total()); - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); return _channel[c].ports; } @@ -100,7 +97,7 @@ Bundle::add_port_to_channel (uint32_t ch, string portname) assert (portname.find_first_of (':') != string::npos); { - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); _channel[ch].ports.push_back (portname); } @@ -119,7 +116,7 @@ Bundle::remove_port_from_channel (uint32_t ch, string portname) bool changed = false; { - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); PortList& pl = _channel[ch].ports; PortList::iterator i = find (pl.begin(), pl.end(), portname); @@ -145,7 +142,7 @@ Bundle::set_port (uint32_t ch, string portname) assert (portname.find_first_of (':') != string::npos); { - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); _channel[ch].ports.clear (); _channel[ch].ports.push_back (portname); } @@ -158,7 +155,7 @@ void Bundle::add_channel (std::string const & n, DataType t) { { - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); _channel.push_back (Channel (n, t)); } @@ -170,7 +167,7 @@ void Bundle::add_channel (std::string const & n, DataType t, PortList p) { { - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); _channel.push_back (Channel (n, t, p)); } @@ -182,7 +179,7 @@ void Bundle::add_channel (std::string const & n, DataType t, std::string const & p) { { - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); _channel.push_back (Channel (n, t, p)); } @@ -194,7 +191,7 @@ Bundle::port_attached_to_channel (uint32_t ch, std::string portname) { assert (ch < nchannels().n_total()); - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); return (std::find (_channel[ch].ports.begin (), _channel[ch].ports.end (), portname) != _channel[ch].ports.end ()); } @@ -206,17 +203,23 @@ Bundle::remove_channel (uint32_t ch) { assert (ch < nchannels().n_total()); - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); _channel.erase (_channel.begin () + ch); + + lm.release(); + emit_changed (ConfigurationChanged); } /** Remove all channels */ void Bundle::remove_channels () { - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); _channel.clear (); + + lm.release(); + emit_changed (ConfigurationChanged); } /** @param p Port name. @@ -225,7 +228,7 @@ Bundle::remove_channels () bool Bundle::offers_port (std::string p) const { - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); for (std::vector::const_iterator i = _channel.begin(); i != _channel.end(); ++i) { for (PortList::const_iterator j = i->ports.begin(); j != i->ports.end(); ++j) { @@ -244,7 +247,7 @@ Bundle::offers_port (std::string p) const bool Bundle::offers_port_alone (std::string p) const { - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); for (std::vector::const_iterator i = _channel.begin(); i != _channel.end(); ++i) { if (i->ports.size() == 1 && i->ports[0] == p) { @@ -264,7 +267,7 @@ Bundle::channel_name (uint32_t ch) const { assert (ch < nchannels().n_total()); - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); return _channel[ch].name; } @@ -278,7 +281,7 @@ Bundle::set_channel_name (uint32_t ch, std::string const & n) assert (ch < nchannels().n_total()); { - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); _channel[ch].name = n; } @@ -354,7 +357,7 @@ void Bundle::remove_ports_from_channels () { { - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); for (uint32_t c = 0; c < _channel.size(); ++c) { _channel[c].ports.clear (); } @@ -373,7 +376,7 @@ Bundle::remove_ports_from_channel (uint32_t ch) assert (ch < nchannels().n_total()); { - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); _channel[ch].ports.clear (); } @@ -440,6 +443,33 @@ Bundle::connected_to (boost::shared_ptr other, AudioEngine & engine) return true; } +/** This must not be called in code executed as a response to a backend event, + * as it uses the backend port_get_all_connections(). + * @return true if any of this bundle's channels are connected to anything. + */ +bool +Bundle::connected_to_anything (AudioEngine& engine) +{ + PortManager& pm (engine); + + for (uint32_t i = 0; i < nchannels().n_total(); ++i) { + Bundle::PortList const & ports = channel_ports (i); + + for (uint32_t j = 0; j < ports.size(); ++j) { + + /* ports[j] may not be an Ardour port, so use the port manager directly + rather than doing it with Port. + */ + + if (pm.connected (ports[j])) { + return true; + } + } + } + + return false; +} + void Bundle::set_ports_are_inputs () { @@ -492,7 +522,7 @@ Bundle::channel_type (uint32_t c) const { assert (c < nchannels().n_total()); - Glib::Mutex::Lock lm (_channel_mutex); + Glib::Threads::Mutex::Lock lm (_channel_mutex); return _channel[c].type; } @@ -511,3 +541,79 @@ operator<< (ostream& os, Bundle const & b) return os; } + +bool +Bundle::operator== (Bundle const & other) +{ + return _channel == other._channel; +} + +/** Given an index of a channel as the nth channel of a particular type, + * return an index of that channel when considering channels of all types. + * + * e.g. given a bundle with channels: + * fred [audio] + * jim [audio] + * sheila [midi] + * + * If t == MIDI and c == 0, then we would return 2, as 2 is the index of the + * 0th MIDI channel. + * + * If t == NIL, we just return c. + */ + +uint32_t +Bundle::type_channel_to_overall (DataType t, uint32_t c) const +{ + if (t == DataType::NIL) { + return c; + } + + Glib::Threads::Mutex::Lock lm (_channel_mutex); + + vector::const_iterator i = _channel.begin (); + + uint32_t o = 0; + + while (1) { + + assert (i != _channel.end ()); + + if (i->type != t) { + ++i; + } else { + if (c == 0) { + return o; + } + --c; + } + + ++o; + } + + abort(); /* NOTREACHED */ + return -1; +} + +/** Perform the reverse of type_channel_to_overall */ +uint32_t +Bundle::overall_channel_to_type (DataType t, uint32_t c) const +{ + if (t == DataType::NIL) { + return c; + } + + Glib::Threads::Mutex::Lock lm (_channel_mutex); + + uint32_t s = 0; + + vector::const_iterator i = _channel.begin (); + for (uint32_t j = 0; j < c; ++j) { + if (i->type == t) { + ++s; + } + ++i; + } + + return s; +}