diff options
| author | Ben Loftis <ben@glw.com> | 2012-11-26 22:43:10 +0000 |
|---|---|---|
| committer | Ben Loftis <ben@glw.com> | 2012-11-26 22:43:10 +0000 |
| commit | e63da83c530f8c2f81bfba4ec6d77c7adad8a50d (patch) | |
| tree | 407fdce24fe888539f9a2f767f973720b1394a28 /gtk2_ardour/editor.h | |
| parent | f9d1faa63490d77f4a1e9493fcac5b3166c1b1d8 (diff) | |
tweak Smart Mode to be more like Mixbus. Smart mode is just a modifier on Object mode which provides Range selection in the top half of the waveform. probably lots of corner cases to clear up before its all over, but at least we can use Mixbus as a consistent target rather than making it all up again.
git-svn-id: svn://localhost/ardour2/branches/3.0@13551 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor.h')
| -rw-r--r-- | gtk2_ardour/editor.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index ca4a3ec87a..113ddcf377 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1586,11 +1586,11 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD ArdourButton mouse_timefx_button; ArdourButton mouse_audition_button; - ButtonJoiner* smart_mode_joiner; + ArdourButton smart_mode_button; Glib::RefPtr<Gtk::ToggleAction> smart_mode_action; void mouse_mode_toggled (Editing::MouseMode m); - void mouse_mode_object_range_toggled () {} + void mouse_mode_object_range_toggled (); bool ignore_mouse_mode_toggle; ArdourButton internal_edit_button; @@ -2100,16 +2100,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD int time_fx (ARDOUR::RegionList&, float val, bool pitching); - bool doing_range_stuff() const { - return (mouse_mode == Editing::MouseRange && (_join_object_range_state == JOIN_OBJECT_RANGE_NONE)) || - _join_object_range_state == JOIN_OBJECT_RANGE_RANGE; - } - - bool doing_object_stuff() const { - return (mouse_mode == Editing::MouseObject && (_join_object_range_state == JOIN_OBJECT_RANGE_NONE)) || - _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT; - } - void toggle_sound_midi_notes (); /** Flag for a bit of a hack wrt control point selection; see set_selected_control_point_from_click */ |