From e411a7791c620b2d9d30d66661b1059b3c41e499 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Tue, 7 Nov 2017 07:49:49 +0100 Subject: [PATCH] - streaminfo: fix compile for coolstream; add dummies to libcs-headers Signed-off-by: Thilo Graf --- lib/hardware/coolstream/hd1/libcoolstream/playback_cs.h | 4 +++- lib/hardware/coolstream/hd2/libcoolstream/playback_cs.h | 3 +++ src/gui/streaminfo2.cpp | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/hardware/coolstream/hd1/libcoolstream/playback_cs.h b/lib/hardware/coolstream/hd1/libcoolstream/playback_cs.h index 4e4927c0f..94249e836 100644 --- a/lib/hardware/coolstream/hd1/libcoolstream/playback_cs.h +++ b/lib/hardware/coolstream/hd1/libcoolstream/playback_cs.h @@ -31,6 +31,7 @@ typedef struct { #define MAX_PLAYBACK_PIDS 40 +struct AVFormatContext; class cPlayback { private: cPlaybackData * pd; @@ -81,7 +82,8 @@ public: bool SetTeletextPid(int /*pid*/){return true;} int GetAPid(){return 0;} 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 45f341d63..739373b2e 100644 --- a/lib/hardware/coolstream/hd2/libcoolstream/playback_cs.h +++ b/lib/hardware/coolstream/hd2/libcoolstream/playback_cs.h @@ -32,6 +32,7 @@ typedef struct { #define MAX_PLAYBACK_PIDS 40 +struct AVFormatContext; class cPlayback { private: cPlaybackData * pd; @@ -82,6 +83,8 @@ public: bool SetTeletextPid(int /*pid*/){return true;} int GetAPid(){return 0;} void GetMetadata(std::vector /*&keys*/, std::vector /*&values*/){}; + AVFormatContext *GetAVFormatContext(){ return NULL; } + void ReleaseAVFormatContext() {} }; #endif // __PLAYBACK_CS_H_ diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp index 149283a77..8af793a68 100644 --- a/src/gui/streaminfo2.cpp +++ b/src/gui/streaminfo2.cpp @@ -279,6 +279,7 @@ void CStreamInfo2::probeStreams() { if (mp) { + // not yet implemented in libcoolstream AVFormatContext *avfc = mp->getPlayback()->GetAVFormatContext(); if (avfc) {