diff options
Diffstat (limited to 'gtk2_ardour/editor_keys.cc')
| -rw-r--r-- | gtk2_ardour/editor_keys.cc | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc index fba52014bc..2c64d6f4f3 100644 --- a/gtk2_ardour/editor_keys.cc +++ b/gtk2_ardour/editor_keys.cc @@ -43,9 +43,8 @@ Editor::keyboard_selection_finish (bool /*add*/, Editing::EditIgnoreOption ign) { if (_session) { - framepos_t start = selection->time.start(); + MusicFrame start (selection->time.start(), 0); framepos_t end; - if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) { end = _session->audible_frame(); } else { @@ -53,13 +52,13 @@ Editor::keyboard_selection_finish (bool /*add*/, Editing::EditIgnoreOption ign) } //snap the selection start/end - snap_to(start); + snap_to (start); //if no tracks are selected and we're working from the keyboard, enable all tracks (_something_ has to be selected for any range selection) if ( (_edit_point == EditAtPlayhead) && selection->tracks.empty() ) select_all_tracks(); - selection->set (start, end); + selection->set (start.frame, end); //if session is playing a range, cancel that if (_session->get_play_range()) @@ -73,26 +72,25 @@ Editor::keyboard_selection_begin (Editing::EditIgnoreOption ign) { if (_session) { - framepos_t start; - framepos_t end = selection->time.end_frame(); - + MusicFrame start (0, 0); + MusicFrame end (selection->time.end_frame(), 0); if ((_edit_point == EditAtPlayhead) && _session->transport_rolling()) { - start = _session->audible_frame(); + start.frame = _session->audible_frame(); } else { - start = get_preferred_edit_position(ign); + start.frame = get_preferred_edit_position(ign); } //snap the selection start/end snap_to(start); //if there's not already a sensible selection endpoint, go "forever" - if (start > end) { + if (start.frame > end.frame) { #ifdef MIXBUS // 4hours at most. // This works around a visual glitch in red-bordered selection rect. - end = start + _session->nominal_frame_rate() * 60 * 60 * 4; + end.frame = start.frame + _session->nominal_frame_rate() * 60 * 60 * 4; #else - end = max_framepos; + end.frame = max_framepos; #endif } @@ -100,7 +98,7 @@ Editor::keyboard_selection_begin (Editing::EditIgnoreOption ign) if ( selection->tracks.empty() ) select_all_tracks(); - selection->set (start, end); + selection->set (start.frame, end.frame); //if session is playing a range, cancel that if (_session->get_play_range()) |