diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-01-16 20:01:59 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-06-29 14:18:13 -0400 |
| commit | eb791b7302123d4a0a30485bebbc54b673aa4f61 (patch) | |
| tree | 249b94d8105ddad83390157e763e13b10c17002b /gtk2_ardour/ardour_ui.h | |
| parent | 6c8e11d3f8d049c12255da95719610745fe38483 (diff) | |
start work on auto return target dropdown rather than button
Conflicts:
gtk2_ardour/ardour_ui.cc
Diffstat (limited to 'gtk2_ardour/ardour_ui.h')
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index b6ec8a8799..004104ea0d 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -70,6 +70,7 @@ #include "about.h" #include "ardour_button.h" #include "ardour_dialog.h" +#include "ardour_dropdown.h" #include "ardour_window.h" #include "editing.h" #include "engine_dialog.h" @@ -322,7 +323,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void toggle_punch_out (); void show_loop_punch_ruler_and_disallow_hide (); void reenable_hide_loop_punch_ruler_if_appropriate (); - void toggle_auto_return (); void toggle_click (); void toggle_audio_midi_setup (); void toggle_session_auto_loop (); @@ -453,7 +453,16 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr ShuttleControl* shuttle_box; - ArdourButton auto_return_button; + ArdourDropdown auto_return_dropdown; + Gtk::CheckMenuItem *auto_return_last_locate; + Gtk::CheckMenuItem *auto_return_range_selection; + Gtk::CheckMenuItem *auto_return_region_selection; + Gtk::CheckMenuItem *auto_return_loop; + Gtk::MenuItem *auto_return_toggle; + + void toggle_auto_return_state (ARDOUR::AutoReturnTarget); + void toggle_all_auto_return (); + ArdourButton follow_edits_button; ArdourButton auto_input_button; ArdourButton click_button; |