X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fbundle.cc;h=c27905e2cf4b9ee9a19302e64dc255119c31dc2e;hb=935fd3b32f600d6f20c134fa2ccae78aa4781de5;hp=be4b04e36a4966b69691256cb4b32394ff2fa876;hpb=616f2a0370a10dcc7372a95f6bca9f5a45698980;p=ardour.git

diff --git a/libs/ardour/bundle.cc b/libs/ardour/bundle.cc
index be4b04e36a..c27905e2cf 100644
--- a/libs/ardour/bundle.cc
+++ b/libs/ardour/bundle.cc
@@ -23,7 +23,7 @@
 #include "ardour/audioengine.h"
 #include "ardour/port.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
@@ -443,8 +443,8 @@ Bundle::connected_to (boost::shared_ptr<Bundle> other, AudioEngine & engine)
 	return true;
 }
 
-/** This must not be called in code executed as a response to a JACK event,
- *  as it uses jack_port_get_all_connections().
+/** This must not be called in code executed as a response to a backend event,
+ *  as it uses the backend port_get_all_connections().
  *  @return true if any of this bundle's channels are connected to anything.
  */
 bool
@@ -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<Channel>::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<Channel>::const_iterator i = _channel.begin ();
 	for (uint32_t j = 0; j < c; ++j) {
 		if (i->type == t) {