From 487097fc8de0ac0c23e8982daae7a4b897d4443a Mon Sep 17 00:00:00 2001 From: vanhofen Date: Wed, 3 Jan 2018 11:55:54 +0100 Subject: [PATCH] libcoolstream-headers: remove obsolete dummy members Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/f2aff125c1d9e562959446e0fb8ea6b7228dc75e Author: vanhofen Date: 2018-01-03 (Wed, 03 Jan 2018) Origin message was: ------------------ - libcoolstream-headers: remove obsolete dummy members ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- .../coolstream/hd1/libcoolstream/playback_cs.h | 11 ++--------- .../coolstream/hd2/libcoolstream/playback_cs.h | 11 ++--------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/lib/hardware/coolstream/hd1/libcoolstream/playback_cs.h b/lib/hardware/coolstream/hd1/libcoolstream/playback_cs.h index 94249e836..681bc229d 100644 --- a/lib/hardware/coolstream/hd1/libcoolstream/playback_cs.h +++ b/lib/hardware/coolstream/hd1/libcoolstream/playback_cs.h @@ -31,7 +31,6 @@ typedef struct { #define MAX_PLAYBACK_PIDS 40 -struct AVFormatContext; class cPlayback { private: cPlaybackData * pd; @@ -68,7 +67,6 @@ public: bool IsEnabled(void) const { return enabled; } void FindAllPids(playback_audio_pid_info_t *audiopids, uint16_t size, uint16_t *numpida); void FindAllPids(uint16_t *apids, unsigned short *ac3flags, uint16_t *numpida, std::string *language); - void FindAllPids(uint16_t *apids, unsigned short *ac3flags, uint32_t *numpida, std::string *language){FindAllPids(apids, ac3flags, (uint16_t*) numpida, language);} void FindAllSubs(uint16_t *pids, unsigned short *supported, uint16_t *numpida, std::string *language); bool SelectSubtitles(int pid, std::string charset = ""); void GetChapters(std::vector &positions, std::vector &titles); @@ -76,14 +74,9 @@ public: void GetTitles(std::vector &playlists, std::vector &titles, int ¤t); void SetTitle(int title); uint64_t GetReadCount(void); - void FindAllTeletextsubtitlePids(int *, unsigned int *numpids, std::string *, int *, int *){*numpids = 0;} - void FindAllSubtitlePids(int * /*pids*/, unsigned int *numpids, std::string * /*language*/){*numpids = 0;} - int GetSubtitlePid(void){return 0;} - bool SetTeletextPid(int /*pid*/){return true;} - int GetAPid(){return 0;} + + /* dummies for compatibility with libstb-hal */ void GetMetadata(std::vector /*&keys*/, std::vector /*&values*/){}; - AVFormatContext *GetAVFormatContext(){ return NULL; } - void ReleaseAVFormatContext() {} }; #endif // __PLAYBACK_CS_H_ diff --git a/lib/hardware/coolstream/hd2/libcoolstream/playback_cs.h b/lib/hardware/coolstream/hd2/libcoolstream/playback_cs.h index 739373b2e..2966f903d 100644 --- a/lib/hardware/coolstream/hd2/libcoolstream/playback_cs.h +++ b/lib/hardware/coolstream/hd2/libcoolstream/playback_cs.h @@ -32,7 +32,6 @@ typedef struct { #define MAX_PLAYBACK_PIDS 40 -struct AVFormatContext; class cPlayback { private: cPlaybackData * pd; @@ -69,7 +68,6 @@ public: bool IsEnabled(void) const { return enabled; } void FindAllPids(playback_audio_pid_info_t *audiopids, uint16_t size, uint16_t *numpida); void FindAllPids(uint16_t *apids, unsigned short *ac3flags, uint16_t *numpida, std::string *language); - void FindAllPids(uint16_t *apids, unsigned short *ac3flags, uint32_t *numpida, std::string *language){FindAllPids(apids, ac3flags, (uint16_t*) numpida, language);} void FindAllSubs(uint16_t *pids, unsigned short *supported, uint16_t *numpida, std::string *language); bool SelectSubtitles(int pid, std::string charset = ""); void GetChapters(std::vector &positions, std::vector &titles); @@ -77,14 +75,9 @@ public: void GetTitles(std::vector &playlists, std::vector &titles, int ¤t); void SetTitle(int title); uint64_t GetReadCount(void); - void FindAllTeletextsubtitlePids(int *, unsigned int *numpids, std::string *, int *, int *){*numpids = 0;} - void FindAllSubtitlePids(int * /*pids*/, unsigned int *numpids, std::string * /*language*/){*numpids = 0;} - int GetSubtitlePid(void){return 0;} - bool SetTeletextPid(int /*pid*/){return true;} - int GetAPid(){return 0;} + + /* dummies for compatibility with libstb-hal */ void GetMetadata(std::vector /*&keys*/, std::vector /*&values*/){}; - AVFormatContext *GetAVFormatContext(){ return NULL; } - void ReleaseAVFormatContext() {} }; #endif // __PLAYBACK_CS_H_