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

diff --git a/libs/ardour/chan_count.cc b/libs/ardour/chan_count.cc
index 3cef0f6f90..f529386622 100644
--- a/libs/ardour/chan_count.cc
+++ b/libs/ardour/chan_count.cc
@@ -20,8 +20,9 @@
 
 #include <stdint.h>
 #include "ardour/chan_count.h"
+#include "ardour/types_convert.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 static const char* state_node_name = "Channels";
 
@@ -38,25 +39,15 @@ ChanCount::ChanCount(const XMLNode& node)
 	XMLNodeConstIterator iter = node.children().begin();
 	for ( ; iter != node.children().end(); ++iter) {
 		if ((*iter)->name() == X_(state_node_name)) {
-			const string& type_str  = (*iter)->property("type")->value();
-			const string& count_str = (*iter)->property("count")->value();
-			set(DataType(type_str), atol(count_str.c_str()));
+			DataType type(DataType::NIL);
+			uint32_t count;
+			(*iter)->get_property("type", type);
+			(*iter)->get_property("count", count);
+			set(type, count);
 		}
 	}
 }
 
-ChanCount
-infinity_factory()
-{
-	ChanCount ret;
-
-	for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
-		ret.set(*t, UINT32_MAX);
-	}
-
-	return ret;
-}
-
 XMLNode*
 ChanCount::state(const std::string& name) const
 {
@@ -65,8 +56,8 @@ ChanCount::state(const std::string& name) const
 		uint32_t count = get(*t);
 		if (count > 0) {
 			XMLNode* n = new XMLNode(X_(state_node_name));
-			n->add_property("type", (*t).to_string());
-			n->add_property("count", count);
+			n->set_property("type", *t);
+			n->set_property("count", count);
 			node->add_child_nocopy(*n);
 		}
 	}
@@ -74,7 +65,6 @@ ChanCount::state(const std::string& name) const
 }
 
 // Statics
-const ChanCount ChanCount::INFINITE = infinity_factory();
 const ChanCount ChanCount::ZERO     = ChanCount();
 
 } // namespace ARDOUR