allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

x-run counter reset & typo

Browse Source
This commit is contained in:
Robin Gareus
2015-04-29 15:45:04 +02:00
parent c36504f2ec
commit fb3d1a6f24
3 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
gtk2_ardour/ardour_ui.cc
View File

@@ -1345,7 +1345,7 @@ ARDOUR_UI::update_format ()
}
void
ARDOUR_UI::update_cpu_load ()
ARDOUR_UI::update_xrun_count ()
{
char buf[64];
@@ -1364,10 +1364,11 @@ ARDOUR_UI::update_cpu_load ()
snprintf (buf, sizeof (buf), _("X: <span foreground=\"%s\">?</span>"), X_("yellow"));
}
xrun_label.set_markup (buf);
set_tip (xrun_label, _("Audio dropouts. Shift+click to reset"));
}
void
ARDOUR_UI::update_xrun_count ()
ARDOUR_UI::update_cpu_load ()
{
char buf[64];

2
gtk2_ardour/ardour_ui.h
View File

@@ -797,6 +797,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr
void resize_text_widgets ();
bool xrun_button_release (GdkEventButton* ev);
std::string _announce_string;
void check_announcements ();

17
gtk2_ardour/ardour_ui_ed.cc
View File

@@ -542,13 +542,14 @@ ARDOUR_UI::build_menu_bar ()
#endif
_status_bar_visibility.add (&disk_space_label, X_("Disk"), _("Disk Space"), disk_space);
_status_bar_visibility.add (&cpu_load_label, X_("DSP"), _("DSP"), true);
_status_bar_visibility.add (&xrun_label, X_("XRun"), _("X-run"), true);
_status_bar_visibility.add (&xrun_label, X_("XRun"), _("X-run"), false);
_status_bar_visibility.add (&buffer_load_label, X_("Buffers"), _("Buffers"), true);
_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);
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));
}
void
@@ -675,3 +676,17 @@ ARDOUR_UI::focus_on_clock ()
primary_clock->focus ();
}
}
bool
ARDOUR_UI::xrun_button_release (GdkEventButton* ev)
{
if (ev->button != 1 || !Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) {
return false;
}
if (_session) {
_session->reset_xrun_count ();
update_xrun_count ();
}
return true;
}