fix up wscript/build issues in exportvis after merge with master

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

diff --git a/libs/ardour/session_process.cc b/libs/ardour/session_process.cc
index 6a24198bec303ca1799a7ea86394548d8ac309c8..18dfbf2f2eef97945be817d47d9ef8d87c2853f3 100644 (file)
--- a/libs/ardour/session_process.cc
+++ b/libs/ardour/session_process.cc
@@ -83,7 +83,7 @@ Session::process (pframes_t nframes)
         */
 
        try {
-               if (!_engine.freewheeling() && Config->get_send_midi_clock() && transport_speed() == 1.0f && midi_clock->has_midi_port()) {
+               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);
                }
        } catch (...) {
@@ -491,7 +491,6 @@ Session::follow_slave (pframes_t nframes)
                goto noroll;
        }
 
-       _slave->process (nframes);
        _slave->speed_and_position (slave_speed, slave_transport_frame);
 
        DEBUG_TRACE (DEBUG::Slave, string_compose ("Slave position %1 speed %2\n", slave_transport_frame, slave_speed));