projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove wrong asserts
[ardour.git]
/
libs
/
ardour
/
bundle.cc
diff --git
a/libs/ardour/bundle.cc
b/libs/ardour/bundle.cc
index 834a98d347d4d2a1d3deaebc655f816dec6fee6c..c27905e2cf4b9ee9a19302e64dc255119c31dc2e 100644
(file)
--- a/
libs/ardour/bundle.cc
+++ b/
libs/ardour/bundle.cc
@@
-23,7
+23,7
@@
#include "ardour/audioengine.h"
#include "ardour/port.h"
#include "ardour/audioengine.h"
#include "ardour/port.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
using namespace std;
using namespace ARDOUR;
using namespace std;
using namespace ARDOUR;
@@
-568,7
+568,7
@@
Bundle::type_channel_to_overall (DataType t, uint32_t c) const
if (t == DataType::NIL) {
return c;
}
if (t == DataType::NIL) {
return c;
}
-
+
Glib::Threads::Mutex::Lock lm (_channel_mutex);
vector<Channel>::const_iterator i = _channel.begin ();
Glib::Threads::Mutex::Lock lm (_channel_mutex);
vector<Channel>::const_iterator i = _channel.begin ();
@@
-591,7
+591,7
@@
Bundle::type_channel_to_overall (DataType t, uint32_t c) const
++o;
}
++o;
}
- /* NOTREACHED */
+
abort();
/* NOTREACHED */
return -1;
}
return -1;
}
@@
-602,11
+602,11
@@
Bundle::overall_channel_to_type (DataType t, uint32_t c) const
if (t == DataType::NIL) {
return c;
}
if (t == DataType::NIL) {
return c;
}
-
+
Glib::Threads::Mutex::Lock lm (_channel_mutex);
uint32_t s = 0;
Glib::Threads::Mutex::Lock lm (_channel_mutex);
uint32_t s = 0;
-
+
vector<Channel>::const_iterator i = _channel.begin ();
for (uint32_t j = 0; j < c; ++j) {
if (i->type == t) {
vector<Channel>::const_iterator i = _channel.begin ();
for (uint32_t j = 0; j < c; ++j) {
if (i->type == t) {