From 701cc4be54250e18ee104f0c43ae48e889baae3b Mon Sep 17 00:00:00 2001 From: nafets227 Date: Mon, 10 Nov 2014 21:54:26 +0100 Subject: [PATCH] removed leftovers, corrected whitespace indention in tuner.c --- common.h | 11 ----------- tuner.c | 5 +---- tuner.h | 9 --------- 3 files changed, 1 insertion(+), 24 deletions(-) diff --git a/common.h b/common.h index 4f98f23..d24f9bc 100644 --- a/common.h +++ b/common.h @@ -126,17 +126,6 @@ public: this->Remove(i); } - void InsertUnique(T Data, int Before = 0) - { - if (IndexOf(Data) < 0) - this->Insert(Data, Before); - } - - void AppendUnique(T Data) - { - if (IndexOf(Data) < 0) - this->Append(Data); - } }; #endif // __SATIP_COMMON_H diff --git a/tuner.c b/tuner.c index 8956b6f..8db274c 100644 --- a/tuner.c +++ b/tuner.c @@ -76,9 +76,6 @@ cSatipTuner::~cSatipTuner() Cancel(3); Close(); - // Terminate curl session - RtspTerminate(); - // Close the listening sockets rtpSocketM->Close(); rtcpSocketM->Close(); @@ -373,7 +370,7 @@ cString cSatipTuner::GeneratePidParameter(bool allPidsP) } } - return param; + return param; } bool cSatipTuner::UpdatePids(bool forceP) diff --git a/tuner.h b/tuner.h index 1c4900e..74529be 100644 --- a/tuner.h +++ b/tuner.h @@ -90,15 +90,6 @@ private: bool KeepAlive(void); bool UpdateSignalInfoCache(void); bool UpdatePids(bool forceP = false); - cString GeneratePidParameter(bool allPidsP = false); - - bool RtspInitialize(void); - bool RtspTerminate(void); - bool RtspOptions(void); - bool RtspSetup(const char *paramP, int rtpPortP, int rtcpPortP); - bool RtspDescribe(void); - bool RtspPlay(const char *paramP = NULL); - bool RtspTeardown(void); protected: virtual void Action(void);