Show
Ignore:
Timestamp:
01/19/08 14:36:47 (14 years ago)
Author:
ppalmers
Message:

fix cycle timer DLL code

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/src/libieee1394/CycleTimerHelper.h

    r752 r863  
    2121 * 
    2222 */ 
    23  
    24 #include "libutil/Thread.h" 
    25 #include "cycletimer.h" 
     23#ifndef __CYCLETIMERHELPER_H__ 
     24#define __CYCLETIMERHELPER_H__ 
    2625 
    2726/** 
     
    5049 * different clock domains to operate together. 
    5150 */ 
    52 #ifndef __CYCLETIMERTHREAD_H__ 
    53 #define __CYCLETIMERTHREAD_H__ 
     51 
     52#include "libutil/Thread.h" 
     53#include "libutil/SystemTimeSource.h" 
     54#include "cycletimer.h" 
    5455 
    5556#include "debugmodule/debugmodule.h" 
    5657 
    5758class Ieee1394Service; 
    58 namespace Util { 
    59     class TimeSource; 
    60     class Thread; 
    61 } 
    6259 
    6360class CycleTimerHelper : public Util::RunnableInterface 
     
    105102private: 
    106103    Ieee1394Service &m_Parent; 
     104    Util::SystemTimeSource m_TimeSource; 
    107105    // parameters 
    108106    uint32_t m_ticks_per_update; 
     
    119117    double m_next_time_ticks; 
    120118    bool m_first_run; 
     119    ffado_microsecs_t m_sleep_until; 
    121120 
    122121    // cached vars used for computation 
    123122    struct compute_vars { 
    124         double usecs; 
    125         double ticks; 
     123        uint64_t usecs; 
     124        uint64_t ticks; 
    126125        double rate; 
    127126    };