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

add/clarify "set range (location) from (range|region) selection" operation (on marker context menu

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@13825 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2013-01-09 21:47:10 +00:00
parent ec7f4dc217
commit 3a7eeb17bc
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gtk2_ardour/editor.h
View file

@ -1521,7 +1521,7 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
void marker_menu_play_range (); void marker_menu_play_range ();
void marker_menu_set_playhead (); void marker_menu_set_playhead ();
void marker_menu_set_from_playhead (); void marker_menu_set_from_playhead ();
void marker_menu_set_from_selection (); void marker_menu_set_from_selection (bool force_regions);
void marker_menu_range_to_next (); void marker_menu_range_to_next ();
void marker_menu_zoom_to_range (); void marker_menu_zoom_to_range ();
void new_transport_marker_menu_set_loop (); void new_transport_marker_menu_set_loop ();

7
gtk2_ardour/editor_markers.cc
View file

@ -901,7 +901,8 @@ Editor::build_range_marker_menu (bool loop_or_punch, bool session)
} }
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)));
if (!Profile->get_sae()) { if (!Profile->get_sae()) {
items.push_back (MenuElem (_("Set Range from Range Selection"), sigc::mem_fun(*this, &Editor::marker_menu_set_from_selection))); items.push_back (MenuElem (_("Set Range from Range/Region Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::marker_menu_set_from_selection), false)));
items.push_back (MenuElem (_("Set Range from Region Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::marker_menu_set_from_selection), true)));
} }
items.push_back (MenuElem (_("Zoom to Range"), sigc::mem_fun (*this, &Editor::marker_menu_zoom_to_range))); items.push_back (MenuElem (_("Zoom to Range"), sigc::mem_fun (*this, &Editor::marker_menu_zoom_to_range)));
@ -1154,7 +1155,7 @@ Editor::marker_menu_set_from_playhead ()
} }
void void
Editor::marker_menu_set_from_selection () Editor::marker_menu_set_from_selection (bool force_regions)
{ {
Marker* marker; Marker* marker;
@ -1175,7 +1176,7 @@ Editor::marker_menu_set_from_selection ()
/* if range selection use first to last */ /* if range selection use first to last */
if (!selection->time.empty()) { if (!selection->time.empty() && !force_regions) {
l->set_start (selection->time.start()); l->set_start (selection->time.start());
l->set_end (selection->time.end_frame()); l->set_end (selection->time.end_frame());
} }