remove double assignments and one debug trace output; tweak second debug trace output

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

diff --git a/libs/ardour/transport_master.cc b/libs/ardour/transport_master.cc
index 9da4fe838275a030c2db1e04b0beb16479065f70..7c43c31ce12283838f6d6746ffaa5d80e9a9a086 100644 (file)
--- a/libs/ardour/transport_master.cc
+++ b/libs/ardour/transport_master.cc
@@ -121,13 +121,6 @@ TransportMaster::speed_and_position (double& speed, samplepos_t& pos, samplepos_
                }
        }
 
-       lp = last.position;
-       when = last.timestamp;
-       speed = last.speed;
-       pos   = last.position + (now - last.timestamp) * last.speed;
-
-       DEBUG_TRACE (DEBUG::Slave, string_compose ("%1: speed_and_position @ %5 last @ %2 pos: %3 spd: %4\n", name(), last.timestamp, last.position, last.speed, now));
-
        lp = last.position;
        when = last.timestamp;
        speed = last.speed;
@@ -139,8 +132,8 @@ TransportMaster::speed_and_position (double& speed, samplepos_t& pos, samplepos_
 
        pos = last.position + (now - last.timestamp) * speed;
 
-       DEBUG_TRACE (DEBUG::Slave, string_compose ("%1 sync spd: %2 pos: %3 | last-pos: %4 | elapsed: %5\n",
-                                                  name(), speed, pos, last.position, (now - last.timestamp)));
+       DEBUG_TRACE (DEBUG::Slave, string_compose ("%1 sync spd: %2 pos: %3 | last-pos: %4 @  %7| elapsed: %5 | speed: %6\n",
+                                                  name(), speed, pos, last.position, (now - last.timestamp), speed, when));
 
        return true;
 }