Merge branch 'master' into cairocanvas

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

diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index f6694d88ea85ab24cba8a837a915a0a73c89a427..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"
 
@@ -80,7 +78,7 @@ AudioEngine::AudioEngine ()
        , _latency_output_port (0)
        , _latency_flush_frames (0)
        , _latency_signal_latency (0)
-       , _started_for_latency (false)
+       , _stopped_for_latency (false)
        , _in_destructor (false)
 {
        g_atomic_int_set (&m_meter_exit, 0);
@@ -475,12 +473,25 @@ AudioEngine::discover_backends ()
        Glib::PatternSpec so_extension_pattern("*backend.so");
        Glib::PatternSpec dylib_extension_pattern("*backend.dylib");
 
+#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);
 
        find_matching_files_in_search_path (backend_search_path (),
                                            dylib_extension_pattern, backend_modules);
 
+       find_matching_files_in_search_path (backend_search_path (),
+                                           dll_extension_pattern, backend_modules);
+
        DEBUG_TRACE (DEBUG::Panning, string_compose (_("looking for backends in %1\n"), backend_search_path().to_string()));
 
        for (vector<std::string>::iterator i = backend_modules.begin(); i != backend_modules.end(); ++i) {
@@ -553,6 +564,16 @@ AudioEngine::drop_backend ()
        }
 }
 
+boost::shared_ptr<AudioBackend>
+AudioEngine::set_default_backend ()
+{
+       if (_backends.empty()) {
+               return boost::shared_ptr<AudioBackend>();
+       }
+
+       return set_backend (_backends.begin()->first, "", "");
+}
+
 boost::shared_ptr<AudioBackend>
 AudioEngine::set_backend (const std::string& name, const std::string& arg1, const std::string& arg2)
 {
@@ -582,7 +603,7 @@ AudioEngine::set_backend (const std::string& name, const std::string& arg1, cons
 /* BACKEND PROXY WRAPPERS */
 
 int
-AudioEngine::start ()
+AudioEngine::start (bool for_latency)
 {
        if (!_backend) {
                return -1;
@@ -595,7 +616,7 @@ AudioEngine::start ()
        _processed_frames = 0;
        last_monitor_check = 0;
        
-       if (_backend->start()) {
+       if (_backend->start (for_latency)) {
                return -1;
        }
 
@@ -611,7 +632,7 @@ AudioEngine::start ()
        
        start_metering_thread ();
        
-       if (!_started_for_latency) {
+       if (!for_latency) {
                Running(); /* EMIT SIGNAL */
        }
        
@@ -619,7 +640,7 @@ AudioEngine::start ()
 }
 
 int
-AudioEngine::stop ()
+AudioEngine::stop (bool for_latency)
 {
        if (!_backend) {
                return 0;
@@ -640,25 +661,11 @@ AudioEngine::stop ()
        stop_metering_thread ();
        
        Port::PortDrop ();
-       Stopped (); /* EMIT SIGNAL */
-       
-       return 0;
-}
 
-int
-AudioEngine::pause ()
-{
-       if (!_backend) {
-               return 0;
-       }
-       
-       if (_backend->pause ()) {
-               return -1;
+       if (!for_latency) {
+               Stopped (); /* EMIT SIGNAL */
        }
-
-       _running = false;
        
-       Stopped(); /* EMIT SIGNAL */
        return 0;
 }
 
@@ -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
@@ -1004,7 +1011,10 @@ AudioEngine::halted_callback (const char* why)
        _running = false;
 
        Port::PortDrop (); /* EMIT SIGNAL */
-       Halted (why);      /* EMIT SIGNAL */
+
+       if (!_started_for_latency) {
+               Halted (why);      /* EMIT SIGNAL */
+       }
 }
 
 bool
@@ -1033,23 +1043,26 @@ AudioEngine::mtdm()
 int
 AudioEngine::prepare_for_latency_measurement ()
 {
-       if (!running()) {
-               _started_for_latency = true;
+       if (running()) {
+               _stopped_for_latency = true;
+               stop (true);
+       }
 
-               if (start()) {
-                       _started_for_latency = false;
-                       return -1;
-               }
+       if (start (true)) {
+               _started_for_latency = true;
+               return -1;
        }
 
        return 0;
 }
 
-void
+int
 AudioEngine::start_latency_detection ()
 {
-       if (prepare_for_latency_measurement ()) {
-               return;
+       if (!running()) {
+               if (prepare_for_latency_measurement ()) {
+                       return -1;
+               }
        }
 
        PortEngine& pe (port_engine());
@@ -1059,31 +1072,36 @@ 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) {
-               return;
+               stop (true);
+               return -1;
        }
 
        /* create the ports we will use to read/write data */
        
        if ((_latency_output_port = pe.register_port ("latency_out", DataType::AUDIO, IsOutput)) == 0) {
-               return;
+               stop (true);
+               return -1;
        }
        if (pe.connect (_latency_output_port, _latency_output_name)) {
                pe.unregister_port (_latency_output_port);
-               return;
+               stop (true);
+               return -1;
        }
 
        const string portname ("latency_in");
        if ((_latency_input_port = pe.register_port (portname, DataType::AUDIO, IsInput)) == 0) {
                pe.unregister_port (_latency_output_port);
-               return;
+               stop (true);
+               return -1;
        }
        if (pe.connect (_latency_input_name, make_port_name_non_relative (portname))) {
                pe.unregister_port (_latency_output_port);
-               return;
+               stop (true);
+               return -1;
        }
 
        LatencyRange lr;
@@ -1099,6 +1117,7 @@ AudioEngine::start_latency_detection ()
        _measuring_latency = true;
         _latency_flush_frames = samples_per_cycle();
 
+       return 0;
 }
 
 void
@@ -1114,9 +1133,15 @@ AudioEngine::stop_latency_detection ()
                port_engine().unregister_port (_latency_input_port);
                _latency_input_port = 0;
        }
-       if (_started_for_latency) {
-               stop ();
+
+       stop (true);
+
+       if (_stopped_for_latency) {
+               start ();
        }
+
+       _stopped_for_latency = false;
+       _started_for_latency = false;
 }
 
 void