spark: remove unused cPlayback() stuff

Origin commit data
------------------
Branch: master
Commit: 54cc8ddc80
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-02-15 (Wed, 15 Feb 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2012-02-15 00:43:09 +01:00
parent 6a1bc6c605
commit b5f2ae108e
2 changed files with 15 additions and 91 deletions

View File

@@ -13,41 +13,13 @@ extern ManagerHandler_t ManagerHandler;
#include "playback_libeplayer3.h" #include "playback_libeplayer3.h"
static Context_t * player; static Context_t *player;
extern cAudio *audioDecoder; extern cAudio *audioDecoder;
extern cVideo *videoDecoder; extern cVideo *videoDecoder;
static const char * FILENAME = "playback_libeplayer3.cpp"; 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 //Used by Fileplay
bool cPlayback::Open(playmode_t PlayMode) bool cPlayback::Open(playmode_t PlayMode)
{ {
@@ -342,12 +314,6 @@ bool cPlayback::GetPosition(int &position, int &duration)
return true; return true;
} }
bool cPlayback::GetOffset(off64_t &offset)
{
printf("%s:%s\n", FILENAME, __FUNCTION__);
return true;
}
bool cPlayback::SetPosition(int position, bool absolute) bool cPlayback::SetPosition(int position, bool absolute)
{ {
printf("%s:%s %d\n", FILENAME, __FUNCTION__,position); printf("%s:%s %d\n", FILENAME, __FUNCTION__,position);
@@ -358,18 +324,6 @@ bool cPlayback::SetPosition(int position, bool absolute)
return true; 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) void cPlayback::FindAllPids(uint16_t *apids, unsigned short *ac3flags, uint16_t *numpida, std::string *language)
{ {
printf("%s:%s\n", FILENAME, __FUNCTION__); printf("%s:%s\n", FILENAME, __FUNCTION__);
@@ -421,6 +375,7 @@ cPlayback::~cPlayback()
printf("%s:%s\n", FILENAME, __FUNCTION__); printf("%s:%s\n", FILENAME, __FUNCTION__);
} }
#if 0
bool cPlayback::IsPlaying(void) const bool cPlayback::IsPlaying(void) const
{ {
printf("%s:%s\n", FILENAME, __FUNCTION__); printf("%s:%s\n", FILENAME, __FUNCTION__);
@@ -437,15 +392,4 @@ bool cPlayback::IsPlaying(void) const
return playing; return playing;
} }
#endif
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;
}

View File

@@ -1,11 +1,3 @@
/*******************************************************************************/
/* */
/* libcoolstream/cszapper/demux.h */
/* ZAP interface for neutrino frontend */
/* */
/* (C) 2008 CoolStream International */
/* */
/*******************************************************************************/
#ifndef __HAL_PLAYBACK_H #ifndef __HAL_PLAYBACK_H
#define __HAL_PLAYBACK_H #define __HAL_PLAYBACK_H
@@ -19,47 +11,35 @@ typedef enum {
class cPlayback class cPlayback
{ {
private: private:
int timeout;
pthread_cond_t read_cond;
pthread_mutex_t mutex;
bool enabled; bool enabled;
bool paused;
bool playing; bool playing;
int unit;
int nPlaybackFD;
int video_type;
int nPlaybackSpeed; int nPlaybackSpeed;
int mSpeed;
int mAudioStream; int mAudioStream;
playmode_t playMode; bool Stop(void);
//
void Attach(void);
void Detach(void);
bool SetAVDemuxChannel(bool On, bool Video = true, bool Audio = true);
public: public:
void PlaybackNotify (int Event, void *pData, void *pTag); cPlayback(int num = 0);
void DMNotify(int Event, void *pTsBuf, void *Tag); ~cPlayback();
bool Open(playmode_t PlayMode); bool Open(playmode_t PlayMode);
void Close(void); void Close(void);
bool Start(char *filename, unsigned short vpid, int vtype, unsigned short apid, bool Start(char *filename, unsigned short vpid, int vtype, unsigned short apid,
int ac3, unsigned int duration); int ac3, unsigned int duration);
bool Stop(void);
bool SetAPid(unsigned short pid, bool ac3); bool SetAPid(unsigned short pid, bool ac3);
bool SetSpeed(int speed); bool SetSpeed(int speed);
bool GetSpeed(int &speed) const; bool GetSpeed(int &speed) const;
bool GetPosition(int &position, int &duration); bool GetPosition(int &position, int &duration);
bool GetOffset(off64_t &offset);
bool SetPosition(int position, bool absolute = false); 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 IsPlaying(void) const;
bool IsEnabled(void) const; bool IsEnabled(void) const;
void * GetHandle(void); void * GetHandle(void);
void * GetDmHandle(void); void * GetDmHandle(void);
int GetCurrPlaybackSpeed(void) const; int GetCurrPlaybackSpeed(void) const;
void FindAllPids(uint16_t *apids, unsigned short *ac3flags, uint16_t *numpida, std::string *language); void PlaybackNotify (int Event, void *pData, void *pTag);
// void DMNotify(int Event, void *pTsBuf, void *Tag);
cPlayback(int num = 0); #endif
~cPlayback(); };
};
#endif #endif