Less weak plugin preset system (maybe AU preset stuff can use the 'normal' thing...

[ardour.git] / libs / ardour / ardour / chan_count.h

diff --git a/libs/ardour/ardour/chan_count.h b/libs/ardour/ardour/chan_count.h
index 67ad5406e3baf44afede0809c1fb71db95831249..986ef76e2529f4b4dbff9c1d796e5a3de8935a70 100644 (file)
--- a/libs/ardour/ardour/chan_count.h
+++ b/libs/ardour/ardour/chan_count.h
@@ -1,5 +1,6 @@
 /*
     Copyright (C) 2006 Paul Davis 
+       Author: Dave Robillard
 
     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
@@ -14,24 +15,28 @@
     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.
-
-    $Id: insert.cc 712 2006-07-28 01:08:57Z drobilla $
 */
 
 #ifndef __ardour_chan_count_h__
 #define __ardour_chan_count_h__
 
 #include <ardour/data_type.h>
+#include <cassert>
 
 namespace ARDOUR {
 
 
+/** A count of channels, possibly with many types.
+ *
+ * Operators are defined so this may safely be used as if it were a simple
+ * (single-typed) integer count of channels.
+ */
 class ChanCount {
 public:
        ChanCount() { reset(); }
        
        // Convenience constructor for making single-typed streams (stereo, mono, etc)
-       ChanCount(DataType type, size_t channels)
+       ChanCount(DataType type, uint32_t channels)
        {
                reset();
                set(type, channels);
@@ -40,17 +45,23 @@ public:
        void reset()
        {
                for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
-                       _counts[(*t).to_index()] = 0;
+                       _counts[*t] = 0;
                }
        }
-
-       void   set(DataType type, size_t count) { _counts[type.to_index()] = count; }
-       size_t get(DataType type) const { return _counts[type.to_index()]; }
        
-       size_t get_total() const
+       void     set(DataType t, uint32_t count) { assert(t != DataType::NIL); _counts[t] = count; }
+       uint32_t get(DataType t) const { assert(t != DataType::NIL); return _counts[t]; }
+       
+       inline uint32_t n_audio() const { return _counts[DataType::AUDIO]; }
+       inline void set_audio(uint32_t a) { _counts[DataType::AUDIO] = a; }
+       
+       inline uint32_t n_midi()  const { return _counts[DataType::MIDI]; }
+       inline void set_midi(uint32_t m) { _counts[DataType::MIDI] = m; }
+       
+       uint32_t n_total() const
        {
-               size_t ret = 0;
-               for (size_t i=0; i < DataType::num_types; ++i)
+               uint32_t ret = 0;
+               for (uint32_t i=0; i < DataType::num_types; ++i)
                        ret += _counts[i];
 
                return ret;
@@ -58,7 +69,7 @@ public:
 
        bool operator==(const ChanCount& other) const
        {
-               for (size_t i=0; i < DataType::num_types; ++i)
+               for (uint32_t i=0; i < DataType::num_types; ++i)
                        if (_counts[i] != other._counts[i])
                                return false;
 
@@ -73,41 +84,31 @@ public:
        bool operator<(const ChanCount& other) const
        {
                for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
-                       if (_counts[(*t).to_index()] >= other._counts[(*t).to_index()]) {
+                       if (_counts[*t] > other._counts[*t]) {
                                return false;
                        }
                }
-               return true;
+               return (*this != other);
        }
-       
+
        bool operator<=(const ChanCount& other) const
        {
-               for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
-                       if (_counts[(*t).to_index()] > other._counts[(*t).to_index()]) {
-                               return false;
-                       }
-               }
-               return true;
+               return ( (*this < other) || (*this == other) );
        }
        
        bool operator>(const ChanCount& other) const
        {
                for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
-                       if (_counts[(*t).to_index()] <= other._counts[(*t).to_index()]) {
+                       if (_counts[*t] < other._counts[*t]) {
                                return false;
                        }
                }
-               return true;
+               return (*this != other);
        }
-       
+
        bool operator>=(const ChanCount& other) const
        {
-               for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
-                       if (_counts[(*t).to_index()] < other._counts[(*t).to_index()]) {
-                               return false;
-                       }
-               }
-               return true;
+               return ( (*this > other) || (*this == other) );
        }
 
        static const ChanCount INFINITE;
@@ -115,7 +116,7 @@ public:
 
 private:
        
-       size_t _counts[DataType::num_types];
+       uint32_t _counts[DataType::num_types];
 };