X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Faudioengine.cc;h=96445b597388c17e1b1d13f2765f8e280f456d43;hb=5956e864e7ceb1285e43f376796aaec5230d16e9;hp=0eba97429bd0fbbce4046949e88b9573fd0df60c;hpb=2c2ce7aa55f8878b86d648347af91c533e707394;p=ardour.git

diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index 0eba97429b..96445b5973 100644
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -53,6 +53,7 @@
 #include "ardour/mtdm.h"
 #include "ardour/port.h"
 #include "ardour/process_thread.h"
+#include "ardour/rc_configuration.h"
 #include "ardour/session.h"
 
 #include "pbd/i18n.h"
@@ -775,12 +776,14 @@ AudioEngine::backend_discover (const string& path)
 	return info;
 }
 
+#ifdef NDEBUG
 static bool running_from_source_tree ()
 {
 	// dup ARDOUR_UI_UTILS::running_from_source_tree ()
 	gchar const *x = g_getenv ("ARDOUR_THEMES_PATH");
 	return x && (string (x).find ("gtk2_ardour") != string::npos);
 }
+#endif
 
 vector<const AudioBackendInfo*>
 AudioEngine::available_backends() const
@@ -789,7 +792,7 @@ AudioEngine::available_backends() const
 
 	for (BackendMap::const_iterator i = _backends.begin(); i != _backends.end(); ++i) {
 #ifdef NDEBUG
-		if (i->first == "None (Dummy)" && !running_from_source_tree ()) {
+		if (i->first == "None (Dummy)" && !running_from_source_tree () && Config->get_hide_dummy_backend ()) {
 			continue;
 		}
 #endif
@@ -876,8 +879,7 @@ AudioEngine::start (bool for_latency)
 	int error_code = _backend->start (for_latency);
 
 	if (error_code != 0) {
-		_last_backend_error_string =
-		    AudioBackend::get_error_string((AudioBackend::ErrorCode)error_code);
+		_last_backend_error_string = AudioBackend::get_error_string((AudioBackend::ErrorCode) error_code);
 		return -1;
 	}
 
@@ -892,6 +894,10 @@ AudioEngine::start (bool for_latency)
 
 	}
 
+	/* XXX MIDI ports may not actually be available here yet .. */
+
+	PortManager::fill_midi_port_info ();
+
 	if (!for_latency) {
 		Running(); /* EMIT SIGNAL */
 	}
@@ -918,7 +924,7 @@ AudioEngine::stop (bool for_latency)
 		stop_engine = false;
 	} else {
 		if (_backend->stop ()) {
-			if (pl.locked ()) { 
+			if (pl.locked ()) {
                             pl.release ();
                         }
 			return -1;
@@ -1496,4 +1502,3 @@ AudioEngine::add_pending_port_deletion (Port* p)
 		delete p;
 	}
 }
-