force IFS=/ when calling path_expand, so that whitespace in paths doesn't cause worde...

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

diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc
index 8dfcec3b5bfbe6d7da3c16c0ed8655252f463091..e5f4b9cd6e43ff25c52413e644fd4d6357d58463 100644 (file)
--- a/libs/ardour/session_midi.cc
+++ b/libs/ardour/session_midi.cc
@@ -235,7 +235,7 @@ Session::mmc_step (MIDI::MachineControl &/*mmc*/, int steps)
             << endl;
 #endif
 
-       request_transport_speed (step_speed);
+       request_transport_speed_nonzero (step_speed);
        last_mmc_step = now;
 
        if (!step_queued) {
@@ -317,9 +317,9 @@ Session::mmc_shuttle (MIDI::MachineControl &/*mmc*/, float speed, bool forw)
        }
 
        if (forw) {
-               request_transport_speed (speed);
+               request_transport_speed_nonzero (speed);
        } else {
-               request_transport_speed (-speed);
+               request_transport_speed_nonzero (-speed);
        }
 }
 
@@ -332,10 +332,10 @@ Session::mmc_record_enable (MIDI::MachineControl &mmc, size_t trk, bool enabled)
 
        RouteList::iterator i;
        boost::shared_ptr<RouteList> r = routes.reader();
-       
+
        for (i = r->begin(); i != r->end(); ++i) {
                AudioTrack *at;
-               
+
                if ((at = dynamic_cast<AudioTrack*>((*i).get())) != 0) {
                        if (trk == at->remote_control_id()) {
                                at->set_record_enabled (enabled, &mmc);
@@ -379,7 +379,7 @@ Session::send_full_time_code (framepos_t const t)
        }
 
        // Compensate for audio latency
-       outbound_mtc_timecode_frame += _worst_output_latency;
+       outbound_mtc_timecode_frame += worst_playback_latency();
        next_quarter_frame_to_send = 0;
 
        // Sync slave to the same Timecode time as we are on
@@ -535,7 +535,7 @@ Session::mmc_step_timeout ()
 
        /* slow it down */
 
-       request_transport_speed (_transport_speed * 0.75);
+       request_transport_speed_nonzero (_transport_speed * 0.75);
        return true;
 }