diff options
author | Robin Gareus <robin@gareus.org> | 2019-03-07 16:04:05 +0100 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2019-03-07 22:25:19 +0100 |
commit | b410cd07ab996eb7264cf218c22a81662fd885d0 (patch) | |
tree | f8fd46b261e4ed307f6c9dfd080e8eec96cbf76a | |
parent | 99462a50e6aa54e6e2859c1b16bb44705c358ade (diff) |
Remove unused region_edit_menu & edit-point action
-rw-r--r-- | gtk2_ardour/actions.cc | 1 | ||||
-rw-r--r-- | gtk2_ardour/actions.h | 1 | ||||
-rw-r--r-- | gtk2_ardour/editor.cc | 21 | ||||
-rw-r--r-- | gtk2_ardour/editor.h | 3 |
4 files changed, 0 insertions, 26 deletions
diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc index ea39f4af8a..dea2c1c213 100644 --- a/gtk2_ardour/actions.cc +++ b/gtk2_ardour/actions.cc @@ -65,7 +65,6 @@ RelatedActions ActionManager::range_sensitive_actions; RelatedActions ActionManager::engine_sensitive_actions; RelatedActions ActionManager::engine_opposite_sensitive_actions; RelatedActions ActionManager::transport_sensitive_actions; -RelatedActions ActionManager::edit_point_in_region_sensitive_actions; RelatedActions ActionManager::rec_sensitive_actions; void diff --git a/gtk2_ardour/actions.h b/gtk2_ardour/actions.h index 2e6e8a30c6..a349f51abe 100644 --- a/gtk2_ardour/actions.h +++ b/gtk2_ardour/actions.h @@ -53,7 +53,6 @@ namespace ActionManager { extern std::vector<Glib::RefPtr<Gtk::Action> > transport_sensitive_actions; extern std::vector<Glib::RefPtr<Gtk::Action> > engine_sensitive_actions; extern std::vector<Glib::RefPtr<Gtk::Action> > engine_opposite_sensitive_actions; - extern std::vector<Glib::RefPtr<Gtk::Action> > edit_point_in_region_sensitive_actions; extern std::vector<Glib::RefPtr<Gtk::Action> > rec_sensitive_actions; extern void map_some_state (const char* group, const char* action, bool (ARDOUR::RCConfiguration::*get)() const); diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index e28a5f826a..4f0d594ea2 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -262,8 +262,6 @@ Editor::Editor () , clicked_control_point (0) , button_release_can_deselect (true) , _mouse_changed_selection (false) - , region_edit_menu_split_item (0) - , region_edit_menu_split_multichannel_item (0) , track_region_edit_playlist_menu (0) , track_edit_playlist_submenu (0) , track_selection_edit_playlist_submenu (0) @@ -1605,22 +1603,6 @@ Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type, case RegionViewNameHighlight: case LeftFrameHandle: case RightFrameHandle: - if (!with_selection) { - if (region_edit_menu_split_item) { - if (clicked_regionview && clicked_regionview->region()->covers (get_preferred_edit_position())) { - ActionManager::set_sensitive (ActionManager::edit_point_in_region_sensitive_actions, true); - } else { - ActionManager::set_sensitive (ActionManager::edit_point_in_region_sensitive_actions, false); - } - } - if (region_edit_menu_split_multichannel_item) { - if (clicked_regionview && clicked_regionview->region()->n_channels() > 1) { - region_edit_menu_split_multichannel_item->set_sensitive (true); - } else { - region_edit_menu_split_multichannel_item->set_sensitive (false); - } - } - } break; case SelectionItem: @@ -1707,9 +1689,6 @@ Editor::build_track_region_context_menu () /* we've just cleared the track region context menu, so the menu that these two items were on will have disappeared; stop them dangling. */ - region_edit_menu_split_item = 0; - region_edit_menu_split_multichannel_item = 0; - RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (clicked_axisview); if (rtv) { diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 55d05ca52f..9aba2dfed8 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -768,12 +768,9 @@ private: Gtk::Menu track_region_context_menu; Gtk::Menu track_selection_context_menu; - Gtk::MenuItem* region_edit_menu_split_item; - Gtk::MenuItem* region_edit_menu_split_multichannel_item; Gtk::Menu * track_region_edit_playlist_menu; Gtk::Menu * track_edit_playlist_submenu; Gtk::Menu * track_selection_edit_playlist_submenu; - GdkEvent context_click_event; void popup_track_context_menu (int, int, ItemType, bool); |