more debugging tweaks
authorPaul Davis <paul@linuxaudiosystems.com>
Mon, 30 Nov 2009 17:49:36 +0000 (17:49 +0000)
committerPaul Davis <paul@linuxaudiosystems.com>
Mon, 30 Nov 2009 17:49:36 +0000 (17:49 +0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@6221 d708f5d6-7413-0410-9779-e7cbd77b26cf

libs/ardour/session_process.cc

index 1094c6df2284bb72094b45dd7a0cecdb48afa559..d00cad512bd3b548e878b02c5a9b75cded81079f 100644 (file)
@@ -556,7 +556,19 @@ Session::follow_slave (nframes_t nframes)
                        delta *= dir;
 #endif
 
-                       if (fabs(delta) > _slave->resolution() * 2) {
+#ifndef NDEBUG
+       if (slave_speed != 0.0) {
+               DEBUG_TRACE (DEBUG::Slave, string_compose ("delta = %1 speed = %2 ts = %3 M@%4 S@%5 avgdelta %6\n",
+                                                          (int) (dir * this_delta),
+                                                          slave_speed,
+                                                          _transport_speed,
+                                                          _transport_frame,
+                                                          slave_transport_frame, 
+                                                          _transport_frame,
+                                                          average_slave_delta));
+       }
+#endif
+                       if (fabs(delta) > 2048) {
                                /* too far off, so locate and keep rolling */
                                DEBUG_TRACE (DEBUG::Slave, string_compose ("slave delta %1 is too big, locate to %2\n", delta, slave_transport_frame));
                                request_locate (slave_transport_frame, true);
@@ -581,18 +593,6 @@ Session::follow_slave (nframes_t nframes)
                }
        }
 
-#ifndef NDEBUG
-       if (slave_speed != 0.0) {
-               DEBUG_TRACE (DEBUG::Slave, string_compose ("delta = %1 speed = %2 ts = %3 M@%4 S@%5 avgdelta %6\n",
-                                                          (int) (dir * this_delta),
-                                                          slave_speed,
-                                                          _transport_speed,
-                                                          _transport_frame,
-                                                          slave_transport_frame, 
-                                                          _transport_frame,
-                                                          average_slave_delta));
-       }
-#endif
 
        if (!starting && !non_realtime_work_pending()) {
                /* speed is set, we're locked, and good to go */