ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

we removed Splice mode from the GUI 7 years ago; now remove all code related to Splice mode (GUI edition)

This commit is contained in:
Paul Davis 2021-06-04 08:03:21 -06:00
parent 43c713d0ef
commit 77e67809f9
5 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/editor.cc
View File

@ -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;

1
gtk2_ardour/editor.h
View File

@ -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;

1
gtk2_ardour/editor_actions.cc
View File

@ -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));

11
gtk2_ardour/editor_drag.h
View File

@ -522,17 +522,6 @@ public:
}
};
/** Region drag in splice mode */
class RegionSpliceDrag : public RegionMoveDrag
{
public:
RegionSpliceDrag (Editor *, ArdourCanvas::Item *, RegionView *, std::list<RegionView*> const &);
void motion (GdkEvent *, bool);
void finished (GdkEvent *, bool);
void aborted (bool);
};
/** Region drag in ripple mode */
class RegionRippleDrag : public RegionMoveDrag

33
gtk2_ardour/editor_mouse.cc
View File

@ -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;
}