Merge branch 'master' into cairocanvas

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

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