Merge branch 'master' into cairocanvas

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

diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index ae40b089dbce24065bcd1062bebfbe02454f7e9e..cb167c959579dfddc96348fca598fae5e3b6b707 100644 (file)
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -669,23 +669,6 @@ AudioEngine::stop (bool for_latency)
        return 0;
 }
 
-int
-AudioEngine::pause ()
-{
-       if (!_backend) {
-               return 0;
-       }
-       
-       if (_backend->pause ()) {
-               return -1;
-       }
-
-       _running = false;
-       
-       Stopped(); /* EMIT SIGNAL */
-       return 0;
-}
-
 int
 AudioEngine::freewheel (bool start_stop)
 {
@@ -699,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
@@ -1089,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);