diff --git a/generic-pc/playback.cpp b/generic-pc/playback.cpp index 6928474..f197b67 100644 --- a/generic-pc/playback.cpp +++ b/generic-pc/playback.cpp @@ -77,21 +77,11 @@ void cPlayback::GetPts(uint64_t &/*pts*/) { } -bool cPlayback::SetDvbsubtitlePid(int /*pid*/) -{ - return true; -} - bool cPlayback::SetTeletextPid(int /*pid*/) { return true; } -void cPlayback::FindAllDvbsubtitlePids(int * /*pids*/, unsigned int *numpidd, std::string * /*language*/) -{ - *numpidd = 0; -} - void cPlayback::FindAllTeletextsubtitlePids(int * /*pids*/, unsigned int *numpids, std::string * /*language*/) { *numpids = 0; diff --git a/generic-pc/playback.h b/generic-pc/playback.h index cb5b12f..2e4e3e4 100644 --- a/generic-pc/playback.h +++ b/generic-pc/playback.h @@ -16,22 +16,19 @@ class cPlayback bool playing; int mAudioStream; int mSubtitleStream; - int mDvbsubtitleStream; int mTeletextStream; - void (*framebuffer_callback)(uint32_t **, unsigned int *, unsigned int *, unsigned int *, void (**)(void)); + void (*framebuffer_callback)(uint32_t **, unsigned int *, unsigned int *, unsigned int *, void (**)(void), void (**)(void *, int64_t)); public: - cPlayback(int, void (*)(uint32_t **, unsigned int *, unsigned int *, unsigned int *, void (**)(void)) = NULL) { }; + cPlayback(int, void (*)(uint32_t **, unsigned int *, unsigned int *, unsigned int *, void (**)(void), void (**)(void *, int64_t)) = NULL) { }; bool Open(playmode_t PlayMode); void Close(void); bool Start(char * filename, int vpid, int vtype, int apid, bool ac3, int duration, bool no_probe = true); bool Stop(void); bool SetAPid(int pid, bool ac3); bool SetSubtitlePid(int pid); - bool SetDvbsubtitlePid(int pid); bool SetTeletextPid(int pid); int GetAPid(void) { return mAudioStream; } int GetSubtitlePid(void) { return mSubtitleStream; } - int GetDvbsubtitlePid(void) { return mDvbsubtitleStream; } int GetTeletextPid(void); void SuspendSubtitle(bool); bool SetSpeed(int speed); @@ -41,7 +38,6 @@ class cPlayback bool SetPosition(int position, bool absolute = false); void FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *numpida, std::string *language); void FindAllSubtitlePids(int *pids, unsigned int *numpids, std::string *language); - void FindAllDvbsubtitlePids(int *pids, unsigned int *numpidd, std::string *language); void FindAllTeletextsubtitlePids(int *pids, unsigned int *numpidt, std::string *tlanguage); void RequestAbort(void); bool IsPlaying(void) { return false; }