better design for range plays that leaves the range play button able to play the...

[ardour.git] / libs / ardour / session_events.cc

diff --git a/libs/ardour/session_events.cc b/libs/ardour/session_events.cc
index 95a2f8b2e7e534d3ea5b86b39cf92241cb3ec08f..58702c133b9aedf37f7e9baed4307d614850b0ef 100644 (file)
--- a/libs/ardour/session_events.cc
+++ b/libs/ardour/session_events.cc
@@ -317,7 +317,7 @@ Session::process_event (Event* ev)
 
        switch (ev->type) {
        case Event::SetLoop:
-               set_play_loop (ev->yes_or_no, (ev->speed == 1.0f));
+               set_play_loop (ev->yes_or_no);
                break;
 
        case Event::AutoLoop:
@@ -359,7 +359,7 @@ Session::process_event (Event* ev)
 
 
        case Event::SetTransportSpeed:
-               set_transport_speed (ev->speed, ev->yes_or_no);
+               set_transport_speed (ev->speed, ev->yes_or_no, ev->second_yes_or_no);
                break;
                
        case Event::PunchIn:
@@ -382,7 +382,7 @@ Session::process_event (Event* ev)
 
        case Event::StopOnce:
                if (!non_realtime_work_pending()) {
-                       stop_transport (ev->yes_or_no);
+                       set_transport_speed (0.0, ev->yes_or_no, ev->second_yes_or_no);
                        _clear_event_type (Event::StopOnce);
                }
                remove = false;
@@ -426,13 +426,8 @@ Session::process_event (Event* ev)
                schedule_butler_transport_work ();
                break;
 
-       case Event::SetAudioRange:
-               current_audio_range = ev->audio_range;
-               setup_auto_play ();
-               break;
-
-       case Event::SetPlayRange:
-               set_play_range (ev->yes_or_no, (ev->speed == 1.0f));
+       case Event::SetPlayAudioRange:
+               set_play_range (ev->audio_range, ev->yes_or_no, (ev->speed == 1.0f));
                break;
 
        default: