Revert "MSVC complains because we're using 'fabs()' to compare 2 x integers"
authorPaul Davis <paul@linuxaudiosystems.com>
Sat, 22 Sep 2018 12:50:16 +0000 (08:50 -0400)
committerPaul Davis <paul@linuxaudiosystems.com>
Sat, 22 Sep 2018 12:50:16 +0000 (08:50 -0400)
You can't remove an abs() conversion and keep the same semantics.

This reverts commit d89b8cc0ad01eaf59dc605939628003dfa89899d.

libs/ardour/session_process.cc

index 720104c4191733c2ca9ab9ef87f0cbde92b4219c..04f2d3f77e7edb978731cfa07d0e9ae6004aad06 100644 (file)
@@ -1084,7 +1084,7 @@ Session::follow_transport_master (pframes_t nframes)
 
        if (transport_master_tracking_state == Running) {
 
-               if (!actively_recording() && delta > tmm.current()->resolution()) {
+               if (!actively_recording() && fabs (delta) > tmm.current()->resolution()) {
                        DEBUG_TRACE (DEBUG::Slave, string_compose ("average slave delta %1 greater than slave resolution %2\n", delta, tmm.current()->resolution()));
                        if (micro_locate (-delta) != 0) {
                                DEBUG_TRACE (DEBUG::Slave, "micro-locate didn't work, set no disk output true\n");