fix cleanup (code is self-evident). From Yevgeny @ waves

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

diff --git a/libs/ardour/chan_mapping.cc b/libs/ardour/chan_mapping.cc
index 3f7ccad8f9722dc7b3f03818927ed45786a93e6b..5c5bb17de67a292c3094eb4584dbf25e84779603 100644 (file)
--- a/libs/ardour/chan_mapping.cc
+++ b/libs/ardour/chan_mapping.cc
@@ -41,12 +41,19 @@ ChanMapping::ChanMapping(ChanCount identity)
 }
 
 uint32_t
-ChanMapping::get(DataType t, uint32_t from)
+ChanMapping::get(DataType t, uint32_t from, bool* valid)
 {
        Mappings::iterator tm = _mappings.find(t);
-       assert(tm != _mappings.end());
+       if (tm == _mappings.end()) {
+               *valid = false;
+               return -1;
+       }
        TypeMapping::iterator m = tm->second.find(from);
-       assert(m != tm->second.end());
+       if (m == tm->second.end()) {
+               *valid = false;
+               return -1;
+       }
+       *valid = true;
        return m->second;
 }