Merge branch 'master' into cairocanvas

[ardour.git] / libs / ardour / audioengine.cc

diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index 45b8bbf7573a1d10f59ff72dbb8296e5c658fdb1..cb167c959579dfddc96348fca598fae5e3b6b707 100644 (file)
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -34,8 +34,6 @@
 #include "pbd/stacktrace.h"
 #include "pbd/unknown_type.h"
 
-#include <jack/weakjack.h>
-
 #include "midi++/port.h"
 #include "midi++/mmc.h"
 
@@ -474,8 +472,17 @@ AudioEngine::discover_backends ()
 
        Glib::PatternSpec so_extension_pattern("*backend.so");
        Glib::PatternSpec dylib_extension_pattern("*backend.dylib");
-       Glib::PatternSpec dll_extension_pattern("*backend.dll");
 
+#if defined(PLATFORM_WINDOWS) && defined(DEBUGGABLE_BACKENDS)
+       #if defined(DEBUG) || defined(_DEBUG)
+               Glib::PatternSpec dll_extension_pattern("*backendD.dll");
+       #else
+               Glib::PatternSpec dll_extension_pattern("*backendRDC.dll");
+       #endif
+#else
+       Glib::PatternSpec dll_extension_pattern("*backend.dll");
+#endif
+       
        find_matching_files_in_search_path (backend_search_path (),
                                            so_extension_pattern, backend_modules);
 
@@ -675,12 +682,12 @@ AudioEngine::freewheel (bool start_stop)
 }
 
 float
-AudioEngine::get_cpu_load() const 
+AudioEngine::get_dsp_load() const 
 {
        if (!_backend) {
                return 0.0;
        }
-       return _backend->cpu_load ();
+       return _backend->dsp_load ();
 }
 
 bool
@@ -1065,8 +1072,8 @@ AudioEngine::start_latency_detection ()
 
        /* find the ports we will connect to */
 
-       PortEngine::PortHandle* out = pe.get_port_by_name (_latency_output_name);
-       PortEngine::PortHandle* in = pe.get_port_by_name (_latency_input_name);
+       PortEngine::PortHandle out = pe.get_port_by_name (_latency_output_name);
+       PortEngine::PortHandle in = pe.get_port_by_name (_latency_input_name);
 
        if (!out || !in) {
                stop (true);