Index: /trunk/libffado/src/libutil/TimestampedBuffer.cpp
===================================================================
--- /trunk/libffado/src/libutil/TimestampedBuffer.cpp (revision 495)
+++ /trunk/libffado/src/libutil/TimestampedBuffer.cpp (revision 496)
@@ -866,4 +866,12 @@
     }
 #endif
+// FIXME: JMW: at some points during startup the timestamp doesn't change.
+// This still needs to be verified in more detail.  
+if (ts>m_buffer_tail_timestamp-1 && ts<m_buffer_tail_timestamp+1) {
+  pthread_mutex_lock(&m_framecounter_lock);
+  m_framecounter += nbframes;
+  pthread_mutex_unlock(&m_framecounter_lock);
+  return;
+}
     
     // update the DLL