diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-24 12:18:06 -0400 |
| commit | ee1b49f87e4b8e6406c059f29371892872d3fb85 (patch) | |
| tree | 107f163d9f707c97a0b8179a5f2afd9995d616ec /gtk2_ardour/ardour_ui.h | |
| parent | 8cd71108c1d153f84f25c3b9e5153a110826c130 (diff) | |
| parent | 1421a34e52862b614f280c751a12893e4abecf88 (diff) | |
fix merge conflicts from master
Diffstat (limited to 'gtk2_ardour/ardour_ui.h')
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index e2eae36977..15413b5ac9 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -451,6 +451,9 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr Gtk::VBox alert_box; Gtk::VBox meter_box; LevelMeterHBox * editor_meter; + float editor_meter_max_peak; + ArdourButton editor_meter_peak_display; + bool editor_meter_peak_button_release (GdkEventButton*); void solo_blink (bool); void sync_blink (bool); |