diff options
author | Carl Hetherington <carl@carlh.net> | 2009-08-20 20:34:12 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2009-08-20 20:34:12 +0000 |
commit | c00243d1032f690a3392954853a8275ef267b422 (patch) | |
tree | 9820f971c113d68e964bb676aff5520a49771980 | |
parent | 76594112af08724c8af6d01d9fcbdbd6478c869c (diff) |
Remove an unused action and some duplicated code.
git-svn-id: svn://localhost/ardour2/branches/3.0@5558 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r-- | gtk2_ardour/editor.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/editor.h | 1 | ||||
-rw-r--r-- | gtk2_ardour/editor_actions.cc | 3 | ||||
-rw-r--r-- | gtk2_ardour/editor_ops.cc | 9 |
4 files changed, 1 insertions, 14 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index c9c309c6c5..7080798118 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -1871,7 +1871,7 @@ Editor::add_region_context_items (StreamView* sv, boost::shared_ptr<Region> regi items.push_back (MenuElem (_("Trim"), *trim_menu)); items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Split"), (mem_fun(*this, &Editor::split_region)))); + items.push_back (MenuElem (_("Split"), (mem_fun(*this, &Editor::split)))); region_edit_menu_split_item = &items.back(); if (_edit_point == EditAtMouse) { diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index ab71c9453d..08a4c2996e 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1044,7 +1044,6 @@ class Editor : public PublicEditor void raise_region_to_top (); void lower_region (); void lower_region_to_bottom (); - void split_region (); void split_regions_at (nframes64_t, RegionSelection&); void split_region_at_transients (); void split_region_at_points (boost::shared_ptr<ARDOUR::Region>, ARDOUR::AnalysisFeatureList&, bool can_ferret); diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 9dbdfcc944..634ddcd66a 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -582,9 +582,6 @@ Editor::register_actions () act = ActionManager::register_action (editor_actions, "insert-chunk", _("Insert Chunk"), bind (mem_fun(*this, &Editor::paste_named_selection), 1.0f)); ActionManager::session_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "split-at-edit-cursor", _("Split At Edit Point"), mem_fun(*this, &Editor::split_region)); - ActionManager::edit_point_in_region_sensitive_actions.push_back (act); - act = ActionManager::register_action (editor_actions, "start-range", _("Start Range"), mem_fun(*this, &Editor::keyboard_selection_begin)); ActionManager::session_sensitive_actions.push_back (act); act = ActionManager::register_action (editor_actions, "finish-range", _("Finish Range"), bind (mem_fun(*this, &Editor::keyboard_selection_finish), false)); diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index e7badf1c42..b9a1ffdd7e 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -111,15 +111,6 @@ Editor::redo (uint32_t n) } void -Editor::split_region () -{ - RegionSelection rs; - - get_regions_for_action (rs, true); - split_regions_at (get_preferred_edit_position (), selection->regions); -} - -void Editor::split_regions_at (nframes64_t where, RegionSelection& regions) { list <boost::shared_ptr<Playlist > > used_playlists; |