* reenabled assertions after irc-ing with drobilla

git-svn-id: svn://localhost/ardour2/branches/3.0@4311 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/evoral/src/ControlList.cpp b/libs/evoral/src/ControlList.cpp
index dfc4ae386755b11db905cb0f12ccbb9e02669a50..e1cea8e191d7d295f40af305d4baa52d2e78c03d 100644 (file)
--- a/libs/evoral/src/ControlList.cpp
+++ b/libs/evoral/src/ControlList.cpp
@@ -1080,9 +1080,7 @@ ControlList::rt_safe_earliest_event_linear_unlocked (double start, double end, d
                                 * (Optimize for immediate call this cycle within range) */
                                _search_cache.left = x;
                                //++_search_cache.range.first;
-                               if (! (inclusive ? x >= start : x > start)) {
-                                       cerr << "Warning: failed assertion: inclusive ? x >= start : x > start in ControlList.cpp" << endl;
-                               }
+                               assert(inclusive ? x >= start : x > start);
                                return true;
                        } else {
                                return false;

diff --git a/libs/evoral/src/Sequence.cpp b/libs/evoral/src/Sequence.cpp
index 3de24106d4aa7e322b840a7600800c582ecefecd..d746f470b6f15c44ebad8247cbb6d033e1573970 100644 (file)
--- a/libs/evoral/src/Sequence.cpp
+++ b/libs/evoral/src/Sequence.cpp
@@ -193,9 +193,7 @@ Sequence::const_iterator& Sequence::const_iterator::operator++()
                const bool ret = _control_iter->list->rt_safe_earliest_event_unlocked(
                                _control_iter->x, DBL_MAX, x, y, false);
 
-               if ( !(!ret || x > _control_iter->x) ) {
-                       cerr << "Warning: Assertion failed: !ret || x > _control_iter->x in Sequence.cpp" << endl;
-               }
+               assert(!ret || x > _control_iter->x);
 
                if (ret) {
                        _control_iter->x = x;