smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-03 20:29:35 +01:00
Code Issues Projects Releases Wiki Activity

many changes, large and small, related to smart mode editing, range/region selection, and behaviour of playhead when always-play-range is enabled. could be buggy, but probably in subtle (or even very subtle) ways rather than obvious

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11394 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-01-30 22:53:22 +00:00
parent 664cec2135
commit 7629120cda
13 changed files with 152 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

46
gtk2_ardour/editor_drag.cc
View file

@ -897,6 +897,10 @@ RegionMoveDrag::finished (GdkEvent* ev, bool movement_occurred)
);
}
if (_editor->session() && Config->get_always_play_range()) {
_editor->session()->request_locate (_editor->get_selection().regions.start());
}
}
void
@ -3364,6 +3368,7 @@ SelectionDrag::SelectionDrag (Editor* e, ArdourCanvas::Item* i, Operation o)
, _copy (false)
, _original_pointer_time_axis (-1)
, _last_pointer_time_axis (-1)
, _time_selection_at_start (!_editor->get_selection().time.empty())
{
DEBUG_TRACE (DEBUG::Drags, "New SelectionDrag\n");
}
@ -3595,16 +3600,42 @@ SelectionDrag::finished (GdkEvent* event, bool movement_occurred)
}
/* XXX what if its a music time selection? */
if (s && (s->config.get_auto_play() || (s->get_play_range() && s->transport_rolling()))) {
s->request_play_range (&_editor->selection->time, true);
if (s) {
if ((s->config.get_auto_play() || (s->get_play_range() && s->transport_rolling()))) {
s->request_play_range (&_editor->selection->time, true);
} else {
if (Config->get_always_play_range()) {
if (_editor->doing_range_stuff()) {
s->request_locate (_editor->get_selection().time.start());
}
}
}
}
} else {
/* just a click, no pointer movement.*/
/* just a click, no pointer movement.
*/
if (Keyboard::no_modifier_keys_pressed (&event->button)) {
_editor->selection->clear_time();
if (!_time_selection_at_start) {
if (_editor->clicked_regionview) {
if (_editor->get_selection().selected (_editor->clicked_regionview)) {
/* range select the entire current
region selection
*/
_editor->select_range (_editor->get_selection().regions.start(),
_editor->get_selection().regions.end_frame());
} else {
/* range select this (unselected)
* region
*/
_editor->select_range (_editor->clicked_regionview->region()->position(),
_editor->clicked_regionview->region()->last_frame());
}
}
} else {
_editor->selection->clear_time();
}
}
if (_editor->clicked_axisview && !_editor->selection->selected (_editor->clicked_axisview)) {
@ -3615,6 +3646,11 @@ SelectionDrag::finished (GdkEvent* event, bool movement_occurred)
s->request_stop (false, false);
}
if (Config->get_always_play_range()) {
if (_editor->doing_range_stuff()) {
s->request_locate (_editor->get_selection().time.start());
}
}
}
_editor->stop_canvas_autoscroll ();