Add a scratch buffer for automation.

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

diff --git a/libs/ardour/chan_count.cc b/libs/ardour/chan_count.cc
index c6764456e0128a032143e432f2246552843f3ef6..f529386622b94c96ba87706e902a316d10ae0e26 100644 (file)
--- a/libs/ardour/chan_count.cc
+++ b/libs/ardour/chan_count.cc
@@ -18,11 +18,11 @@
     $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/types_convert.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 static const char* state_node_name = "Channels";
 
@@ -39,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
 {
@@ -66,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);
                }
        }
@@ -75,7 +65,6 @@ ChanCount::state(const std::string& name) const
 }
 
 // Statics
-const ChanCount ChanCount::INFINITE = infinity_factory();
 const ChanCount ChanCount::ZERO     = ChanCount();
 
 } // namespace ARDOUR