X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fchan_count.cc;h=f529386622b94c96ba87706e902a316d10ae0e26;hb=508f23c4d04da082a0e8799eb25e969468d0be4c;hp=b6f51a4d9585cb2e69d0d4b37907495fe76d7156;hpb=449aab3c465bbbf66d221fac3d7ea559f1720357;p=ardour.git

diff --git a/libs/ardour/chan_count.cc b/libs/ardour/chan_count.cc
index b6f51a4d95..f529386622 100644
--- a/libs/ardour/chan_count.cc
+++ b/libs/ardour/chan_count.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2006 Paul Davis 
+    Copyright (C) 2006 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
@@ -18,31 +18,57 @@
     $Id: insert.cc 712 2006-07-28 01:08:57Z drobilla $
 */
 
-#define __STDC_LIMIT_MACROS 1
 #include <stdint.h>
-#include <ardour/chan_count.h>
+#include "ardour/chan_count.h"
+#include "ardour/types_convert.h"
+
+#include "pbd/i18n.h"
+
+static const char* state_node_name = "Channels";
+
+using namespace std;
 
 namespace ARDOUR {
 
 // infinite/zero chan count stuff, for setting minimums and maximums, etc.
 // FIXME: implement this in a less fugly way
 
-ChanCount
-infinity_factory()
+ChanCount::ChanCount(const XMLNode& node)
 {
-	ChanCount ret;
+	reset();
+	XMLNodeConstIterator iter = node.children().begin();
+	for ( ; iter != node.children().end(); ++iter) {
+		if ((*iter)->name() == X_(state_node_name)) {
+			DataType type(DataType::NIL);
+			uint32_t count;
+			(*iter)->get_property("type", type);
+			(*iter)->get_property("count", count);
+			set(type, count);
+		}
+	}
+}
 
+XMLNode*
+ChanCount::state(const std::string& name) const
+{
+	XMLNode* node = new XMLNode (name);
 	for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
-		ret.set(*t, UINT32_MAX);
+		uint32_t count = get(*t);
+		if (count > 0) {
+			XMLNode* n = new XMLNode(X_(state_node_name));
+			n->set_property("type", *t);
+			n->set_property("count", count);
+			node->add_child_nocopy(*n);
+		}
 	}
-
-	return ret;
+	return node;
 }
 
-
 // Statics
-const ChanCount ChanCount::INFINITE = infinity_factory();
 const ChanCount ChanCount::ZERO     = ChanCount();
 
-
 } // namespace ARDOUR
+
+std::ostream& operator<<(std::ostream& o, const ARDOUR::ChanCount& c) {
+	return o << "AUDIO=" << c.n_audio() << ":MIDI=" << c.n_midi();
+}