Merge pull request #1868 from daschuer/wdm-ks

WDM-KS teething fix

Author: daschuer

src/soundio/sounddeviceportaudio.cpp

@@ -361,6 +361,7 @@ SoundDeviceError SoundDevicePortAudio::open(bool isClkRefDevice, int syncBuffers
         ControlObject::set(ConfigKey("[Master]", "samplerate"), m_dSampleRate);
         ControlObject::set(ConfigKey("[Master]", "audio_buffer_size"), bufferMSec);
         m_invalidTimeInfoCount = 0;
+        m_clkRefTimer.start();
     }
     m_pStream = pStream;
     return SOUNDDEVICE_ERROR_OK;
@@ -999,10 +1000,12 @@ void SoundDevicePortAudio::updateCallbackEntryToDacTime(
     double diff = (timeSinceLastCbSecs + callbackEntrytoDacSecs) -
             (m_lastCallbackEntrytoDacSecs + bufferSizeSec);
 
-    if (timeSinceLastCbSecs < bufferSizeSec * 2 &&
-            fabs(diff) / bufferSizeSec > 0.1) {
+    if (callbackEntrytoDacSecs <= 0 ||
+            (timeSinceLastCbSecs < bufferSizeSec * 2 &&
+            fabs(diff) / bufferSizeSec > 0.1)) {
         // Fall back to CPU timing:
-        // If timeSinceLastCbSecs from a CPU timer is reasonable (no underflow)
+        // If timeSinceLastCbSecs from a CPU timer is reasonable (no underflow),
+        // the callbackEntrytoDacSecs time is not in the past
         // and we have more than 10 % difference to the timing provided by Portaudio
         // we do not trust the Portaudio timing.
         // (A difference up to ~ 5 % is normal)