Index: /branches/ppalmers-streaming/src/libstreaming/generic/StreamProcessor.h =================================================================== --- /branches/ppalmers-streaming/src/libstreaming/generic/StreamProcessor.h (revision 705) +++ /branches/ppalmers-streaming/src/libstreaming/generic/StreamProcessor.h (revision 706) @@ -242,7 +242,7 @@ public: - ReceiveStreamProcessor(int port, int framerate); - - virtual ~ReceiveStreamProcessor(); + ReceiveStreamProcessor(int port, int framerate) + : StreamProcessor(IsoStream::EST_Receive, port, framerate) {}; + virtual ~ReceiveStreamProcessor(){}; @@ -260,5 +260,4 @@ unsigned char channel, unsigned char tag, unsigned char sy, unsigned int cycle, unsigned int dropped) = 0; - virtual void setVerboseLevel(int l); uint64_t getTimeAtPeriod(); @@ -267,7 +266,4 @@ protected: bool processWriteBlock(char *data, unsigned int nevents, unsigned int offset) {return true;}; - - DECLARE_DEBUG_MODULE; - }; @@ -279,7 +275,7 @@ public: - TransmitStreamProcessor(int port, int framerate); - - virtual ~TransmitStreamProcessor(); + TransmitStreamProcessor(int port, int framerate) + : StreamProcessor(IsoStream::EST_Transmit, port, framerate) {}; + virtual ~TransmitStreamProcessor() {}; virtual enum EProcessorType getType() {return E_Transmit;}; @@ -292,6 +288,4 @@ virtual bool getFramesDry(unsigned int nbframes, int64_t ts) {return false;}; - virtual void setVerboseLevel(int l); - uint64_t getTimeAtPeriod(); bool canClientTransferFrames(unsigned int nframes); @@ -299,8 +293,4 @@ protected: bool processReadBlock(char *data, unsigned int nevents, unsigned int offset) {return true;}; - - DECLARE_DEBUG_MODULE; - - }; Index: /branches/ppalmers-streaming/src/libstreaming/generic/StreamProcessor.cpp =================================================================== --- /branches/ppalmers-streaming/src/libstreaming/generic/StreamProcessor.cpp (revision 705) +++ /branches/ppalmers-streaming/src/libstreaming/generic/StreamProcessor.cpp (revision 706) @@ -34,6 +34,4 @@ IMPL_DEBUG_MODULE( StreamProcessor, StreamProcessor, DEBUG_LEVEL_VERBOSE ); -IMPL_DEBUG_MODULE( ReceiveStreamProcessor, ReceiveStreamProcessor, DEBUG_LEVEL_VERBOSE ); -IMPL_DEBUG_MODULE( TransmitStreamProcessor, TransmitStreamProcessor, DEBUG_LEVEL_VERBOSE ); StreamProcessor::StreamProcessor(enum IsoStream::EStreamType type, int port, int framerate) @@ -84,7 +82,7 @@ m_data_buffer->dumpInfo(); -// m_PeriodStat.dumpInfo(); -// m_PacketStat.dumpInfo(); -// m_WakeupStat.dumpInfo(); + m_PeriodStat.dumpInfo(); + m_PacketStat.dumpInfo(); + m_WakeupStat.dumpInfo(); } @@ -298,19 +296,4 @@ } -ReceiveStreamProcessor::ReceiveStreamProcessor(int port, int framerate) - : StreamProcessor(IsoStream::EST_Receive, port, framerate) { - -} - -ReceiveStreamProcessor::~ReceiveStreamProcessor() { - -} - -void ReceiveStreamProcessor::setVerboseLevel(int l) { - setDebugLevel(l); - StreamProcessor::setVerboseLevel(l); - -} - uint64_t ReceiveStreamProcessor::getTimeAtPeriod() { ffado_timestamp_t next_period_boundary=m_data_buffer->getTimestampFromHead(m_period); @@ -334,19 +317,4 @@ } -TransmitStreamProcessor::TransmitStreamProcessor( int port, int framerate) - : StreamProcessor(IsoStream::EST_Transmit, port, framerate) { - -} - -TransmitStreamProcessor::~TransmitStreamProcessor() { - -} - -void TransmitStreamProcessor::setVerboseLevel(int l) { - setDebugLevel(l); - StreamProcessor::setVerboseLevel(l); - -} - uint64_t TransmitStreamProcessor::getTimeAtPeriod() { ffado_timestamp_t next_period_boundary=m_data_buffer->getTimestampFromTail((m_nb_buffers-1) * m_period);