smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-06 05:35:47 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into cairocanvas

Browse source
This commit is contained in:
Paul Davis 2013-12-05 17:50:28 -05:00
commit 59da788793
8 changed files with 85 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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