Index: /trunk/libffado/src/libstreaming/MotuStreamProcessor.cpp
===================================================================
--- /trunk/libffado/src/libstreaming/MotuStreamProcessor.cpp (revision 512)
+++ /trunk/libffado/src/libstreaming/MotuStreamProcessor.cpp (revision 515)
@@ -120,6 +120,4 @@
                   int cycle, unsigned int dropped, unsigned int max_length) {
 
-// FIXME: the actual delays in the system need to be worked out so
-// we can get this thing synchronised.  For now this seems to work.
     int fc;
     int64_t ts_head;
@@ -146,7 +144,4 @@
     // packet is intended for and 'now'
     int cycle_diff = diffCycles(cycle, now_cycles);
-
-//debugOutput(DEBUG_LEVEL_VERBOSE,"tx: enabled=%d, cycle=%d, now_cycles=%d, diff=%d\n",
-//  !m_is_disabled,cycle, now_cycles, cycle_diff);
 
     // Signal that streaming is still active
@@ -240,6 +235,4 @@
     int64_t timestamp = ts_head;
 
-//debugOutput(DEBUG_LEVEL_VERBOSE,"tx cycle %d, base timestamp %lld\n",cycle, ts_head);
-
     // we send a packet some cycles in advance, to avoid the
     // following situation:
@@ -258,9 +251,9 @@
     ticks_to_advance += (int64_t)cycle_diff * TICKS_PER_CYCLE;
 
-    // determine the 'now' time in ticks
-//    uint64_t cycle_timer=CYCLE_TIMER_TO_TICKS(ctr);
 
     // time until the packet is to be sent (if <= 0: send packet)
     // For Amdtp this looked like
+    //   // determine the 'now' time in ticks
+    //   uint64_t cycle_timer=CYCLE_TIMER_TO_TICKS(ctr);
     //   int32_t until_next=diffTicks(timestamp, cycle_timer + ticks_to_advance);
     // However, this didn't seem to work well with the MOTU's buffer structure.
@@ -1011,8 +1004,4 @@
             m_data_buffer->setBufferTailTimestamp(m_last_timestamp);
 
-debugOutput(DEBUG_LEVEL_VERBOSE,"On enable: last ts=%lld, ts2=%lld = %lld (%p)\n",
-  m_last_timestamp, m_last_timestamp2, m_last_timestamp-m_last_timestamp2,
-  m_data_buffer);
-
         } else {
             debugOutput(DEBUG_LEVEL_VERY_VERBOSE,
@@ -1083,5 +1072,4 @@
 
         debugOutput( DEBUG_LEVEL_VERY_VERBOSE, "put packet...\n");
-//debugOutput(DEBUG_LEVEL_VERBOSE,"rx cycle=%d, last ts=%lld\n",cycle, m_last_timestamp);
 
         //=> process the packet