ardour/livetrax
13
0
Fork 0
Code

Tweak idle-o-meter: reset-button & acquisition time display

Browse Source
This commit is contained in:
Robin Gareus 2017-03-15 12:38:11 +01:00
parent 4ae5737beb
commit c9b1e6dbef
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gtk2_ardour/idleometer.cc
View File

@ -18,8 +18,11 @@
*/ */
#include <glib.h> #include <glib.h>
#include <gtkmm/button.h>
#include <gtkmm/table.h> #include <gtkmm/table.h>
#include "timecode/time.h"
#include "idleometer.h" #include "idleometer.h"
#include "pbd/i18n.h" #include "pbd/i18n.h"
@ -39,11 +42,15 @@ IdleOMeter::IdleOMeter ()
Label* l = manage (new Label (_("<b>GUI Idle Timing Statistics</b>"), ALIGN_CENTER)); Label* l = manage (new Label (_("<b>GUI Idle Timing Statistics</b>"), ALIGN_CENTER));
l->set_use_markup (); l->set_use_markup ();
get_vbox()->pack_start (*l, false, false); HBox* hbox = manage (new HBox ());
HBox* b = manage (new HBox ());
Table* t = manage (new Table ()); Table* t = manage (new Table ());
b->pack_start (*t, true, false); hbox->pack_start (*t, true, false);
Button* b = manage (new Button (_("Reset")));
b->signal_clicked().connect (sigc::mem_fun(*this, &IdleOMeter::reset));
get_vbox()->pack_start (*l, false, false);
get_vbox()->pack_start (*hbox, false, false);
get_vbox()->pack_start (*b, false, false); get_vbox()->pack_start (*b, false, false);
_label_cur.set_alignment (ALIGN_RIGHT, ALIGN_CENTER); _label_cur.set_alignment (ALIGN_RIGHT, ALIGN_CENTER);
@ -51,6 +58,7 @@ IdleOMeter::IdleOMeter ()
_label_max.set_alignment (ALIGN_RIGHT, ALIGN_CENTER); _label_max.set_alignment (ALIGN_RIGHT, ALIGN_CENTER);
_label_avg.set_alignment (ALIGN_RIGHT, ALIGN_CENTER); _label_avg.set_alignment (ALIGN_RIGHT, ALIGN_CENTER);
_label_dev.set_alignment (ALIGN_RIGHT, ALIGN_CENTER); _label_dev.set_alignment (ALIGN_RIGHT, ALIGN_CENTER);
_label_acq.set_alignment (ALIGN_CENTER, ALIGN_CENTER);
int row = 0; int row = 0;
t->attach (*manage (new Label (_("Current:"), ALIGN_RIGHT)), 0, 1, row, row + 1, FILL, SHRINK); t->attach (*manage (new Label (_("Current:"), ALIGN_RIGHT)), 0, 1, row, row + 1, FILL, SHRINK);
@ -67,6 +75,9 @@ IdleOMeter::IdleOMeter ()
++row; ++row;
t->attach (*manage (new Label (_("\u03c3:"), ALIGN_RIGHT)), 0, 1, row, row + 1, FILL, SHRINK); t->attach (*manage (new Label (_("\u03c3:"), ALIGN_RIGHT)), 0, 1, row, row + 1, FILL, SHRINK);
t->attach (_label_dev, 1, 2, row, row + 1, FILL, SHRINK); t->attach (_label_dev, 1, 2, row, row + 1, FILL, SHRINK);
++row;
t->attach (*manage (new Label (_("Elapsed:"), ALIGN_RIGHT)), 0, 1, row, row + 1, FILL, SHRINK);
t->attach (_label_acq, 1, 2, row, row + 1, FILL, SHRINK);
} }
IdleOMeter::~IdleOMeter () IdleOMeter::~IdleOMeter ()
@ -99,7 +110,7 @@ IdleOMeter::idle ()
_var_s += (t - _var_m) * (t - var_m1); _var_s += (t - _var_m) * (t - var_m1);
} }
if (now - _last_display < 80000 || _cnt < 2) { if (now - _last_display < 100000 || _cnt < 2) {
return true; return true;
} }
@ -118,7 +129,7 @@ IdleOMeter::idle ()
snprintf (buf, sizeof(buf), "%8.3f ms", avg / 1000.0); snprintf (buf, sizeof(buf), "%8.3f ms", avg / 1000.0);
_label_avg.set_text (buf); _label_avg.set_text (buf);
snprintf (buf, sizeof(buf), "%8.3f ms", stddev / 1000.0); snprintf (buf, sizeof(buf), "%8.3f ms", stddev / 1000.0);
_label_dev.set_text (buf); _label_acq.set_text (Timecode::timecode_format_sampletime (now - _start, 1000000, 100, false));
return true; return true;
} }
@ -128,6 +139,7 @@ IdleOMeter::reset ()
{ {
_last = _x_get_monotonic_usec (); _last = _x_get_monotonic_usec ();
_last_display = _last; _last_display = _last;
_start = _last;
_max = 0; _max = 0;
_min = INT64_MAX; _min = INT64_MAX;
_cnt = 0; _cnt = 0;

2
gtk2_ardour/idleometer.h
View File

@ -42,9 +42,11 @@ private:
Gtk::Label _label_max; Gtk::Label _label_max;
Gtk::Label _label_avg; Gtk::Label _label_avg;
Gtk::Label _label_dev; Gtk::Label _label_dev;
Gtk::Label _label_acq;
int64_t _last_display; int64_t _last_display;
int64_t _start;
int64_t _last; int64_t _last;
int64_t _min; int64_t _min;
int64_t _max; int64_t _max;