diff options
| author | David Robillard <d@drobilla.net> | 2014-12-08 23:00:00 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2014-12-18 20:21:01 -0500 |
| commit | 5fef65538040fbac1b9edd1847a269aa925a49c9 (patch) | |
| tree | 398d11d0f563c74ba15fbee3463378b4456d1d94 /gtk2_ardour/editor.h | |
| parent | 1b89055526df4d995530c0f3debebc480c33fc41 (diff) | |
Remove internal edit mode and add "content" tool.
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 fa86833dc6..168f3dcc90 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -178,9 +178,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD Editing::MidiEditMode current_midi_edit_mode () const; void remove_midi_note (ArdourCanvas::Item *, GdkEvent *); - bool internal_editing() const { return _internal_editing ; } - void set_internal_edit (bool yn); - bool toggle_internal_editing_from_double_click (GdkEvent*); + bool internal_editing() const; void foreach_time_axis_view (sigc::slot<void,TimeAxisView&>); void add_to_idle_resize (TimeAxisView*, int32_t); @@ -546,12 +544,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void set_samples_per_pixel (framecnt_t); Editing::MouseMode mouse_mode; - Editing::MouseMode pre_internal_mouse_mode; - Editing::SnapType pre_internal_snap_type; - Editing::SnapMode pre_internal_snap_mode; - Editing::SnapType internal_snap_type; - Editing::SnapMode internal_snap_mode; - bool _internal_editing; Editing::MouseMode effective_mouse_mode () const; enum JoinObjectRangeState { @@ -1641,6 +1633,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD ArdourButton mouse_draw_button; ArdourButton mouse_move_button; ArdourButton mouse_timefx_button; + ArdourButton mouse_content_button; ArdourButton mouse_audition_button; ArdourButton mouse_cut_button; @@ -1651,9 +1644,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD void mouse_mode_object_range_toggled (); bool ignore_mouse_mode_toggle; - ArdourButton internal_edit_button; - void toggle_internal_editing (); - bool mouse_select_button_release (GdkEventButton*); Gtk::VBox automation_box; |