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

Restore context menu to session markers. Fixes #3655.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8427 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-01-04 01:40:47 +00:00
parent fde56cc730
commit 5af8917460
3 changed files with 35 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/editor.cc
View file

@ -339,7 +339,6 @@ Editor::Editor ()
editor_ruler_menu = 0; editor_ruler_menu = 0;
no_ruler_shown_update = false; no_ruler_shown_update = false;
marker_menu = 0; marker_menu = 0;
session_range_marker_menu = 0;
range_marker_menu = 0; range_marker_menu = 0;
marker_menu_item = 0; marker_menu_item = 0;
tempo_or_meter_marker_menu = 0; tempo_or_meter_marker_menu = 0;

5
gtk2_ardour/editor.h
View file

@ -1473,15 +1473,14 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
void tempo_or_meter_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*); void tempo_or_meter_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*);
void transport_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*); void transport_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*);
void new_transport_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*); void new_transport_marker_context_menu (GdkEventButton*, ArdourCanvas::Item*);
void build_range_marker_menu (bool loop_or_punch); void build_range_marker_menu (bool);
void build_marker_menu (bool, ARDOUR::Location *); void build_marker_menu (ARDOUR::Location *);
void build_tempo_or_meter_marker_menu (bool); void build_tempo_or_meter_marker_menu (bool);
void build_new_transport_marker_menu (); void build_new_transport_marker_menu ();
void dynamic_cast_marker_object (void*, MeterMarker**, TempoMarker**) const; void dynamic_cast_marker_object (void*, MeterMarker**, TempoMarker**) const;
Gtk::Menu* tempo_or_meter_marker_menu; Gtk::Menu* tempo_or_meter_marker_menu;
Gtk::Menu* marker_menu; Gtk::Menu* marker_menu;
Gtk::Menu* session_range_marker_menu;
Gtk::Menu* range_marker_menu; Gtk::Menu* range_marker_menu;
Gtk::Menu* transport_marker_menu; Gtk::Menu* transport_marker_menu;
Gtk::Menu* new_transport_marker_menu; Gtk::Menu* new_transport_marker_menu;

80
gtk2_ardour/editor_markers.cc
View file

