ardour/livetrax
13
0
Fork 0
Code

Merge branch 'master' into windows

Browse Source
This commit is contained in:
Paul Davis 2013-12-04 11:50:36 -05:00
commit 2ba2a50dec
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/ardour_ui.cc
View File

@ -1217,7 +1217,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);
}

2
libs/ardour/ardour/audio_backend.h
View File

@ -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)

2
libs/ardour/ardour/audioengine.h
View File

@ -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 ();

4
libs/ardour/audioengine.cc
View File

@ -673,12 +673,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

2
libs/backends/jack/jack_audiobackend.cc
View File

@ -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);

2
libs/backends/jack/jack_audiobackend.h
View File

@ -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 ();