Changeset 706

Show
Ignore:
Timestamp:
11/04/07 05:15:42 (13 years ago)
Author:
ppalmers
Message:

code cleanup

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/ppalmers-streaming/src/libstreaming/generic/StreamProcessor.cpp

    r705 r706  
    3434 
    3535IMPL_DEBUG_MODULE( StreamProcessor, StreamProcessor, DEBUG_LEVEL_VERBOSE ); 
    36 IMPL_DEBUG_MODULE( ReceiveStreamProcessor, ReceiveStreamProcessor, DEBUG_LEVEL_VERBOSE ); 
    37 IMPL_DEBUG_MODULE( TransmitStreamProcessor, TransmitStreamProcessor, DEBUG_LEVEL_VERBOSE ); 
    3836 
    3937StreamProcessor::StreamProcessor(enum IsoStream::EStreamType type, int port, int framerate) 
     
    8482    m_data_buffer->dumpInfo(); 
    8583 
    86 //     m_PeriodStat.dumpInfo(); 
    87 //     m_PacketStat.dumpInfo(); 
    88 //     m_WakeupStat.dumpInfo(); 
     84    m_PeriodStat.dumpInfo(); 
     85    m_PacketStat.dumpInfo(); 
     86    m_WakeupStat.dumpInfo(); 
    8987 
    9088} 
     
    298296} 
    299297 
    300 ReceiveStreamProcessor::ReceiveStreamProcessor(int port, int framerate) 
    301     : StreamProcessor(IsoStream::EST_Receive, port, framerate) { 
    302  
    303 } 
    304  
    305 ReceiveStreamProcessor::~ReceiveStreamProcessor() { 
    306  
    307 } 
    308  
    309 void ReceiveStreamProcessor::setVerboseLevel(int l) { 
    310     setDebugLevel(l); 
    311     StreamProcessor::setVerboseLevel(l); 
    312  
    313 } 
    314  
    315298uint64_t ReceiveStreamProcessor::getTimeAtPeriod() { 
    316299    ffado_timestamp_t next_period_boundary=m_data_buffer->getTimestampFromHead(m_period); 
     
    334317} 
    335318 
    336 TransmitStreamProcessor::TransmitStreamProcessor( int port, int framerate) 
    337     : StreamProcessor(IsoStream::EST_Transmit, port, framerate) { 
    338  
    339 } 
    340  
    341 TransmitStreamProcessor::~TransmitStreamProcessor() { 
    342  
    343 } 
    344  
    345 void TransmitStreamProcessor::setVerboseLevel(int l) { 
    346     setDebugLevel(l); 
    347     StreamProcessor::setVerboseLevel(l); 
    348  
    349 } 
    350  
    351319uint64_t TransmitStreamProcessor::getTimeAtPeriod() { 
    352320    ffado_timestamp_t next_period_boundary=m_data_buffer->getTimestampFromTail((m_nb_buffers-1) * m_period); 
  • branches/ppalmers-streaming/src/libstreaming/generic/StreamProcessor.h

    r705 r706  
    242242 
    243243public: 
    244     ReceiveStreamProcessor(int port, int framerate); 
    245  
    246     virtual ~ReceiveStreamProcessor()
     244    ReceiveStreamProcessor(int port, int framerate) 
     245        : StreamProcessor(IsoStream::EST_Receive, port, framerate) {}; 
     246    virtual ~ReceiveStreamProcessor(){}
    247247 
    248248 
     
    260260                  unsigned char channel, unsigned char tag, unsigned char sy, 
    261261                  unsigned int cycle, unsigned int dropped) = 0; 
    262      virtual void setVerboseLevel(int l); 
    263262 
    264263    uint64_t getTimeAtPeriod(); 
     
    267266protected: 
    268267    bool processWriteBlock(char *data, unsigned int nevents, unsigned int offset) {return true;}; 
    269  
    270     DECLARE_DEBUG_MODULE; 
    271  
    272268}; 
    273269 
     
    279275 
    280276public: 
    281     TransmitStreamProcessor(int port, int framerate); 
    282  
    283     virtual ~TransmitStreamProcessor()
     277    TransmitStreamProcessor(int port, int framerate) 
     278        : StreamProcessor(IsoStream::EST_Transmit, port, framerate) {}; 
     279    virtual ~TransmitStreamProcessor() {}
    284280 
    285281    virtual enum EProcessorType getType() {return E_Transmit;}; 
     
    292288        virtual bool getFramesDry(unsigned int nbframes, int64_t ts) {return false;}; 
    293289 
    294      virtual void setVerboseLevel(int l); 
    295  
    296290    uint64_t getTimeAtPeriod(); 
    297291    bool canClientTransferFrames(unsigned int nframes); 
     
    299293protected: 
    300294    bool processReadBlock(char *data, unsigned int nevents, unsigned int offset) {return true;}; 
    301  
    302     DECLARE_DEBUG_MODULE; 
    303  
    304  
    305295}; 
    306296