X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fchan_count.h;h=b24ff2336c42a44c4c4b09ba1e4d5c9aedd046f4;hb=f25d9b122046d9ccf81108afc2fb466a32f9cbcc;hp=e4981d11ef2e8cc9c781d8281285dd9526358a8a;hpb=3f24977735b06f9b39a82d66c216ba27e3a302d5;p=ardour.git

diff --git a/libs/ardour/ardour/chan_count.h b/libs/ardour/ardour/chan_count.h
index e4981d11ef..b24ff2336c 100644
--- a/libs/ardour/ardour/chan_count.h
+++ b/libs/ardour/ardour/chan_count.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2006 Paul Davis 
+    Copyright (C) 2006 Paul Davis
 	Author: Dave Robillard
 
     This program is free software; you can redistribute it and/or modify
@@ -20,8 +20,11 @@
 #ifndef __ardour_chan_count_h__
 #define __ardour_chan_count_h__
 
-#include <ardour/data_type.h>
 #include <cassert>
+#include <ostream>
+
+#include "pbd/xml++.h"
+#include "ardour/data_type.h"
 
 namespace ARDOUR {
 
@@ -33,8 +36,9 @@ namespace ARDOUR {
  */
 class ChanCount {
 public:
+	ChanCount(const XMLNode& node);
 	ChanCount() { reset(); }
-	
+
 	// Convenience constructor for making single-typed streams (stereo, mono, etc)
 	ChanCount(DataType type, uint32_t channels) {
 		reset();
@@ -46,16 +50,16 @@ public:
 			_counts[*t] = 0;
 		}
 	}
-	
+
 	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 {
 		uint32_t ret = 0;
 		for (uint32_t i=0; i < DataType::num_types; ++i)
@@ -71,7 +75,7 @@ public:
 
 		return true;
 	}
-	
+
 	bool operator!=(const ChanCount& other) const {
 		return ! (*this == other);
 	}
@@ -88,7 +92,7 @@ public:
 	bool operator<=(const ChanCount& other) const {
 		return ( (*this < other) || (*this == other) );
 	}
-	
+
 	bool operator>(const ChanCount& other) const {
 		for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
 			if (_counts[*t] < other._counts[*t]) {
@@ -102,6 +106,39 @@ public:
 		return ( (*this > other) || (*this == other) );
 	}
 
+	ChanCount operator+(const ChanCount& other) const {
+		ChanCount ret;
+		for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+			ret.set(*t, get(*t) + other.get(*t));
+		}
+		return ret;
+	}
+
+	ChanCount& operator+=(const ChanCount& other) {
+		for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+			_counts[*t] += other._counts[*t];
+		}
+		return *this;
+	}
+
+	static ChanCount min(const ChanCount& a, const ChanCount& b) {
+		ChanCount ret;
+		for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+			ret.set(*t, std::min(a.get(*t), b.get(*t)));
+		}
+		return ret;
+	}
+
+	static ChanCount max(const ChanCount& a, const ChanCount& b) {
+		ChanCount ret;
+		for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+			ret.set(*t, std::max(a.get(*t), b.get(*t)));
+		}
+		return ret;
+	}
+
+	XMLNode* state(const std::string& name) const;
+
 	static const ChanCount INFINITE;
 	static const ChanCount ZERO;
 
@@ -109,8 +146,9 @@ private:
 	uint32_t _counts[DataType::num_types];
 };
 
-
 } // namespace ARDOUR
 
+std::ostream& operator<<(std::ostream& o, const ARDOUR::ChanCount& c);
+
 #endif // __ardour_chan_count_h__