{
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_gauge.set_disk_io(max_load);
+ disk_io_gauge.set_disk_io(playback, capture);
}
void
#ifndef __APPLE__
// OSX provides its own wallclock, thank you very much
- _status_bar_visibility.add (&wall_clock_label, X_("WallClock"), _("Wall Clock"), true);
+ _status_bar_visibility.add (&wall_clock_label, X_("WallClock"), _("Wall Clock"), false);
#endif
- _status_bar_visibility.add (&disk_space_gauge, X_("Disk"), _("Disk Space"), !Profile->get_small_screen());
- _status_bar_visibility.add (&dsp_load_gauge, X_("DSP"), _("DSP"), true);
_status_bar_visibility.add (&peak_thread_work_label,X_("Peakfile"), _("Active Peak-file Work"), false);
- _status_bar_visibility.add (&disk_io_gauge, X_("Buffers"), _("Buffers"), true);
+ _status_bar_visibility.add (&format_label, X_("Format"), _("File Format"), false);
+ _status_bar_visibility.add (&timecode_format_label, X_("TCFormat"), _("Timecode Format"), false);
_status_bar_visibility.add (&sample_rate_label, X_("Audio"), _("Audio"), true);
- _status_bar_visibility.add (&timecode_format_label, X_("TCFormat"), _("Timecode Format"), true);
- _status_bar_visibility.add (&format_label, X_("Format"), _("File Format"), true);
+ _status_bar_visibility.add (&disk_io_gauge, X_("Buffers"), _("Buffers"), true);
+ _status_bar_visibility.add (&disk_space_gauge, X_("Disk"), _("Disk Space"), !Profile->get_small_screen());
+ _status_bar_visibility.add (&dsp_load_gauge, X_("DSP"), _("DSP"), true);
ev->signal_button_press_event().connect (sigc::mem_fun (_status_bar_visibility, &VisibilityGroup::button_press_event));
ev->signal_button_release_event().connect (sigc::mem_fun (*this, &ARDOUR_UI::xrun_button_release));
DiskIoGauge::DiskIoGauge ()
: ArdourGauge ("00.0%")
- , _disk_io (0)
+ , _disk_play (0)
+ , _disk_capture (0)
{
}
void
-DiskIoGauge::set_disk_io (const double load)
+DiskIoGauge::set_disk_io (const double play, const double capture)
{
- if (load == _disk_io) {
+ if (play == _disk_play && capture == _disk_capture) {
return;
}
- _disk_io = load;
+ _disk_play = 100.0-play;
+ _disk_capture = 100.0-capture;
char buf[64];
- snprintf (buf, sizeof (buf), "Dsk: %.1f%%", _disk_io);
+ if ( _disk_play > 1.0 && _disk_play < 10.0 && _disk_capture < 2.0 ) {
+ snprintf (buf, sizeof (buf), "Disk: %.0f%% / 0%%", _disk_play);
+ } else if ( _disk_play > 1.0 && _disk_capture < 2.0 ) {
+ snprintf (buf, sizeof (buf), "Disk: %.0f%% / 0%%", _disk_play);
+ } else if ( _disk_play > 1.0 && _disk_capture > 1.0 ) {
+ snprintf (buf, sizeof (buf), "Disk: %.0f%% / %.0f%%", _disk_play, _disk_capture);
+ } else {
+ snprintf (buf, sizeof (buf), " ");
+ }
update (std::string (buf));
}
float
DiskIoGauge::level () const {
- return (_disk_io / 100.f);
+ return min ( _disk_play / 100.f, _disk_capture / 100.f);
}
bool
ArdourGauge::Status
DiskIoGauge::indicator () const
{
- if (_disk_io < 50) {
+ float lvl = level();
+
+ if (lvl > 0.6) {
return ArdourGauge::Level_CRIT;
- } else if (_disk_io < 75) {
+ } else if (lvl > 0.4) {
return ArdourGauge::Level_WARN;
} else {
return ArdourGauge::Level_OK;
std::string
DiskIoGauge::tooltip_text ()
{
- char buf[64];
+ char buf[128];
- snprintf (buf, sizeof (buf), _("Disk I/O cache: %.1f"), _disk_io);
+ snprintf (buf, sizeof (buf), "Disk Play/Record cache: %.0f%% / %.0f%%", _disk_play, _disk_capture);
return buf;
}
public:
DiskIoGauge ();
- void set_disk_io (const double load);
+ void set_disk_io (const double playback, const double capture);
protected:
bool alert () const;
private:
- float _disk_io;
+ float _disk_play;
+ float _disk_capture;
};
#endif
float
DiskSpaceGauge::level () const {
- static const float lm = 6.f * 3600.f;
- if (_sec < 0) return 0;
- if (_sec > lm) return 1.0;
- return _sec / lm;
+ static const float six_hours = 6.f * 3600.f;
+ if (_sec < 0) return 1.0;
+ if (_sec > six_hours) return 0.0;
+ return (1.0 - (_sec / six_hours));
}
bool
float
DspLoadGauge::level () const {
- return (100.0-_dsp_load) / 100.f;
+ return (_dsp_load / 100.f);
}
bool
{
if (_dsp_load > 90) {
return ArdourGauge::Level_CRIT;
- } else if (_dsp_load > 80) {
+ } else if (_dsp_load > 75) {
return ArdourGauge::Level_WARN;
} else {
return ArdourGauge::Level_OK;