diff options
-rw-r--r-- | libs/ardour/ardour/chan_count.h | 5 | ||||
-rw-r--r-- | libs/ardour/chan_count.cc | 13 | ||||
-rw-r--r-- | libs/ardour/chan_mapping.cc | 4 |
3 files changed, 0 insertions, 22 deletions
diff --git a/libs/ardour/ardour/chan_count.h b/libs/ardour/ardour/chan_count.h index b5699b6743..94c8b4ed06 100644 --- 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 956f3fdef9..f529386622 100644 --- 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 ecec388656..1840af0d25 100644 --- 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); |