change "cpu" in cpu load backend functions

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 2b6111f58af02c15e0662c591a62c5f8304a0b95..6824ecff9edd00be5e28765ab39a2e8a50ca8757 100644 (file)
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1213,7 +1213,7 @@ ARDOUR_UI::update_cpu_load ()
           should also be changed.
        */
 
-       float const c = AudioEngine::instance()->get_cpu_load ();
+       float const c = AudioEngine::instance()->get_dsp_load ();
        snprintf (buf, sizeof (buf), _("DSP: <span foreground=\"%s\">%5.1f%%</span>"), c >= 90 ? X_("red") : X_("green"), c);
        cpu_load_label.set_markup (buf);
 }

diff --git a/libs/ardour/ardour/audio_backend.h b/libs/ardour/ardour/audio_backend.h
index 267d3acb70c872afb3b7b153fe668add1b705695..1da46889506f47f855caeae727bbcf82de8552b5 100644 (file)
--- a/libs/ardour/ardour/audio_backend.h
+++ b/libs/ardour/ardour/audio_backend.h
@@ -362,7 +362,7 @@ class LIBARDOUR_API AudioBackend : public PortEngine {
      * Implementations can feel free to smooth the values returned over
      * time (e.g. high pass filtering, or its equivalent).
      */
-    virtual float cpu_load() const  = 0;
+    virtual float dsp_load() const  = 0;
 
     /* Transport Control (JACK is the only audio API that currently offers
        the concept of shared transport control)

diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h
index 499f8324ebf272d04594f5c8669e7191797dbf50..75954e6ca9eb58337f3018611ff49e4facd8ed5e 100644 (file)
--- a/libs/ardour/ardour/audioengine.h
+++ b/libs/ardour/ardour/audioengine.h
@@ -87,7 +87,7 @@ public:
     int            start (bool for_latency_measurement=false);
     int            stop (bool for_latency_measurement=false);
     int            freewheel (bool start_stop);
-    float          get_cpu_load() const ;
+    float          get_dsp_load() const ;
     void           transport_start ();
     void           transport_stop ();
     TransportState transport_state ();

diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc
index 7f4d3c2a1d2fabdb723bf8417daa34f3df05283e..82564ebaf2e5c4def9a2eb83aecbe7559acd090d 100644 (file)
--- a/libs/ardour/audioengine.cc
+++ b/libs/ardour/audioengine.cc
@@ -675,12 +675,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

diff --git a/libs/backends/jack/jack_audiobackend.cc b/libs/backends/jack/jack_audiobackend.cc
index 8df97a1e303e41589df44829cfbb5d397e8e50ad..0182e4809f06d95825d1f4eeb499c18feb75da89 100644 (file)
--- a/libs/backends/jack/jack_audiobackend.cc
+++ b/libs/backends/jack/jack_audiobackend.cc
@@ -1015,7 +1015,7 @@ JACKAudioBackend::disconnected (const char* why)
 }
 
 float 
-JACKAudioBackend::cpu_load() const 
+JACKAudioBackend::dsp_load() const 
 {
        GET_PRIVATE_JACK_POINTER_RET(_priv_jack,0);
        return jack_cpu_load (_priv_jack);

diff --git a/libs/backends/jack/jack_audiobackend.h b/libs/backends/jack/jack_audiobackend.h
index 299bb1cefd098a9f7b577d68b073f7e7882dafc5..d5378247c320194838f4c4107b3fe4e37575b9d5 100644 (file)
--- a/libs/backends/jack/jack_audiobackend.h
+++ b/libs/backends/jack/jack_audiobackend.h
@@ -92,7 +92,7 @@ class JACKAudioBackend : public AudioBackend {
     int stop ();
     int freewheel (bool);
 
-    float cpu_load() const;
+    float dsp_load() const;
 
     pframes_t sample_time ();
     pframes_t sample_time_at_cycle_start ();