# HG changeset patch # User Chris Cannam # Date 1409575263 -3600 # Node ID 5fd0dd4ed984a6806ed3fe420ef615dd82ca40f2 # Parent 7373a8c262cadf25d1da60a8ec3301a17ddff35b# Parent 81e41a430b58cff53bbc0f6813546fb3f435f1d4 Merge from the default branch diff -r 81e41a430b58 -r 5fd0dd4ed984 audioio/AudioCallbackPlaySource.cpp --- a/audioio/AudioCallbackPlaySource.cpp Mon Sep 01 13:37:22 2014 +0100 +++ b/audioio/AudioCallbackPlaySource.cpp Mon Sep 01 13:41:03 2014 +0100 @@ -610,7 +610,11 @@ int targetRate = getTargetSampleRate(); int latency = m_playLatency; // at target rate - RealTime latency_t = RealTime::frame2RealTime(latency, targetRate); + + RealTime latency_t; + if (targetRate != 0) { + latency_t = RealTime::frame2RealTime(latency, targetRate); + } return getCurrentFrame(latency_t); }