what chris asks for, chris gets. don't ask me why : if in range mode and range is...

git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@6033 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 8e748e7bb72a1eb9628408a86ba7517fc92b5349..980f3709cbf8e58f537ddbad1625db2c1c698f6e 100644 (file)
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -4647,6 +4647,13 @@ Editor::end_selection_op (ArdourCanvas::Item* item, GdkEvent* event)
                        selection->TimeChanged ();
                }
                commit_reversible_command ();
+
+
+               /* XXX what if its a music time selection? */
+               if (Config->get_auto_play() || (session->get_play_range() && session->transport_rolling())) {
+                       session->request_play_range (&selection->time, true);
+               }
+
        } else {
                /* just a click, no pointer movement.*/
 
@@ -4655,11 +4662,10 @@ Editor::end_selection_op (ArdourCanvas::Item* item, GdkEvent* event)
                        selection->clear_time();
 
                } 
-       }
 
-       /* XXX what if its a music time selection? */
-       if (Config->get_auto_play() || (session->get_play_range() && session->transport_rolling())) {
-               session->request_play_range (&selection->time, true);
+               if (session->get_play_range () && session->transport_rolling()) {
+                       session->request_stop (false, false);
+               }
        }
 
        stop_canvas_autoscroll ();

diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc
index 2f05d329dedd5486275626943bcb37b4d005acec..462f33418238c960f6520fc18ae6c2b6d729d73d 100644 (file)
--- a/libs/ardour/session_transport.cc
+++ b/libs/ardour/session_transport.cc
@@ -505,23 +505,6 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished)
        deliver_mmc (MIDI::MachineControl::cmdStop, 0);
        deliver_mmc (MIDI::MachineControl::cmdLocate, _transport_frame);
 
-       if (did_record) {
-
-               /* XXX its a little odd that we're doing this here
-                  when realtime_stop(), which has already executed,
-                  will have done this.
-                  JLC - so let's not because it seems unnecessary and breaks loop record
-               */
-#if 0
-               if (!Config->get_latched_record_enable()) {
-                       g_atomic_int_set (&_record_status, Disabled);
-               } else {
-                       g_atomic_int_set (&_record_status, Enabled);
-               }
-               RecordStateChanged (); /* emit signal */
-#endif
-       }
-       
        if ((post_transport_work & PostTransportLocate) && get_record_enabled()) {
                /* capture start has been changed, so save pending state */
                save_state ("", true);