diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-07 23:48:19 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-11-07 23:48:19 +0000 |
| commit | 5574b46de4ec67d680e8c5ceddaf5a4d8a554694 (patch) | |
| tree | bb0cdaf83e12409095d82b018ee35e612ae02558 /gtk2_ardour | |
| parent | c033e6f87525b6e0e405b672cf288cf1627bca87 (diff) | |
clean up that godawful programming style in the last transport commit, and fix dynamic range playback
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@6031 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 6 | ||||
| -rw-r--r-- | gtk2_ardour/editor_mouse.cc | 5 | ||||
| -rw-r--r-- | gtk2_ardour/editor_ops.cc | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 32b2bc3794..ba20dbd56a 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1484,8 +1484,7 @@ ARDOUR_UI::transport_roll () return; } } else if (session->get_play_range ()) { - list<AudioRange> empty; - session->request_play_range (empty, false, true); + session->request_play_range (0, true); } if (!rolling) { @@ -1536,8 +1535,7 @@ ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode) session->request_play_loop (false, true); } else if (session->get_play_range ()) { affect_transport = false; - list<AudioRange> empty; - session->request_play_range (empty, false, true); + session->request_play_range (0, true); } } diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index ffdf3de9e4..8275b50347 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -4657,6 +4657,11 @@ Editor::end_selection_op (ArdourCanvas::Item* item, GdkEvent* event) } } + /* XXX what if its a music time selection? */ + if (session->get_play_range() && session->transport_rolling()) { + session->request_play_range (&selection->time, true); + } + stop_canvas_autoscroll (); } diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 803c34b2c0..c3464033b3 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -2428,7 +2428,7 @@ Editor::play_selection () return; } - session->request_play_range (selection->time, true); + session->request_play_range (&selection->time, true); } void |