smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 07:14:56 +01:00
Code Issues Projects Releases Wiki Activity

Remove unused region_edit_menu & edit-point action

Browse source
This commit is contained in:
Robin Gareus 2019-03-07 16:04:05 +01:00
parent 99462a50e6
commit b410cd07ab
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
4 changed files with 0 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/actions.cc
View file

@ -65,7 +65,6 @@ RelatedActions ActionManager::range_sensitive_actions;
RelatedActions ActionManager::engine_sensitive_actions; RelatedActions ActionManager::engine_sensitive_actions;
RelatedActions ActionManager::engine_opposite_sensitive_actions; RelatedActions ActionManager::engine_opposite_sensitive_actions;
RelatedActions ActionManager::transport_sensitive_actions; RelatedActions ActionManager::transport_sensitive_actions;
RelatedActions ActionManager::edit_point_in_region_sensitive_actions;
RelatedActions ActionManager::rec_sensitive_actions; RelatedActions ActionManager::rec_sensitive_actions;
void void

1
gtk2_ardour/actions.h
View file

@ -53,7 +53,6 @@ namespace ActionManager {
extern std::vector<Glib::RefPtr<Gtk::Action> > transport_sensitive_actions; 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_sensitive_actions;
extern std::vector<Glib::RefPtr<Gtk::Action> > engine_opposite_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 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); extern void map_some_state (const char* group, const char* action, bool (ARDOUR::RCConfiguration::*get)() const);

21
gtk2_ardour/editor.cc
View file

@ -262,8 +262,6 @@ Editor::Editor ()
, clicked_control_point (0) , clicked_control_point (0)
, button_release_can_deselect (true) , button_release_can_deselect (true)
, _mouse_changed_selection (false) , _mouse_changed_selection (false)
, region_edit_menu_split_item (0)
, region_edit_menu_split_multichannel_item (0)
, track_region_edit_playlist_menu (0) , track_region_edit_playlist_menu (0)
, track_edit_playlist_submenu (0) , track_edit_playlist_submenu (0)
, track_selection_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 RegionViewNameHighlight:
case LeftFrameHandle: case LeftFrameHandle:
case RightFrameHandle: 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; break;
case SelectionItem: 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 /* we've just cleared the track region context menu, so the menu that these
two items were on will have disappeared; stop them dangling. 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); RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*> (clicked_axisview);
if (rtv) { if (rtv) {

3
gtk2_ardour/editor.h
View file

@ -768,12 +768,9 @@ private:
Gtk::Menu track_region_context_menu; Gtk::Menu track_region_context_menu;
Gtk::Menu track_selection_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_region_edit_playlist_menu;
Gtk::Menu * track_edit_playlist_submenu; Gtk::Menu * track_edit_playlist_submenu;
Gtk::Menu * track_selection_edit_playlist_submenu; Gtk::Menu * track_selection_edit_playlist_submenu;
GdkEvent context_click_event; GdkEvent context_click_event;
void popup_track_context_menu (int, int, ItemType, bool); void popup_track_context_menu (int, int, ItemType, bool);