X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fchan_count.h;h=faa452d8861f443de380ebcea73b849f23f59999;hb=88c82aeb56c62d9d0c0acff51e360492ad9b8d23;hp=9f9fd07543abcc7045ed69ecea3c674651391219;hpb=cf806123ca5faaef483f898daba3f7bd38ec62eb;p=ardour.git

diff --git a/libs/ardour/ardour/chan_count.h b/libs/ardour/ardour/chan_count.h
index 9f9fd07543..faa452d886 100644
--- a/libs/ardour/ardour/chan_count.h
+++ b/libs/ardour/ardour/chan_count.h
@@ -26,10 +26,6 @@
 #include "pbd/xml++.h"
 #include "ardour/data_type.h"
 
-#ifdef INFINITE
-#undef INFINITE
-#endif
-
 namespace ARDOUR {
 
 
@@ -43,40 +39,67 @@ public:
 	ChanCount(const XMLNode& node);
 	ChanCount() { reset(); }
 
-	// Convenience constructor for making single-typed streams (stereo, mono, etc)
-	ChanCount(DataType type, uint32_t channels) {
+	/** Convenience constructor for making single-typed streams (mono, stereo, midi, etc)
+	 * @param type data type
+	 * @param count number of channels
+	 */
+	ChanCount(DataType type, uint32_t count) {
 		reset();
-		set(type, channels);
+		set(type, count);
 	}
 
+	/** zero count of all data types */
 	void reset() {
 		for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
 			_counts[*t] = 0;
 		}
 	}
 
+	/** set channel count for given type
+	 * @param type data type
+	 * @param count number of channels
+	 */
 	void     set(DataType t, uint32_t count) { assert(t != DataType::NIL); _counts[t] = count; }
+	/** query channel count for given type
+	 * @param type data type
+	 * @returns channel count for given type
+	 */
 	uint32_t get(DataType t) const { assert(t != DataType::NIL); return _counts[t]; }
 
 	inline uint32_t n (DataType t) const { return _counts[t]; }
 
+	/** query number of audio channels
+	 * @returns number of audio channels
+	 */
 	inline uint32_t n_audio() const { return _counts[DataType::AUDIO]; }
+	/** set number of audio channels
+	 * @param a number of audio channels
+	 */
 	inline void set_audio(uint32_t a) { _counts[DataType::AUDIO] = a; }
 
+	/** query number of midi channels
+	 * @returns number of midi channels
+	 */
 	inline uint32_t n_midi()  const { return _counts[DataType::MIDI]; }
+	/** set number of audio channels
+	 * @param m number of midi channels
+	 */
 	inline void set_midi(uint32_t m) { _counts[DataType::MIDI] = m; }
 
+	/** query total channel count of all data types
+	 * @returns total channel count (audio + midi)
+	 */
 	uint32_t n_total() const {
 		uint32_t ret = 0;
-		for (uint32_t i=0; i < DataType::num_types; ++i)
-			ret += _counts[i];
+		for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t)
+			ret += _counts[*t];
 
 		return ret;
 	}
 
 	bool operator==(const ChanCount& other) const {
-		for (uint32_t i=0; i < DataType::num_types; ++i)
-			if (_counts[i] != other._counts[i])
+		for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t)
+			if (_counts[*t] != other._counts[*t])
 				return false;
 
 		return true;
@@ -120,6 +143,39 @@ public:
 		return ret;
 	}
 
+	/** underflow safe subtraction */
+	ChanCount operator-(const ChanCount& other) const {
+		ChanCount ret;
+		for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+			if (get(*t) < other.get(*t)) {
+				ret.set(*t, 0);
+			} else {
+				ret.set(*t, get(*t) - other.get(*t));
+			}
+		}
+		return ret;
+	}
+
+	ChanCount operator*(const unsigned int factor) const {
+		ChanCount ret;
+		for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+			ret.set(*t, get(*t) * factor );
+		}
+		return ret;
+	}
+
+	/** underflow safe subtraction */
+	ChanCount& operator-=(const ChanCount& other) {
+		for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+			if (_counts[*t] < other._counts[*t]) {
+				_counts[*t] = 0;
+			} else {
+				_counts[*t] -= other._counts[*t];
+			}
+		}
+		return *this;
+	}
+
 	ChanCount& operator+=(const ChanCount& other) {
 		for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
 			_counts[*t] += other._counts[*t];
@@ -145,7 +201,6 @@ public:
 
 	XMLNode* state(const std::string& name) const;
 
-	static const ChanCount INFINITE;
 	static const ChanCount ZERO;
 
 private:
@@ -154,7 +209,7 @@ private:
 
 } // namespace ARDOUR
 
-std::ostream& operator<<(std::ostream& o, const ARDOUR::ChanCount& c);
+LIBARDOUR_API std::ostream& operator<<(std::ostream& o, const ARDOUR::ChanCount& c);
 
 #endif // __ardour_chan_count_h__