X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_process.cc;h=680f2861de2a2bdae8e90515ea89c96ef1fdd0d8;hb=152935e736eaf06f85bc7f5cb27337a62d95edd4;hp=18dfbf2f2eef97945be817d47d9ef8d87c2853f3;hpb=22175630bb6e8f7e295dcee822ab30c5e5325712;p=ardour.git

diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index 18dfbf2f2e..680f2861de 100644
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -35,6 +35,7 @@
 #include "ardour/graph.h"
 #include "ardour/port.h"
 #include "ardour/process_thread.h"
+#include "ardour/scene_changer.h"
 #include "ardour/session.h"
 #include "ardour/slave.h"
 #include "ardour/ticker.h"
@@ -86,6 +87,9 @@ Session::process (pframes_t nframes)
 		if (!_silent && !_engine.freewheeling() && Config->get_send_midi_clock() && (transport_speed() == 1.0f || transport_speed() == 0.0f) && midi_clock->has_midi_port()) {
 			midi_clock->tick (transport_at_start, nframes);
 		}
+
+		_scene_changer->run (transport_at_start, transport_at_start + nframes);
+
 	} catch (...) {
 		/* don't bother with a message */
 	}
@@ -421,7 +425,9 @@ Session::process_with_events (pframes_t nframes)
 				check_declick_out ();
 			}
 
-			_engine.split_cycle (this_nframes);
+			if (nframes > 0) {
+				_engine.split_cycle (this_nframes);
+			}
 
 			/* now handle this event and all others scheduled for the same time */
 
@@ -873,7 +879,7 @@ Session::process_audition (pframes_t nframes)
 
 	/* if using a monitor section, run it because otherwise we don't hear anything */
 
-	if (auditioner->needs_monitor()) {
+	if (_monitor_out && auditioner->needs_monitor()) {
 		_monitor_out->monitor_run (_transport_frame, _transport_frame + nframes, nframes, false);
 	}
 
@@ -1008,7 +1014,7 @@ Session::process_event (SessionEvent* ev)
 
 	switch (ev->type) {
 	case SessionEvent::SetLoop:
-		set_play_loop (ev->yes_or_no);
+		set_play_loop (ev->yes_or_no, ev->speed);
 		break;
 
 	case SessionEvent::AutoLoop: