diff --git a/poller.c b/poller.c index 07302b6..a201611 100644 --- a/poller.c +++ b/poller.c @@ -78,7 +78,7 @@ void cSatipPoller::Action(void) for (int i = 0; i < nfds; ++i) { cSatipPollerIf* poll = reinterpret_cast(events[i].data.ptr); if (poll) - poll->Action(events[i].events); + poll->Process(events[i].events); } } debug("cSatipPoller::%s(): exiting", __FUNCTION__); diff --git a/pollerif.h b/pollerif.h index cea1da5..fa8b091 100644 --- a/pollerif.h +++ b/pollerif.h @@ -13,7 +13,7 @@ public: cSatipPollerIf() {} virtual ~cSatipPollerIf() {} virtual int GetFd(void) = 0; - virtual void Action(int fd) = 0; + virtual void Process(int fdP) = 0; private: cSatipPollerIf(const cSatipPollerIf&); diff --git a/rtcp.c b/rtcp.c index 2d9a785..0ba5ecf 100644 --- a/rtcp.c +++ b/rtcp.c @@ -74,7 +74,7 @@ int cSatipRtcp::GetApplicationOffset(int *lengthP) return -1; } -void cSatipRtcp::Action(int fdP) +void cSatipRtcp::Process(int fdP) { //debug("cSatipRtcp::%s(%d)", __FUNCTION__, fdP); if (bufferM) { diff --git a/rtcp.h b/rtcp.h index 0f095b3..79931e0 100644 --- a/rtcp.h +++ b/rtcp.h @@ -19,13 +19,14 @@ private: unsigned char *bufferM; int GetApplicationOffset(int *lenghtP); -protected: - virtual int GetFd(void); - virtual void Action(int fdP); - public: cSatipRtcp(cSatipTunerIf &tunerP, unsigned int bufferLenP); virtual ~cSatipRtcp(); + + // for internal poller interface +public: + virtual int GetFd(void); + virtual void Process(int fdP); }; #endif /* __SATIP_RTCP_H_ */ diff --git a/rtp.c b/rtp.c index ad9c243..4b9ee0b 100644 --- a/rtp.c +++ b/rtp.c @@ -100,7 +100,7 @@ int cSatipRtp::GetHeaderLenght(int lengthP) return headerlen; } -void cSatipRtp::Action(int fdP) +void cSatipRtp::Process(int fdP) { //debug("cSatipRtp::%s(%d)", __FUNCTION__, fdP); if (bufferM) { diff --git a/rtp.h b/rtp.h index 94b5541..c5b2d2f 100644 --- a/rtp.h +++ b/rtp.h @@ -25,14 +25,15 @@ private: int sequenceNumberM; int GetHeaderLenght(int lengthP); -protected: - virtual int GetFd(void); - virtual void Action(int fdP); - public: cSatipRtp(cSatipTunerIf &tunerP, unsigned int bufferLenP); virtual ~cSatipRtp(); virtual void Close(void); + + // for internal poller interface +public: + virtual int GetFd(void); + virtual void Process(int fdP); }; #endif /* __SATIP_RTP_H_ */