From aeec7f13a0775b33907512d16a4920c7ecd321fd Mon Sep 17 00:00:00 2001 From: martii Date: Sun, 13 Apr 2014 10:07:06 +0200 Subject: [PATCH] unbreak generic build --- generic-pc/playback.cpp | 4 ++-- generic-pc/playback.h | 9 ++++++--- libspark/playback_libeplayer3.cpp | 2 +- libspark/playback_libeplayer3.h | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/generic-pc/playback.cpp b/generic-pc/playback.cpp index f197b67..f08de60 100644 --- a/generic-pc/playback.cpp +++ b/generic-pc/playback.cpp @@ -13,7 +13,7 @@ void cPlayback::Close(void) { } -bool cPlayback::Start(char * filename, int vpid, int vtype, int apid, bool ac3, int duration, bool /*noprobe*/) +bool cPlayback::Start(char * filename, int vpid, int vtype, int apid, int ac3, int duration) { printf("%s:%s - filename=%s vpid=%u vtype=%d apid=%u ac3=%d duration=%i\n", FILENAME, __func__, filename, vpid, vtype, apid, ac3, duration); @@ -82,7 +82,7 @@ bool cPlayback::SetTeletextPid(int /*pid*/) return true; } -void cPlayback::FindAllTeletextsubtitlePids(int * /*pids*/, unsigned int *numpids, std::string * /*language*/) +void cPlayback::FindAllTeletextsubtitlePids(int *, unsigned int *numpids, std::string *, int *, int *) { *numpids = 0; } diff --git a/generic-pc/playback.h b/generic-pc/playback.h index b3d8d0d..aad792a 100644 --- a/generic-pc/playback.h +++ b/generic-pc/playback.h @@ -21,8 +21,7 @@ class cPlayback cPlayback(int); 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 Start(char *filename, int vpid, int vtype, int apid, int ac3, int duration); bool SetAPid(int pid, bool ac3); bool SetSubtitlePid(int pid); bool SetTeletextPid(int pid); @@ -30,6 +29,7 @@ class cPlayback int GetSubtitlePid(void) { return mSubtitleStream; } int GetTeletextPid(void); void SuspendSubtitle(bool); + int GetFirstTeletextPid(void); bool SetSpeed(int speed); bool GetSpeed(int &speed) const; bool GetPosition(int &position, int &duration); @@ -37,11 +37,14 @@ 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 FindAllTeletextsubtitlePids(int *pids, unsigned int *numpidt, std::string *tlanguage); + void FindAllTeletextsubtitlePids(int *pids, unsigned int *numpidt, std::string *tlanguage, int *mags, int *pages); void RequestAbort(void); bool IsPlaying(void) { return false; } + uint64_t GetReadCount(void); + void FindAllSubs(int *pids, unsigned int *supported, unsigned int *numpida, std::string *language); bool SelectSubtitles(int pid); + void GetChapters(std::vector &positions, std::vector &titles); void GetMetadata(std::vector &keys, std::vector &values); // diff --git a/libspark/playback_libeplayer3.cpp b/libspark/playback_libeplayer3.cpp index 1b5acfb..cedfacb 100644 --- a/libspark/playback_libeplayer3.cpp +++ b/libspark/playback_libeplayer3.cpp @@ -46,7 +46,7 @@ void cPlayback::Close(void) } } -bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, unsigned int) +bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, int) { bool ret = false; bool isHTTP = false; diff --git a/libspark/playback_libeplayer3.h b/libspark/playback_libeplayer3.h index 52e5107..0929223 100644 --- a/libspark/playback_libeplayer3.h +++ b/libspark/playback_libeplayer3.h @@ -32,7 +32,7 @@ class cPlayback bool Open(playmode_t PlayMode); void Close(void); - bool Start(char *filename, int vpid, int vtype, int apid, int ac3, unsigned int duration); + bool Start(char *filename, int vpid, int vtype, int apid, int ac3, int duration); bool SetAPid(int pid, bool ac3); bool SetSubtitlePid(int pid); bool SetTeletextPid(int pid);