X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fbundle.cc;h=99340839d2bc080bdc6a6ce5acf8f04b82b303ea;hb=bc487bb4b02a9780938d6cf8528c888e59161aa9;hp=834a98d347d4d2a1d3deaebc655f816dec6fee6c;hpb=6bcdf4f0f106d0b83ed7f221f546c132585e19e7;p=ardour.git diff --git a/libs/ardour/bundle.cc b/libs/ardour/bundle.cc index 834a98d347..99340839d2 100644 --- a/libs/ardour/bundle.cc +++ b/libs/ardour/bundle.cc @@ -568,7 +568,7 @@ Bundle::type_channel_to_overall (DataType t, uint32_t c) const if (t == DataType::NIL) { return c; } - + Glib::Threads::Mutex::Lock lm (_channel_mutex); vector::const_iterator i = _channel.begin (); @@ -591,7 +591,7 @@ Bundle::type_channel_to_overall (DataType t, uint32_t c) const ++o; } - /* NOTREACHED */ + abort(); /* NOTREACHED */ return -1; } @@ -602,11 +602,11 @@ Bundle::overall_channel_to_type (DataType t, uint32_t c) const if (t == DataType::NIL) { return c; } - + Glib::Threads::Mutex::Lock lm (_channel_mutex); uint32_t s = 0; - + vector::const_iterator i = _channel.begin (); for (uint32_t j = 0; j < c; ++j) { if (i->type == t) {