diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 505a191323..82bb84097d 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -1478,10 +1478,10 @@ Editor::popup_fade_context_menu (int button, int32_t time, ArdourCanvas::Item* i } void -Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type, bool with_selection, framepos_t frame) +Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type, bool with_selection) { using namespace Menu_Helpers; - Menu* (Editor::*build_menu_function)(framepos_t); + Menu* (Editor::*build_menu_function)(); Menu *menu; switch (item_type) { @@ -1522,7 +1522,7 @@ Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type, return; } - menu = (this->*build_menu_function)(frame); + menu = (this->*build_menu_function)(); menu->set_name ("ArdourContextMenu"); /* now handle specific situations */ @@ -1605,7 +1605,7 @@ Editor::popup_track_context_menu (int button, int32_t time, ItemType item_type, } Menu* -Editor::build_track_context_menu (framepos_t) +Editor::build_track_context_menu () { using namespace Menu_Helpers; @@ -1617,7 +1617,7 @@ Editor::build_track_context_menu (framepos_t) } Menu* -Editor::build_track_bus_context_menu (framepos_t) +Editor::build_track_bus_context_menu () { using namespace Menu_Helpers; @@ -1629,7 +1629,7 @@ Editor::build_track_bus_context_menu (framepos_t) } Menu* -Editor::build_track_region_context_menu (framepos_t frame) +Editor::build_track_region_context_menu () { using namespace Menu_Helpers; MenuList& edit_items = track_region_context_menu.items(); @@ -1651,7 +1651,7 @@ Editor::build_track_region_context_menu (framepos_t frame) mode and so offering region context is somewhat confusing. */ if ((tr = rtv->track()) && ((pl = tr->playlist())) && !internal_editing()) { - framepos_t framepos = (framepos_t) floor ((double)frame * tr->speed()); + framepos_t const framepos = (framepos_t) floor ((double) get_preferred_edit_position() * tr->speed()); uint32_t regions_at = pl->count_regions_at (framepos); add_region_context_items (edit_items, regions_at > 1); } @@ -1663,7 +1663,7 @@ Editor::build_track_region_context_menu (framepos_t frame) } Menu* -Editor::build_track_crossfade_context_menu (framepos_t frame) +Editor::build_track_crossfade_context_menu () { using namespace Menu_Helpers; MenuList& edit_items = track_crossfade_context_menu.items(); @@ -1680,7 +1680,7 @@ Editor::build_track_crossfade_context_menu (framepos_t frame) AudioPlaylist::Crossfades xfades; - apl->crossfades_at (frame, xfades); + apl->crossfades_at (get_preferred_edit_position (), xfades); bool many = xfades.size() > 1; @@ -1688,7 +1688,7 @@ Editor::build_track_crossfade_context_menu (framepos_t frame) add_crossfade_context_items (atv->audio_view(), (*i), edit_items, many); } - framepos_t framepos = (framepos_t) floor ((double)frame * tr->speed()); + framepos_t framepos = (framepos_t) floor ((double) get_preferred_edit_position() * tr->speed()); uint32_t regions_at = pl->count_regions_at (framepos); add_region_context_items (edit_items, regions_at > 1); } @@ -1736,7 +1736,7 @@ Editor::analyze_range_selection() } Menu* -Editor::build_track_selection_context_menu (framepos_t) +Editor::build_track_selection_context_menu () { using namespace Menu_Helpers; MenuList& edit_items = track_selection_context_menu.items(); diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 80b65248d6..6bf362739f 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -691,12 +691,12 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD Gtk::Menu * track_edit_playlist_submenu; Gtk::Menu * track_selection_edit_playlist_submenu; - void popup_track_context_menu (int, int, ItemType, bool, framepos_t); - Gtk::Menu* build_track_context_menu (framepos_t); - Gtk::Menu* build_track_bus_context_menu (framepos_t); - Gtk::Menu* build_track_region_context_menu (framepos_t frame); - Gtk::Menu* build_track_crossfade_context_menu (framepos_t); - Gtk::Menu* build_track_selection_context_menu (framepos_t); + void popup_track_context_menu (int, int, ItemType, bool); + Gtk::Menu* build_track_context_menu (); + Gtk::Menu* build_track_bus_context_menu (); + Gtk::Menu* build_track_region_context_menu (); + Gtk::Menu* build_track_crossfade_context_menu (); + Gtk::Menu* build_track_selection_context_menu (); void add_dstream_context_items (Gtk::Menu_Helpers::MenuList&); void add_bus_context_items (Gtk::Menu_Helpers::MenuList&); void add_region_context_items (Gtk::Menu_Helpers::MenuList&, bool); diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 8e5db51948..98aa429f5b 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -1249,7 +1249,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT break; case StreamItem: - popup_track_context_menu (1, event->button.time, item_type, false, where); + popup_track_context_menu (1, event->button.time, item_type, false); break; case RegionItem: @@ -1257,15 +1257,15 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT case LeftFrameHandle: case RightFrameHandle: case RegionViewName: - popup_track_context_menu (1, event->button.time, item_type, false, where); + popup_track_context_menu (1, event->button.time, item_type, false); break; case SelectionItem: - popup_track_context_menu (1, event->button.time, item_type, true, where); + popup_track_context_menu (1, event->button.time, item_type, true); break; case AutomationTrackItem: - popup_track_context_menu (1, event->button.time, item_type, false, where); + popup_track_context_menu (1, event->button.time, item_type, false); break; case MarkerBarItem: @@ -1290,7 +1290,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT break; case CrossfadeViewItem: - popup_track_context_menu (1, event->button.time, item_type, false, where); + popup_track_context_menu (1, event->button.time, item_type, false); break; #ifdef WITH_CMT