From 54cc8ddc80e8b8de3a827229c9d408eec9772d99 Mon Sep 17 00:00:00 2001
From: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: Wed, 15 Feb 2012 00:43:09 +0100
Subject: [PATCH] spark: remove unused cPlayback() stuff

---
 libspark/playback_libeplayer3.cpp | 62 ++-----------------------------
 libspark/playback_libeplayer3.h   | 44 ++++++----------------
 2 files changed, 15 insertions(+), 91 deletions(-)

diff --git a/libspark/playback_libeplayer3.cpp b/libspark/playback_libeplayer3.cpp
index 32d2fa0..a2a2447 100644
--- a/libspark/playback_libeplayer3.cpp
+++ b/libspark/playback_libeplayer3.cpp
@@ -13,41 +13,13 @@ extern ManagerHandler_t		ManagerHandler;
 
 #include "playback_libeplayer3.h"
 
-static 	Context_t * player;
+static Context_t *player;
 
 extern cAudio *audioDecoder;
 extern cVideo *videoDecoder;
 
 static const char * FILENAME = "playback_libeplayer3.cpp";
 
-//
-void cPlayback::Attach(void)
-{
-	printf("%s:%s\n", FILENAME, __FUNCTION__);
-}
-
-void cPlayback::Detach(void)
-{
-	printf("%s:%s\n", FILENAME, __FUNCTION__);
-}
-
-bool cPlayback::SetAVDemuxChannel(bool On, bool Video, bool Audio)
-{
-	printf("%s:%s\n", FILENAME, __FUNCTION__);
-
-	return 0;
-}
-
-void cPlayback::PlaybackNotify (int  Event, void *pData, void *pTag)
-{
-	printf("%s:%s\n", FILENAME, __FUNCTION__);
-}
-
-void cPlayback::DMNotify(int Event, void *pTsBuf, void *Tag)
-{
-	printf("%s:%s\n", FILENAME, __FUNCTION__);
-}
-
 //Used by Fileplay
 bool cPlayback::Open(playmode_t PlayMode)
 {
@@ -342,12 +314,6 @@ bool cPlayback::GetPosition(int &position, int &duration)
 	return true;
 }
 
-bool cPlayback::GetOffset(off64_t &offset)
-{
-	printf("%s:%s\n", FILENAME, __FUNCTION__);
-	return true;
-}
-
 bool cPlayback::SetPosition(int position, bool absolute)
 {
 	printf("%s:%s %d\n", FILENAME, __FUNCTION__,position);
@@ -358,18 +324,6 @@ bool cPlayback::SetPosition(int position, bool absolute)
 	return true;
 }
 
-void * cPlayback::GetHandle(void)
-{
-	printf("%s:%s\n", FILENAME, __FUNCTION__);
-	return NULL;
-}
-
-void * cPlayback::GetDmHandle(void)
-{
-	printf("%s:%s\n", FILENAME, __FUNCTION__);
-	return NULL;
-}
-
 void cPlayback::FindAllPids(uint16_t *apids, unsigned short *ac3flags, uint16_t *numpida, std::string *language)
 {
 	printf("%s:%s\n", FILENAME, __FUNCTION__);
@@ -421,6 +375,7 @@ cPlayback::~cPlayback()
 	printf("%s:%s\n", FILENAME, __FUNCTION__);
 }
 
+#if 0
 bool cPlayback::IsPlaying(void) const
 {
 	printf("%s:%s\n", FILENAME, __FUNCTION__);
@@ -437,15 +392,4 @@ bool cPlayback::IsPlaying(void) const
 
 	return playing;
 }
-
-bool cPlayback::IsEnabled(void) const
-{
-	printf("%s:%s\n", FILENAME, __FUNCTION__);
-	return enabled;
-}
-
-int cPlayback::GetCurrPlaybackSpeed(void) const
-{
-	printf("%s:%s\n", FILENAME, __FUNCTION__);
-	return nPlaybackSpeed;
-}
+#endif
diff --git a/libspark/playback_libeplayer3.h b/libspark/playback_libeplayer3.h
index d2747cb..d709abb 100644
--- a/libspark/playback_libeplayer3.h
+++ b/libspark/playback_libeplayer3.h
@@ -1,11 +1,3 @@
-/*******************************************************************************/
-/*                                                                             */
-/* libcoolstream/cszapper/demux.h                                              */
-/*   ZAP interface for neutrino frontend                                       */
-/*                                                                             */
-/* (C) 2008 CoolStream International                                           */
-/*                                                                             */
-/*******************************************************************************/
 #ifndef __HAL_PLAYBACK_H
 #define __HAL_PLAYBACK_H
 
@@ -19,47 +11,35 @@ typedef enum {
 class cPlayback
 {
 	private:
-		int timeout;
-		pthread_cond_t read_cond;
-		pthread_mutex_t mutex;
 		bool enabled;
-		bool paused;
 		bool playing;
-		int unit;
-		int nPlaybackFD;
-		int video_type;
 		int nPlaybackSpeed;
-		int mSpeed;
 		int mAudioStream;
-		playmode_t playMode;
-		//
-		void Attach(void);
-		void Detach(void);
-		bool SetAVDemuxChannel(bool On, bool Video = true, bool Audio = true);
+		bool Stop(void);
 	public:
-		void PlaybackNotify (int  Event, void *pData, void *pTag);
-		void DMNotify(int Event, void *pTsBuf, void *Tag);
+		cPlayback(int num = 0);
+		~cPlayback();
+
 		bool Open(playmode_t PlayMode);
 		void Close(void);
 		bool Start(char *filename, unsigned short vpid, int vtype, unsigned short apid,
 			   int ac3, unsigned int duration);
-		bool Stop(void);
 		bool SetAPid(unsigned short pid, bool ac3);
 		bool SetSpeed(int speed);
 		bool GetSpeed(int &speed) const;
 		bool GetPosition(int &position, int &duration);
-		bool GetOffset(off64_t &offset);
 		bool SetPosition(int position, bool absolute = false);
+		void FindAllPids(uint16_t *apids, unsigned short *ac3flags, uint16_t *numpida, std::string *language);
+#if 0
+		// Functions that are not used by movieplayer.cpp:
+		bool GetOffset(off64_t &offset);
 		bool IsPlaying(void) const;
 		bool IsEnabled(void) const;
 		void * GetHandle(void);
 		void * GetDmHandle(void);
 		int GetCurrPlaybackSpeed(void) const;
-		void FindAllPids(uint16_t *apids, unsigned short *ac3flags, uint16_t *numpida, std::string *language);
-		//
-		cPlayback(int num = 0);
-		~cPlayback();
-
-};
-
+		void PlaybackNotify (int  Event, void *pData, void *pTag);
+		void DMNotify(int Event, void *pTsBuf, void *Tag);
+#endif
+};
 #endif