From 23821c3e28b5cc761d50a46aaa8f09792839d95d Mon Sep 17 00:00:00 2001 From: GetAway Date: Tue, 8 Aug 2023 22:07:39 +0200 Subject: [PATCH] fb_generic.cpp: adapt to "Refactor video.cpp: Convert void function to bool function for enhanced result checking" - this only affects CST --- lib/hardware/coolstream/hd1/libcoolstream/video_cs.h | 2 +- lib/hardware/coolstream/hd2/libcoolstream/video_cs.h | 2 +- src/driver/fb_generic.cpp | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/hardware/coolstream/hd1/libcoolstream/video_cs.h b/lib/hardware/coolstream/hd1/libcoolstream/video_cs.h index b29677e83..def268ab7 100644 --- a/lib/hardware/coolstream/hd1/libcoolstream/video_cs.h +++ b/lib/hardware/coolstream/hd1/libcoolstream/video_cs.h @@ -241,7 +241,7 @@ public: bool SetCECMode(VIDEO_HDMI_CEC_MODE Mode); void SetCECAutoView(bool OnOff); void SetCECAutoStandby(bool OnOff); - void ShowPicture(const char * fname); + bool ShowPicture(const char * fname); void StopPicture(); void Standby(bool bOn); void Pig(int x, int y, int w, int h, int osd_w = 1064, int osd_h = 600); diff --git a/lib/hardware/coolstream/hd2/libcoolstream/video_cs.h b/lib/hardware/coolstream/hd2/libcoolstream/video_cs.h index 515d4ad3f..bb8372c4b 100644 --- a/lib/hardware/coolstream/hd2/libcoolstream/video_cs.h +++ b/lib/hardware/coolstream/hd2/libcoolstream/video_cs.h @@ -274,7 +274,7 @@ public: bool SetCECMode(VIDEO_HDMI_CEC_MODE Mode); void SetCECAutoView(bool OnOff); void SetCECAutoStandby(bool OnOff); - void ShowPicture(const char * fname); + bool ShowPicture(const char * fname); void StopPicture(); void Standby(bool bOn); void Pig(int x, int y, int w, int h, int osd_w = 1064, int osd_h = 600); diff --git a/src/driver/fb_generic.cpp b/src/driver/fb_generic.cpp index 55dd2faa5..c0a919a0c 100644 --- a/src/driver/fb_generic.cpp +++ b/src/driver/fb_generic.cpp @@ -1607,13 +1607,8 @@ bool CFrameBuffer::showFrame(const std::string & filename, int fallback_mode) { if (videoDecoder) { -#if HAVE_CST_HARDWARE //FIXME: inside libcs no return value available - videoDecoder->ShowPicture(picture.c_str()); - ret = true; -#else if (videoDecoder->ShowPicture(picture.c_str())) ret = true; -#endif } else dprintf(DEBUG_NORMAL,"[CFrameBuffer]\[%s - %d], no videoplayer instance available\n", __func__, __LINE__);