merge from 2.0-ongoing @ 3581

git-svn-id: svn://localhost/ardour2/branches/3.0@3711 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 4 insertions, 4 deletions

diff --git a/libs/ardour/auto_bundle.cc b/libs/ardour/auto_bundle.cc
index 9da32bbb7a..fc70768601 100644
--- a/libs/ardour/auto_bundle.cc
+++ b/libs/ardour/auto_bundle.cc
@@ -13,17 +13,17 @@ ARDOUR::AutoBundle::AutoBundle (std::string const & n, bool i)
 	
 }
 
-uint32_t
+ARDOUR::ChanCount
 ARDOUR::AutoBundle::nchannels () const
 {
 	Glib::Mutex::Lock lm (_ports_mutex);
-	return _ports.size ();
+	return ChanCount (type(), _ports.size ());
 }
 
 const ARDOUR::PortList&
 ARDOUR::AutoBundle::channel_ports (uint32_t c) const
 {
-	assert (c < nchannels());
+	assert (c < nchannels().get (type()));
 
 	Glib::Mutex::Lock lm (_ports_mutex);
 	return _ports[c];
@@ -39,7 +39,7 @@ ARDOUR::AutoBundle::set_channels (uint32_t n)
 void
 ARDOUR::AutoBundle::set_port (uint32_t c, std::string const & p)
 {
-	assert (c < nchannels ());
+	assert (c < nchannels ().get (type()));
 
 	Glib::Mutex::Lock lm (_ports_mutex);
 	_ports[c].resize (1);