From 77e67809f9195b2ba49fc33da59677f87ce0a75d Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Fri, 4 Jun 2021 08:03:21 -0600 Subject: [PATCH] we removed Splice mode from the GUI 7 years ago; now remove all code related to Splice mode (GUI edition) --- gtk2_ardour/editor.cc | 2 -- gtk2_ardour/editor.h | 1 - gtk2_ardour/editor_actions.cc | 1 - gtk2_ardour/editor_drag.h | 11 ----------- gtk2_ardour/editor_mouse.cc | 33 +++++++++++++++++++++------------ 5 files changed, 21 insertions(+), 27 deletions(-) diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 6252028703..4c7edfeb24 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -210,7 +210,6 @@ static const gchar *_edit_point_strings[] = { static const gchar *_edit_mode_strings[] = { N_("Slide"), - N_("Splice"), N_("Ripple"), N_("Ripple All"), N_("Lock"), @@ -3691,7 +3690,6 @@ Editor::cycle_edit_mode () case Slide: Config->set_edit_mode (Ripple); break; - case Splice: case Ripple: Config->set_edit_mode (RippleAll); break; diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 5b1c032347..f5effa70ec 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -2395,7 +2395,6 @@ private: friend class RegionCutDrag; friend class RegionDrag; friend class RegionMoveDrag; - friend class RegionSpliceDrag; friend class RegionRippleDrag; friend class TrimDrag; friend class BBTRulerDrag; diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index b7a228bc16..7d79534f40 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -580,7 +580,6 @@ Editor::register_actions () ActionManager::register_action (editor_actions, "cycle-edit-point", _("Change Edit Point"), sigc::bind (sigc::mem_fun (*this, &Editor::cycle_edit_point), false)); ActionManager::register_action (editor_actions, "cycle-edit-point-with-marker", _("Change Edit Point Including Marker"), sigc::bind (sigc::mem_fun (*this, &Editor::cycle_edit_point), true)); -// ActionManager::register_action (editor_actions, "set-edit-splice", _("Splice"), sigc::bind (sigc::mem_fun (*this, &Editor::set_edit_mode), Splice)); ActionManager::register_action (editor_actions, "set-edit-ripple", _("Ripple"), bind (mem_fun (*this, &Editor::set_edit_mode), Ripple)); ActionManager::register_action (editor_actions, "set-edit-ripple-all", _("Ripple All"), bind (mem_fun (*this, &Editor::set_edit_mode), RippleAll)); ActionManager::register_action (editor_actions, "set-edit-slide", _("Slide"), sigc::bind (sigc::mem_fun (*this, &Editor::set_edit_mode), Slide)); diff --git a/gtk2_ardour/editor_drag.h b/gtk2_ardour/editor_drag.h index 663ad76df6..5439823408 100644 --- a/gtk2_ardour/editor_drag.h +++ b/gtk2_ardour/editor_drag.h @@ -522,17 +522,6 @@ public: } }; -/** Region drag in splice mode */ -class RegionSpliceDrag : public RegionMoveDrag -{ -public: - RegionSpliceDrag (Editor *, ArdourCanvas::Item *, RegionView *, std::list const &); - - void motion (GdkEvent *, bool); - void finished (GdkEvent *, bool); - void aborted (bool); -}; - /** Region drag in ripple mode */ class RegionRippleDrag : public RegionMoveDrag diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index a964d2bcec..e5bcb2578a 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -2579,16 +2579,15 @@ Editor::add_region_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* region } switch (Config->get_edit_mode()) { - case Splice: - _drags->add (new RegionSpliceDrag (this, item, region_view, selection->regions.by_layer())); - break; - case Ripple: - case RippleAll: - _drags->add (new RegionRippleDrag (this, item, region_view, selection->regions.by_layer())); - break; - default: - _drags->add (new RegionMoveDrag (this, item, region_view, selection->regions.by_layer(), false)); - break; + case Lock: + return; + case Ripple: + case RippleAll: + _drags->add (new RegionRippleDrag (this, item, region_view, selection->regions.by_layer())); + break; + default: + _drags->add (new RegionMoveDrag (this, item, region_view, selection->regions.by_layer(), false)); + break; } } @@ -2602,7 +2601,17 @@ Editor::add_region_copy_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* r return; } - _drags->add (new RegionMoveDrag (this, item, region_view, selection->regions.by_layer(), true)); + switch (Config->get_edit_mode()) { + case Lock: + return; + case Ripple: + case RippleAll: + _drags->add (new RegionRippleDrag (this, item, region_view, selection->regions.by_layer())); + break; + default: + _drags->add (new RegionMoveDrag (this, item, region_view, selection->regions.by_layer(), false, true)); + break; + } } void @@ -2614,7 +2623,7 @@ Editor::add_region_brush_drag (ArdourCanvas::Item* item, GdkEvent*, RegionView* return; } - if (Config->get_edit_mode() == Splice || should_ripple()) { + if (should_ripple()) { return; }