From 32a693a51b41ac3ea345ad8f1adba0b8af235f37 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Tue, 9 Jan 2018 09:35:31 +0100 Subject: [PATCH] - fix build for generic-pc Signed-off-by: Thilo Graf --- generic-pc/playback.cpp | 9 ++++++--- generic-pc/playback.h | 6 ++++-- generic-pc/playback_gst.h | 8 ++++++-- generic-pc/playback_gst_01.cpp | 19 +++++++++++++++---- generic-pc/playback_gst_10.cpp | 19 +++++++++++++++---- 5 files changed, 46 insertions(+), 15 deletions(-) diff --git a/generic-pc/playback.cpp b/generic-pc/playback.cpp index 5e9c4ac..b13727e 100644 --- a/generic-pc/playback.cpp +++ b/generic-pc/playback.cpp @@ -31,9 +31,9 @@ bool cPlayback::SetAPid(int pid, bool /*ac3*/) return true; } -bool cPlayback::SelectSubtitles(int pid) +bool cPlayback::SelectSubtitles(int pid, std::string charset) { - printf("%s:%s pid %i\n", FILENAME, __func__, pid); + printf("%s:%s pid %i, charset: %s\n", FILENAME, __func__, pid, charset.c_str()); return true; } @@ -105,7 +105,7 @@ int cPlayback::GetTeletextPid(void) return -1; } -void cPlayback::FindAllSubs(uint16_t * /*pids*/, unsigned short * /*supp*/, uint16_t *num, std::string * /*lang*/) +void cPlayback::FindAllSubs(int * /*pids*/, unsigned int * /*supp*/, unsigned int *num, std::string * /*lang*/) { printf("%s:%s\n", FILENAME, __func__); *num = 0; @@ -125,6 +125,9 @@ void cPlayback::GetMetadata(std::vector &keys, std::vector &playlists, std::vector &titles, int ¤t) { + playlists.clear(); + titles.clear(); + current = 0; } void cPlayback::SetTitle(int /*title*/) diff --git a/generic-pc/playback.h b/generic-pc/playback.h index 4638456..c21d6ab 100644 --- a/generic-pc/playback.h +++ b/generic-pc/playback.h @@ -39,13 +39,15 @@ class cPlayback void GetPts(uint64_t &pts); bool SetPosition(int position, bool absolute = false); void FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *numpida, std::string *language); + void FindAllPids(uint16_t *apids, unsigned short *ac3flags, uint16_t *numpida, std::string *language) { FindAllPids((int*) apids, (unsigned int*) ac3flags, (unsigned int*) numpida, language); }; void FindAllSubtitlePids(int *pids, unsigned int *numpids, std::string *language); 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(uint16_t *pids, unsigned short *supported, uint16_t *numpida, std::string *language); - bool SelectSubtitles(int pid); + void FindAllSubs(int *pids, unsigned int *supported, unsigned int *numpida, std::string *language); + void FindAllSubs(uint16_t *pids, unsigned short *supported, uint16_t *numpida, std::string *language) { FindAllSubs((int*) pids, (unsigned int*) supported, (unsigned int*) numpida, language); }; + bool SelectSubtitles(int pid, std::string charset = ""); void GetTitles(std::vector &playlists, std::vector &titles, int ¤t); void SetTitle(int title); void GetChapters(std::vector &positions, std::vector &titles); diff --git a/generic-pc/playback_gst.h b/generic-pc/playback_gst.h index a58de78..80a0e30 100644 --- a/generic-pc/playback_gst.h +++ b/generic-pc/playback_gst.h @@ -81,11 +81,15 @@ public: int GetSubtitlePid(void); bool SetPosition(int position, bool absolute = false); void FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *numpida, std::string *language); + void FindAllPids(uint16_t *apids, unsigned short *ac3flags, uint16_t *numpida, std::string *language) { FindAllPids((int*) apids, (unsigned int*) ac3flags, (unsigned int*) numpida, language); }; void FindAllSubtitlePids(int *pids, unsigned int *numpids, std::string *language); void FindAllTeletextsubtitlePids(int *pids, unsigned int *numpidt, std::string *tlanguage, int *mags, int *pages); void RequestAbort(void); - void FindAllSubs(uint16_t *pids, unsigned short *supported, uint16_t *numpida, std::string *language); - bool SelectSubtitles(int pid); + void FindAllSubs(int *pids, unsigned int *supported, unsigned int *numpida, std::string *language); + void FindAllSubs(uint16_t *pids, unsigned short *supported, uint16_t *numpida, std::string *language) { FindAllSubs((int*) pids, (unsigned int*) supported, (unsigned int*) numpida, language); }; + bool SelectSubtitles(int pid, std::string charset = ""); + void GetTitles(std::vector &playlists, std::vector &titles, int ¤t); + void SetTitle(int title); uint64_t GetReadCount(void); void GetChapters(std::vector &positions, std::vector &titles); void GetMetadata(std::vector &keys, std::vector &values); diff --git a/generic-pc/playback_gst_01.cpp b/generic-pc/playback_gst_01.cpp index 3bf7321..0527be2 100644 --- a/generic-pc/playback_gst_01.cpp +++ b/generic-pc/playback_gst_01.cpp @@ -768,10 +768,10 @@ void cPlayback::RequestAbort() { } -void cPlayback::FindAllSubs(uint16_t *, unsigned short *, uint16_t *numpida, std::string *) +void cPlayback::FindAllSubs(int * /*pids*/, unsigned int * /*supp*/, unsigned int *num, std::string * /*lang*/) { printf("%s:%s\n", FILENAME, __func__); - *numpida = 0; + *num = 0; } void cPlayback::GetChapters(std::vector &positions, std::vector &titles) @@ -780,9 +780,20 @@ void cPlayback::GetChapters(std::vector &positions, std::vector &playlists, std::vector &titles, int ¤t) { - printf("%s:%s pid %i\n", FILENAME, __func__, pid); + playlists.clear(); + titles.clear(); + current = 0; +} + +void cPlayback::SetTitle(int /*title*/) +{ +} + +bool cPlayback::SelectSubtitles(int pid, std::string charset) +{ + printf("%s:%s pid %i, charset: %s\n", FILENAME, __func__, pid, charset.c_str()); return true; } diff --git a/generic-pc/playback_gst_10.cpp b/generic-pc/playback_gst_10.cpp index 08bc508..8acb951 100644 --- a/generic-pc/playback_gst_10.cpp +++ b/generic-pc/playback_gst_10.cpp @@ -1015,10 +1015,10 @@ void cPlayback::RequestAbort() { } -void cPlayback::FindAllSubs(uint16_t *, unsigned short *, uint16_t *numpida, std::string *) +void cPlayback::FindAllSubs(int * /*pids*/, unsigned int * /*supp*/, unsigned int *num, std::string * /*lang*/) { printf("%s:%s\n", FILENAME, __func__); - *numpida = 0; + *num = 0; } void cPlayback::GetChapters(std::vector &positions, std::vector &titles) @@ -1027,9 +1027,20 @@ void cPlayback::GetChapters(std::vector &positions, std::vector &playlists, std::vector &titles, int ¤t) { - printf("%s:%s pid %i\n", FILENAME, __func__, pid); + playlists.clear(); + titles.clear(); + current = 0; +} + +void cPlayback::SetTitle(int /*title*/) +{ +} + +bool cPlayback::SelectSubtitles(int pid, std::string charset) +{ + printf("%s:%s pid %i, charset: %s\n", FILENAME, __func__, pid, charset.c_str()); return true; }