smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-08 22:55:44 +01:00
Code Issues Projects Releases Wiki Activity

fix up return and alt-return behaviour

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2618 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2007-11-11 22:00:26 +00:00
parent c412a7c90e
commit 0031a1424f
1 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

38
gtk2_ardour/editor_ops.cc
View file

@ -1041,26 +1041,32 @@ Editor::playhead_forward ()
void
Editor::cursor_align (bool playhead_to_edit)
{
if (!session) {
return;
}
if (playhead_to_edit) {
if (session) {
session->request_locate (get_preferred_edit_position());
if (selection->markers.empty()) {
return;
}
session->request_locate (selection->markers.front()->position(), session->transport_rolling());
} else {
if (_edit_point == EditAtSelectedMarker) {
/* move selected markers to playhead */
for (MarkerSelection::iterator i = selection->markers.begin(); i != selection->markers.end(); ++i) {
bool ignored;
Location* loc = find_location_from_marker (*i, ignored);
if (loc->is_mark()) {
loc->set_start (playhead_cursor->current_frame);
} else {
loc->set (playhead_cursor->current_frame,
playhead_cursor->current_frame + loc->length());
}
/* move selected markers to playhead */
for (MarkerSelection::iterator i = selection->markers.begin(); i != selection->markers.end(); ++i) {
bool ignored;
Location* loc = find_location_from_marker (*i, ignored);
if (loc->is_mark()) {
loc->set_start (playhead_cursor->current_frame);
} else {
loc->set (playhead_cursor->current_frame,
playhead_cursor->current_frame + loc->length());
}
}
}