summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2009-11-07 17:15:54 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2009-11-07 17:15:54 +0000
commitc033e6f87525b6e0e405b672cf288cf1627bca87 (patch)
treec81ce53cfb27eb8f865880bc9905eab21d0c6c9d /gtk2_ardour
parent862cb478a2b9dfa3822c581241396582050bfa44 (diff)
better design for range plays that leaves the range play button able to play the current range selection
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@6029 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/ardour_ui.cc6
-rw-r--r--gtk2_ardour/editor_mouse.cc2
-rw-r--r--gtk2_ardour/editor_ops.cc2
3 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 834c329793..32b2bc3794 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1484,7 +1484,8 @@ ARDOUR_UI::transport_roll ()
return;
}
} else if (session->get_play_range ()) {
- session->request_play_range (false, true);
+ list<AudioRange> empty;
+ session->request_play_range (empty, false, true);
}
if (!rolling) {
@@ -1535,7 +1536,8 @@ 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;
- session->request_play_range (false, true);
+ list<AudioRange> empty;
+ session->request_play_range (empty, false, true);
}
}
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 3fd7e09afc..ffdf3de9e4 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -4657,8 +4657,6 @@ Editor::end_selection_op (ArdourCanvas::Item* item, GdkEvent* event)
}
}
- /* XXX what happens if its a music selection? */
- session->set_audio_range (selection->time);
stop_canvas_autoscroll ();
}
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 63533991f7..803c34b2c0 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 (true);
+ session->request_play_range (selection->time, true);
}
void