add IsSkip enum to enums.cc

[ardour.git] / libs / ardour / auto_bundle.cc

diff --git a/libs/ardour/auto_bundle.cc b/libs/ardour/auto_bundle.cc
index 9da32bbb7af2fd0ff854bd5d083002477dbe4b8c..75db301ae1463b0d6795e2e9815668d477f2482c 100644 (file)
--- a/libs/ardour/auto_bundle.cc
+++ b/libs/ardour/auto_bundle.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2012 Paul Davis 
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <cassert>
 #include "ardour/auto_bundle.h"
 
@@ -10,38 +29,38 @@ ARDOUR::AutoBundle::AutoBundle (bool i)
 ARDOUR::AutoBundle::AutoBundle (std::string const & n, bool i)
        : Bundle (n, i)
 {
-       
+
 }
 
-uint32_t
+ARDOUR::ChanCount
 ARDOUR::AutoBundle::nchannels () const
 {
-       Glib::Mutex::Lock lm (_ports_mutex);
-       return _ports.size ();
+       Glib::Threads::Mutex::Lock lm (_ports_mutex);
+       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);
+       Glib::Threads::Mutex::Lock lm (_ports_mutex);
        return _ports[c];
 }
 
 void
 ARDOUR::AutoBundle::set_channels (uint32_t n)
 {
-       Glib::Mutex::Lock lm (_ports_mutex);
+       Glib::Threads::Mutex::Lock lm (_ports_mutex);
        _ports.resize (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);
+       Glib::Threads::Mutex::Lock lm (_ports_mutex);
        _ports[c].resize (1);
        _ports[c][0] = p;
 }