diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-10 15:03:30 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-10 15:03:30 +0000 |
commit | 68e943265edf04e63a8e8b8f62bab20f99d9c637 (patch) | |
tree | ff8941a59662fc0c4622944b65f7b2d5e3bdd0c3 /libs/ardour/user_bundle.cc | |
parent | e4372df05b7d74a6b80dbbf4b6c00cc2b31c4723 (diff) |
merge from 2.0-ongoing @ 3581
git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/user_bundle.cc')
-rw-r--r-- | libs/ardour/user_bundle.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libs/ardour/user_bundle.cc b/libs/ardour/user_bundle.cc index 471d823496..b9d115bc40 100644 --- a/libs/ardour/user_bundle.cc +++ b/libs/ardour/user_bundle.cc @@ -23,17 +23,17 @@ ARDOUR::UserBundle::UserBundle (XMLNode const & x, bool i) } } -uint32_t +ARDOUR::ChanCount ARDOUR::UserBundle::nchannels () const { Glib::Mutex::Lock lm (_ports_mutex); - return _ports.size (); + return ChanCount (type(), _ports.size ()); } const ARDOUR::PortList& ARDOUR::UserBundle::channel_ports (uint32_t n) const { - assert (n < nchannels ()); + assert (n < nchannels ().get (type())); Glib::Mutex::Lock lm (_ports_mutex); return _ports[n]; @@ -42,7 +42,7 @@ ARDOUR::UserBundle::channel_ports (uint32_t n) const void ARDOUR::UserBundle::add_port_to_channel (uint32_t c, std::string const & p) { - assert (c < nchannels ()); + assert (c < nchannels ().get (type())); PortsWillChange (c); @@ -57,7 +57,7 @@ ARDOUR::UserBundle::add_port_to_channel (uint32_t c, std::string const & p) void ARDOUR::UserBundle::remove_port_from_channel (uint32_t c, std::string const & p) { - assert (c < nchannels ()); + assert (c < nchannels ().get (type())); PortsWillChange (c); @@ -75,7 +75,7 @@ ARDOUR::UserBundle::remove_port_from_channel (uint32_t c, std::string const & p) bool ARDOUR::UserBundle::port_attached_to_channel (uint32_t c, std::string const & p) const { - assert (c < nchannels ()); + assert (c < nchannels ().get (type())); Glib::Mutex::Lock lm (_ports_mutex); return std::find (_ports[c].begin(), _ports[c].end(), p) != _ports[c].end(); @@ -110,7 +110,7 @@ ARDOUR::UserBundle::set_channels (uint32_t n) void ARDOUR::UserBundle::remove_channel (uint32_t r) { - assert (r < nchannels ()); + assert (r < nchannels ().get (type())); ConfigurationWillChange (); |