diff options
| author | Ben Loftis <ben@glw.com> | 2012-11-20 19:43:43 +0000 |
|---|---|---|
| committer | Ben Loftis <ben@glw.com> | 2012-11-20 19:43:43 +0000 |
| commit | beb3ec2d7a440308bce6e2db793d78f528c9fa85 (patch) | |
| tree | e673c98d6d5011f78eebd2e4b18975e95773ec6c /gtk2_ardour/ardour_ui.h | |
| parent | 38c10a4d2367111f3b9c7ac2223a8b633bfeb147 (diff) | |
Always Play Range is now Follow Edits, and is based on Mixbus implementation. Added menu item. Follow Edits button replaces Auto Play; removed the connector between play and play-range. Some Smart Mode changes came along for the ride but will be cleaned up shortly
git-svn-id: svn://localhost/ardour2/branches/3.0@13537 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui.h')
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 1c95232479..0af4cd6d2a 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -140,6 +140,8 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr ARDOUR::Session* the_session() { return _session; } + bool get_smart_mode () const; + int get_session_parameters (bool quit_on_cancel, bool should_be_new = false, std::string load_template = ""); int build_session_from_nsd (const std::string& session_name, const std::string& session_path); bool ask_about_loading_existing_session (const std::string& session_path); @@ -418,8 +420,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr ArdourButton play_selection_button; ArdourButton rec_button; - ButtonJoiner* transport_joiner; - void toggle_external_sync (); void toggle_time_master (); void toggle_video_sync (); @@ -427,7 +427,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr ShuttleControl* shuttle_box; ArdourButton auto_return_button; - ArdourButton auto_play_button; + ArdourButton follow_edits_button; ArdourButton auto_input_button; ArdourButton click_button; ArdourButton sync_button; @@ -446,7 +446,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void soloing_changed (bool); void auditioning_changed (bool); void _auditioning_changed (bool); - + bool solo_alert_press (GdkEventButton* ev); bool audition_alert_press (GdkEventButton* ev); bool feedback_alert_press (GdkEventButton *); @@ -546,6 +546,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr void transport_record (bool roll); void transport_roll (); void transport_play_selection(); + void transport_play_preroll(); void transport_forward (int option); void transport_rewind (int option); void transport_loop (); |