convert ntp time to unix time

yaxu · Dec 28, 2012 · d0d613d · d0d613d
1 parent 56c281c
commit d0d613d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Stream.hs b/Stream.hs
@@ -75,13 +75,13 @@ toMessage s change ticks (o, m) =
          logicalNow = (logicalTime change beat)
          beat' = (fromIntegral ticks + 1) / fromIntegral tpb
          logicalPeriod = (logicalTime change (beat + 1)) - logicalNow
-         logicalOnset = logicalNow + (logicalPeriod * o) + latency
+         logicalOnset = ntpr_to_ut $ logicalNow + (logicalPeriod * o) + latency
          sec = floor logicalOnset
          usec = floor $ 1000000 * (logicalOnset - (fromIntegral sec))
          oscdata = catMaybes $ mapMaybe (\x -> Map.lookup x m') (params s)
          oscdata' = ((Int sec):(Int usec):oscdata)
          osc | timestamp s = Bundle (immediately) [Message (path s) oscdata']
-             | otherwise = Bundle (UTCr logicalOnset) [Message (path s) oscdata]
+             | otherwise = Bundle (immediately) [Message (path s) oscdata]
      return osc