diff options
| author | Ben Loftis <ben@harrisonconsoles.com> | 2018-02-16 09:35:44 -0600 |
|---|---|---|
| committer | Ben Loftis <ben@harrisonconsoles.com> | 2018-02-17 09:24:15 -0600 |
| commit | fa22689b704ab2dd06c98dcbc1d33b6f4418a4c0 (patch) | |
| tree | 1b9334d70a2429e6e88bae754c54c011d96cb3da /gtk2_ardour/ardour_ui.cc | |
| parent | cfed95fd0beb857f864c3abbab3ce30013dfd2d3 (diff) | |
Consistently use Gauge to avoid the overloaded term Indicator.
Diffstat (limited to 'gtk2_ardour/ardour_ui.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 74a2f24854..9e6fd093b4 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1684,9 +1684,9 @@ ARDOUR_UI::update_xrun_count () if (_session) { const unsigned int x = _session->get_xrun_count (); - dsp_load_indicator.set_xrun_count (x); + dsp_load_gauge.set_xrun_count (x); } else { - dsp_load_indicator.set_xrun_count (UINT_MAX); + dsp_load_gauge.set_xrun_count (UINT_MAX); } } @@ -1698,7 +1698,7 @@ ARDOUR_UI::update_cpu_load () */ double const c = AudioEngine::instance()->get_dsp_load (); - dsp_load_indicator.set_dsp_load (c); + dsp_load_gauge.set_dsp_load (c); } void @@ -1720,7 +1720,7 @@ ARDOUR_UI::update_buffer_load () uint32_t const playback = _session ? _session->playback_load () : 100; uint32_t const capture = _session ? _session->capture_load () : 100; uint32_t max_load = std::min ( playback, capture ); - disk_io_indicator.set_disk_io(max_load); + disk_io_gauge.set_disk_io(max_load); } void @@ -1736,7 +1736,7 @@ void ARDOUR_UI::update_disk_space() { if (_session == 0) { - disk_space_indicator.set_available_disk_sec (-1); + disk_space_gauge.set_available_disk_sec (-1); return; } @@ -1745,15 +1745,15 @@ ARDOUR_UI::update_disk_space() if (fr == 0) { /* skip update - no SR available */ - disk_space_indicator.set_available_disk_sec (-1); + disk_space_gauge.set_available_disk_sec (-1); return; } if (!opt_samples) { /* Available space is unknown */ - disk_space_indicator.set_available_disk_sec (-1); + disk_space_gauge.set_available_disk_sec (-1); } else if (opt_samples.get_value_or (0) == max_samplecnt) { - disk_space_indicator.set_available_disk_sec (max_samplecnt); + disk_space_gauge.set_available_disk_sec (max_samplecnt); } else { rec_enabled_streams = 0; _session->foreach_route (this, &ARDOUR_UI::count_recenabled_streams, false); @@ -1764,11 +1764,7 @@ ARDOUR_UI::update_disk_space() samples /= rec_enabled_streams; } - int hrs; - int mins; - int secs; - - disk_space_indicator.set_available_disk_sec (samples / (float)fr); + disk_space_gauge.set_available_disk_sec (samples / (float)fr); } } @@ -2583,8 +2579,8 @@ ARDOUR_UI::blink_handler (bool blink_on) audition_blink (blink_on); feedback_blink (blink_on); - dsp_load_indicator.blink(blink_on); - disk_space_indicator.blink(blink_on); + dsp_load_gauge.blink(blink_on); + disk_space_gauge.blink(blink_on); } void @@ -4873,7 +4869,7 @@ ARDOUR_UI::xrun_handler (samplepos_t where) ENSURE_GUI_THREAD (*this, &ARDOUR_UI::xrun_handler, where) if (_session && _session->actively_recording()) { - dsp_load_indicator.set_xrun_while_recording(); + dsp_load_gauge.set_xrun_while_recording(); } if (_session && Config->get_create_xrun_marker() && _session->actively_recording()) { |