@ -756,52 +756,44 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
bool is_start; bool is_start;
Location * loc = find_location_from_marker (marker, is_start); Location * loc = find_location_from_marker (marker, is_start);
if (loc == transport_loop_location() || loc == transport_punch_location()) {
if (loc == transport_loop_location() || loc == transport_punch_location() || loc->is_session_range ()) {
if (transport_marker_menu == 0) { if (transport_marker_menu == 0) {
build_range_marker_menu (true); build_range_marker_menu (true);
} }
marker_menu_item = item; marker_menu_item = item;
transport_marker_menu->popup (1, ev->time); transport_marker_menu->popup (1, ev->time);
} else {
if (loc->is_mark()) { } else if (loc->is_mark()) {
Menu *markerMenu;
if (loc->is_session_range ()) {
delete session_range_marker_menu;
build_marker_menu (true, loc);
markerMenu = session_range_marker_menu;
} else {
delete marker_menu;
build_marker_menu (false, loc);
markerMenu = marker_menu;
}
delete marker_menu;
build_marker_menu (loc);
// GTK2FIX use action group sensitivity // GTK2FIX use action group sensitivity
#ifdef GTK2FIX #ifdef GTK2FIX
if (children.size() >= 3) { if (children.size() >= 3) {
MenuItem * loopitem = &children[2]; MenuItem * loopitem = &children[2];
if (loopitem) { if (loopitem) {
if (loc->is_mark()) { if (loc->is_mark()) {
loopitem->set_sensitive(false); loopitem->set_sensitive(false);
} }
else { else {
loopitem->set_sensitive(true); loopitem->set_sensitive(true);
}
} }
} }
}
#endif #endif
marker_menu_item = item; marker_menu_item = item;
markerMenu->popup (1, ev->time); marker_menu->popup (1, ev->time);
}
if (loc->is_range_marker()) { } else if (loc->is_range_marker()) {
if (range_marker_menu == 0){ if (range_marker_menu == 0) {
build_range_marker_menu (false); build_range_marker_menu (false);
} }
marker_menu_item = item; marker_menu_item = item;
range_marker_menu->popup (1, ev->time); range_marker_menu->popup (1, ev->time);
}
} }
} }
@ -827,18 +819,13 @@ Editor::transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item*)
} }
void void
Editor::build_marker_menu (bool session_range, Location* loc) Editor::build_marker_menu (Location* loc)
{ {
using namespace Menu_Helpers; using namespace Menu_Helpers;
Menu *markerMenu = new Menu; marker_menu = new Menu;
if (session_range) { MenuList& items = marker_menu->items();
session_range_marker_menu = markerMenu; marker_menu->set_name ("ArdourContextMenu");
} else {
marker_menu = markerMenu;
}
MenuList& items = markerMenu->items();
markerMenu->set_name ("ArdourContextMenu");
items.push_back (MenuElem (_("Locate to Here"), sigc::mem_fun(*this, &Editor::marker_menu_set_playhead))); items.push_back (MenuElem (_("Locate to Here"), sigc::mem_fun(*this, &Editor::marker_menu_set_playhead)));
items.push_back (MenuElem (_("Play from Here"), sigc::mem_fun(*this, &Editor::marker_menu_play_from))); items.push_back (MenuElem (_("Play from Here"), sigc::mem_fun(*this, &Editor::marker_menu_play_from)));
@ -849,9 +836,6 @@ Editor::build_marker_menu (bool session_range, Location* loc)
items.push_back (MenuElem (_("Create Range to Next Marker"), sigc::mem_fun(*this, &Editor::marker_menu_range_to_next))); items.push_back (MenuElem (_("Create Range to Next Marker"), sigc::mem_fun(*this, &Editor::marker_menu_range_to_next)));
items.push_back (MenuElem (_("Hide"), sigc::mem_fun(*this, &Editor::marker_menu_hide))); items.push_back (MenuElem (_("Hide"), sigc::mem_fun(*this, &Editor::marker_menu_hide)));
if (session_range) {
return;
}
items.push_back (MenuElem (_("Rename"), sigc::mem_fun(*this, &Editor::marker_menu_rename))); items.push_back (MenuElem (_("Rename"), sigc::mem_fun(*this, &Editor::marker_menu_rename)));
items.push_back (CheckMenuElem (_("Lock"))); items.push_back (CheckMenuElem (_("Lock")));
@ -874,12 +858,12 @@ Editor::build_marker_menu (bool session_range, Location* loc)
} }
void void
Editor::build_range_marker_menu (bool loop_or_punch) Editor::build_range_marker_menu (bool loop_or_punch_or_session)
{ {
using namespace Menu_Helpers; using namespace Menu_Helpers;
Menu *markerMenu = new Menu; Menu *markerMenu = new Menu;
if (loop_or_punch) { if (loop_or_punch_or_session) {
transport_marker_menu = markerMenu; transport_marker_menu = markerMenu;
} else { } else {
range_marker_menu = markerMenu; range_marker_menu = markerMenu;
@ -890,7 +874,7 @@ Editor::build_range_marker_menu (bool loop_or_punch)
items.push_back (MenuElem (_("Play Range"), sigc::mem_fun(*this, &Editor::marker_menu_play_range))); items.push_back (MenuElem (_("Play Range"), sigc::mem_fun(*this, &Editor::marker_menu_play_range)));
items.push_back (MenuElem (_("Locate to Range Mark"), sigc::mem_fun(*this, &Editor::marker_menu_set_playhead))); items.push_back (MenuElem (_("Locate to Range Mark"), sigc::mem_fun(*this, &Editor::marker_menu_set_playhead)));
items.push_back (MenuElem (_("Play from Range Mark"), sigc::mem_fun(*this, &Editor::marker_menu_play_from))); items.push_back (MenuElem (_("Play from Range Mark"), sigc::mem_fun(*this, &Editor::marker_menu_play_from)));
if (! loop_or_punch) { if (!loop_or_punch_or_session) {
items.push_back (MenuElem (_("Loop Range"), sigc::mem_fun(*this, &Editor::marker_menu_loop_range))); items.push_back (MenuElem (_("Loop Range"), sigc::mem_fun(*this, &Editor::marker_menu_loop_range)));
} }
items.push_back (MenuElem (_("Set Range Mark from Playhead"), sigc::mem_fun(*this, &Editor::marker_menu_set_from_playhead))); items.push_back (MenuElem (_("Set Range Mark from Playhead"), sigc::mem_fun(*this, &Editor::marker_menu_set_from_playhead)));
@ -902,7 +886,7 @@ Editor::build_range_marker_menu (bool loop_or_punch)
items.push_back (MenuElem (_("Export Range"), sigc::mem_fun(*this, &Editor::export_range))); items.push_back (MenuElem (_("Export Range"), sigc::mem_fun(*this, &Editor::export_range)));
items.push_back (SeparatorElem()); items.push_back (SeparatorElem());
if (!loop_or_punch) { if (!loop_or_punch_or_session) {
items.push_back (MenuElem (_("Hide Range"), sigc::mem_fun(*this, &Editor::marker_menu_hide))); items.push_back (MenuElem (_("Hide Range"), sigc::mem_fun(*this, &Editor::marker_menu_hide)));
items.push_back (MenuElem (_("Rename Range"), sigc::mem_fun(*this, &Editor::marker_menu_rename))); items.push_back (MenuElem (_("Rename Range"), sigc::mem_fun(*this, &Editor::marker_menu_rename)));
items.push_back (MenuElem (_("Remove Range"), sigc::mem_fun(*this, &Editor::marker_menu_remove))); items.push_back (MenuElem (_("Remove Range"), sigc::mem_fun(*this, &Editor::marker_menu_remove)));