diff options
author | Carl Hetherington <carl@carlh.net> | 2010-07-30 02:09:39 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2010-07-30 02:09:39 +0000 |
commit | 1f07948972ca1cac5854539268ca3b290b79c671 (patch) | |
tree | 4d507ec8a035894628a8f5b84486656fdff6d0e9 /libs/ardour | |
parent | 66760a574a1fc0ccc8a798c2900a717c134838ea (diff) |
Put Mackie surface ports into the Ardour tab of the port matrix.
git-svn-id: svn://localhost/ardour2/branches/3.0@7522 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour')
-rw-r--r-- | libs/ardour/ardour/bundle.h | 6 | ||||
-rw-r--r-- | libs/ardour/ardour/session.h | 1 | ||||
-rw-r--r-- | libs/ardour/bundle.cc | 14 |
3 files changed, 18 insertions, 3 deletions
diff --git a/libs/ardour/ardour/bundle.h b/libs/ardour/ardour/bundle.h index 975e407646..369b12ec9b 100644 --- a/libs/ardour/ardour/bundle.h +++ b/libs/ardour/ardour/bundle.h @@ -52,6 +52,9 @@ class Bundle : public PBD::ScopedConnectionList struct Channel { Channel (std::string n, DataType t) : name (n), type (t) {} Channel (std::string n, DataType t, PortList p) : name (n), type (t), ports (p) {} + Channel (std::string n, DataType t, std::string const & p) : name (n), type (t) { + ports.push_back (p); + } bool operator== (Channel const &o) const { return name == o.name && type == o.type && ports == o.ports; @@ -77,6 +80,7 @@ class Bundle : public PBD::ScopedConnectionList PortList const & channel_ports (uint32_t) const; void add_channel (std::string const &, DataType); + void add_channel (std::string const &, DataType, std::string const &); void add_channel (std::string const &, DataType, PortList); std::string channel_name (uint32_t) const; DataType channel_type (uint32_t) const; @@ -87,7 +91,7 @@ class Bundle : public PBD::ScopedConnectionList void remove_ports_from_channel (uint32_t); void remove_ports_from_channels (); bool port_attached_to_channel (uint32_t, std::string); - bool uses_port (std::string) const; + bool offers_port (std::string) const; bool offers_port_alone (std::string) const; void remove_channel (uint32_t); void remove_channels (); diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 0b26444bce..98bf0145c2 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -89,7 +89,6 @@ class AuxInput; class BufferSet; class Bundle; class Butler; -class ControlProtocolInfo; class Diskstream; class ExportHandler; class ExportStatus; diff --git a/libs/ardour/bundle.cc b/libs/ardour/bundle.cc index 94fada383d..6037bfc7e9 100644 --- a/libs/ardour/bundle.cc +++ b/libs/ardour/bundle.cc @@ -177,6 +177,18 @@ Bundle::add_channel (std::string const & n, DataType t, PortList p) emit_changed (ConfigurationChanged); } +/** @param n Channel name */ +void +Bundle::add_channel (std::string const & n, DataType t, std::string const & p) +{ + { + Glib::Mutex::Lock lm (_channel_mutex); + _channel.push_back (Channel (n, t, p)); + } + + emit_changed (ConfigurationChanged); +} + bool Bundle::port_attached_to_channel (uint32_t ch, std::string portname) { @@ -211,7 +223,7 @@ Bundle::remove_channels () * @return true if any channel is associated with p. */ bool -Bundle::uses_port (std::string p) const +Bundle::offers_port (std::string p) const { Glib::Mutex::Lock lm (_channel_mutex); |