From 1642f599801b116097cd89f671b8421c591bea0b Mon Sep 17 00:00:00 2001
From: Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
Date: Sun, 23 Nov 2014 19:08:15 +0200
Subject: [PATCH] Get rid of CheckData() as we are receiving only live streams.

---
 device.c   | 8 --------
 device.h   | 1 -
 deviceif.h | 1 -
 rtcp.c     | 2 +-
 rtp.c      | 6 +++---
 tuner.c    | 6 ------
 tuner.h    | 1 -
 tunerif.h  | 1 -
 8 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/device.c b/device.c
index 2b543ae..6df14f4 100644
--- a/device.c
+++ b/device.c
@@ -418,14 +418,6 @@ void cSatipDevice::WriteData(uchar *bufferP, int lengthP)
      pSectionFilterHandlerM->Write(bufferP, lengthP);
 }
 
-unsigned int cSatipDevice::CheckData(void)
-{
-  //debug("cSatipDevice::%s(%u)", __FUNCTION__, deviceIndexM);
-  if (tsBufferM)
-     return (unsigned int)tsBufferM->Free();
-  return 0;
-}
-
 int cSatipDevice::GetId(void)
 {
   //debug("cSatipDevice::%s(%u)", __FUNCTION__, deviceIndexM);
diff --git a/device.h b/device.h
index b852c01..b53cec7 100644
--- a/device.h
+++ b/device.h
@@ -107,7 +107,6 @@ public:
   // for internal device interface
 public:
   virtual void WriteData(u_char *bufferP, int lengthP);
-  virtual unsigned int CheckData(void);
   virtual int GetId(void);
 };
 
diff --git a/deviceif.h b/deviceif.h
index db60d32..3dda061 100644
--- a/deviceif.h
+++ b/deviceif.h
@@ -13,7 +13,6 @@ public:
   cSatipDeviceIf() {}
   virtual ~cSatipDeviceIf() {}
   virtual void WriteData(u_char *bufferP, int lengthP) = 0;
-  virtual unsigned int CheckData(void) = 0;
   virtual int GetId(void) = 0;
 
 private:
diff --git a/rtcp.c b/rtcp.c
index effe382..a73f38c 100644
--- a/rtcp.c
+++ b/rtcp.c
@@ -34,7 +34,7 @@ int cSatipRtcp::GetFd(void)
 
 int cSatipRtcp::GetApplicationOffset(int *lengthP)
 {
-  //debug("cSatipRtcp::%s() [device %d]", __FUNCTION__, tunerM.GetId());
+  //debug("cSatipRtcp::%s(%d) [device %d]", __FUNCTION__, *lengthP, tunerM.GetId());
   if (!lengthP)
      return -1;
   int offset = 0;
diff --git a/rtp.c b/rtp.c
index 67d3774..efd4f99 100644
--- a/rtp.c
+++ b/rtp.c
@@ -50,7 +50,7 @@ void cSatipRtp::Close(void)
 
 int cSatipRtp::GetHeaderLenght(unsigned int lengthP)
 {
-  //debug("cSatipRtp::%s() [device %d]", __FUNCTION__, tunerM.GetId());
+  //debug("cSatipRtp::%s(%d) [device %d]", __FUNCTION__, lengthP, tunerM.GetId());
   unsigned int headerlen = 0;
 
   if (lengthP > 0) {
@@ -109,9 +109,9 @@ int cSatipRtp::GetHeaderLenght(unsigned int lengthP)
 
 void cSatipRtp::Process(int fdP)
 {
-  //debug("cSatipRtp::%s() [device %d]", __FUNCTION__, tunerM.GetId());
+  //debug("cSatipRtp::%s(%d) [device %d]", __FUNCTION__, fdP, tunerM.GetId());
   if (bufferM) {
-     int length = Read(bufferM, min(tunerM.GetVideoDataSize(), bufferLenM));
+     int length = Read(bufferM, bufferLenM);
      if (length > 0) {
         int headerlen = GetHeaderLenght(length);
         if ((headerlen >= 0) && (headerlen < length))
diff --git a/tuner.c b/tuner.c
index 219991e..f08f7d0 100644
--- a/tuner.c
+++ b/tuner.c
@@ -248,12 +248,6 @@ bool cSatipTuner::Disconnect(void)
   return true;
 }
 
-unsigned int cSatipTuner::GetVideoDataSize(void)
-{
-  //debug("cSatipTuner::%s() [device %d]", __FUNCTION__, deviceIdM);
-  return deviceM->CheckData();
-}
-
 void cSatipTuner::ProcessVideoData(u_char *bufferP, int lengthP)
 {
   //debug("cSatipTuner::%s(%d) [device %d]", __FUNCTION__, lengthP, deviceIdM);
diff --git a/tuner.h b/tuner.h
index 99b331a..c03a52c 100644
--- a/tuner.h
+++ b/tuner.h
@@ -115,7 +115,6 @@ public:
 
   // for internal tuner interface
 public:
-  virtual unsigned int GetVideoDataSize(void);
   virtual void ProcessVideoData(u_char *bufferP, int lengthP);
   virtual void ProcessApplicationData(u_char *bufferP, int lengthP);
   virtual void SetStreamId(int streamIdP);
diff --git a/tunerif.h b/tunerif.h
index 512856d..c6f05e1 100644
--- a/tunerif.h
+++ b/tunerif.h
@@ -12,7 +12,6 @@ class cSatipTunerIf {
 public:
   cSatipTunerIf() {}
   virtual ~cSatipTunerIf() {}
-  virtual unsigned int GetVideoDataSize(void) = 0;
   virtual void ProcessVideoData(u_char *bufferP, int lenghtP) = 0;
   virtual void ProcessApplicationData(u_char *bufferP, int lenghtP) = 0;
   virtual void SetStreamId(int streamIdP) = 0;