Remove cruft. ChanCount::INFINITE is not used

diff --git a/libs/ardour/ardour/chan_count.h b/libs/ardour/ardour/chan_count.h
index b5699b6743b34743b0e1a84f849baa4f6a482861..94c8b4ed069dc19eb62e506e1e851e88f61705ac 100644 (file)
--- 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 {
 
 
@@ -205,7 +201,6 @@ public:
 
        XMLNode* state(const std::string& name) const;
 
-       static const ChanCount INFINITE;
        static const ChanCount ZERO;
 
 private:

diff --git a/libs/ardour/chan_count.cc b/libs/ardour/chan_count.cc
index 956f3fdef9b7a807b75cf94f61c85440ebc520ec..f529386622b94c96ba87706e902a316d10ae0e26 100644 (file)
--- a/libs/ardour/chan_count.cc
+++ b/libs/ardour/chan_count.cc
@@ -48,18 +48,6 @@ ChanCount::ChanCount(const XMLNode& node)
        }
 }
 
-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
 {
@@ -77,7 +65,6 @@ ChanCount::state(const std::string& name) const
 }
 
 // Statics
-const ChanCount ChanCount::INFINITE = infinity_factory();
 const ChanCount ChanCount::ZERO     = ChanCount();
 
 } // namespace ARDOUR

diff --git a/libs/ardour/chan_mapping.cc b/libs/ardour/chan_mapping.cc
index ecec38865659b157c830cef040dbc3d0d3b89489..1840af0d25a1aabfd96092bc093cfc3a3e2c70aa 100644 (file)
--- a/libs/ardour/chan_mapping.cc
+++ b/libs/ardour/chan_mapping.cc
@@ -34,10 +34,6 @@ namespace ARDOUR {
 
 ChanMapping::ChanMapping(ChanCount identity)
 {
-       if (identity == ChanCount::INFINITE) {
-               return;
-       }
-
        for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
                for (size_t i = 0; i < identity.get(*t); ++i) {
                        set(*t, i, i);