From 6a0a8c13858b17c9ff0bc453f1ceaf21b5487ab8 Mon Sep 17 00:00:00 2001 From: GetAway Date: Wed, 16 Aug 2023 21:03:37 +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 Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/320c6c1227a210d59f5b90fbfe8ba5f3a5e6f38f Author: GetAway Date: 2023-08-16 (Wed, 16 Aug 2023) ------------------ This commit was generated by Migit --- 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 c1429480b..c666ea1db 100644 --- a/src/driver/fb_generic.cpp +++ b/src/driver/fb_generic.cpp @@ -1599,13 +1599,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__);