From ce7bfb489cc6f7522704f935ded4b4c438dc1c1e Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 4 Dec 2013 11:45:53 -0500
Subject: [PATCH] change "cpu" in cpu load backend functions

---
 gtk2_ardour/ardour_ui.cc                | 2 +-
 libs/ardour/ardour/audio_backend.h      | 2 +-
 libs/ardour/ardour/audioengine.h        | 2 +-
 libs/ardour/audioengine.cc              | 4 ++--
 libs/backends/jack/jack_audiobackend.cc | 2 +-
 libs/backends/jack/jack_audiobackend.h  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 2b6111f58a..6824ecff9e 100644
--- 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 17d7cd4010..387410685b 100644
--- a/libs/ardour/ardour/audio_backend.h
+++ b/libs/ardour/ardour/audio_backend.h
@@ -361,7 +361,7 @@ class 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 7c05f40b82..09f2ac04f8 100644
--- a/libs/ardour/ardour/audioengine.h
+++ b/libs/ardour/ardour/audioengine.h
@@ -86,7 +86,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 7f4d3c2a1d..82564ebaf2 100644
--- 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 8df97a1e30..0182e4809f 100644
--- 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 299bb1cefd..d5378247c3 100644
--- 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 ();