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

Use a ticked Lock item for markers rather than Lock / Unlock. Fixes #2136.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7561 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-08-07 23:31:07 +00:00
parent 8367132a85
commit e8dc5539a0
2 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gtk2_ardour/editor.h
View file

@ -1464,7 +1464,7 @@ public:
void marker_menu_edit (); void marker_menu_edit ();
void marker_menu_remove (); void marker_menu_remove ();
void marker_menu_rename (); void marker_menu_rename ();
void marker_menu_lock (bool yn); void toggle_marker_menu_lock ();
void marker_menu_hide (); void marker_menu_hide ();
void marker_menu_loop_range (); void marker_menu_loop_range ();
void marker_menu_select_all_selectables_using_range (); void marker_menu_select_all_selectables_using_range ();
@ -1486,7 +1486,7 @@ public:
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 loop_or_punch);
void build_marker_menu (bool); void build_marker_menu (bool, 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;

33
gtk2_ardour/editor_markers.cc
View file

@ -535,13 +535,12 @@ Editor::marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item* item)
if (loc->is_mark()) { if (loc->is_mark()) {
Menu *markerMenu; Menu *markerMenu;
if (loc->is_session_range ()) { if (loc->is_session_range ()) {
if (session_range_marker_menu == 0) { delete session_range_marker_menu;
build_marker_menu (true); build_marker_menu (true, loc);
}
markerMenu = session_range_marker_menu; markerMenu = session_range_marker_menu;
} else { } else {
if (marker_menu == 0) delete marker_menu;
build_marker_menu (false); build_marker_menu (false, loc);
markerMenu = marker_menu; markerMenu = marker_menu;
} }
@ -596,7 +595,7 @@ Editor::transport_marker_context_menu (GdkEventButton* ev, ArdourCanvas::Item*)
} }
void void
Editor::build_marker_menu (bool session_range) Editor::build_marker_menu (bool session_range, Location* loc)
{ {
using namespace Menu_Helpers; using namespace Menu_Helpers;
@ -622,8 +621,13 @@ Editor::build_marker_menu (bool session_range)
return; 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 (MenuElem (_("Lock"), sigc::bind (sigc::mem_fun(*this, &Editor::marker_menu_lock), true)));
items.push_back (MenuElem (_("Unlock"), sigc::bind (sigc::mem_fun(*this, &Editor::marker_menu_lock), false))); items.push_back (CheckMenuElem (_("Lock")));
CheckMenuItem* lock_item = static_cast<CheckMenuItem*> (&items.back());
if (loc->locked ()) {
lock_item->set_active ();
}
lock_item->signal_activate().connect (sigc::mem_fun (*this, &Editor::toggle_marker_menu_lock));
items.push_back (SeparatorElem()); items.push_back (SeparatorElem());
@ -1029,9 +1033,8 @@ Editor::marker_menu_remove ()
} }
void void
Editor::marker_menu_lock (bool yn) Editor::toggle_marker_menu_lock ()
{ {
Marker* marker; Marker* marker;
if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) { if ((marker = reinterpret_cast<Marker *> (marker_menu_item->get_data ("marker"))) == 0) {
@ -1044,12 +1047,14 @@ Editor::marker_menu_lock (bool yn)
loc = find_location_from_marker (marker, ignored); loc = find_location_from_marker (marker, ignored);
if (!loc) return; if (!loc) {
return;
}
if (yn) { if (loc->locked()) {
loc->lock();
} else {
loc->unlock (); loc->unlock ();
} else {
loc->lock ();
} }
} }