mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-26 23:13:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

fb_generic.cpp: adapt to "Refactor video.cpp: Convert void function to bool function for enhanced result checking"

Browse Source 
- this only affects CST
This commit is contained in:
GetAway
2023-08-08 22:07:39 +02:00
parent 0822265af9
commit 23821c3e28
3 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/hardware/coolstream/hd1/libcoolstream/video_cs.h
View File

@@ -241,7 +241,7 @@ public:
bool SetCECMode(VIDEO_HDMI_CEC_MODE Mode); bool SetCECMode(VIDEO_HDMI_CEC_MODE Mode);
void SetCECAutoView(bool OnOff); void SetCECAutoView(bool OnOff);
void SetCECAutoStandby(bool OnOff); void SetCECAutoStandby(bool OnOff);
void ShowPicture(const char * fname); bool ShowPicture(const char * fname);
void StopPicture(); void StopPicture();
void Standby(bool bOn); void Standby(bool bOn);
void Pig(int x, int y, int w, int h, int osd_w = 1064, int osd_h = 600); void Pig(int x, int y, int w, int h, int osd_w = 1064, int osd_h = 600);

2
lib/hardware/coolstream/hd2/libcoolstream/video_cs.h
View File

@@ -274,7 +274,7 @@ public:
bool SetCECMode(VIDEO_HDMI_CEC_MODE Mode); bool SetCECMode(VIDEO_HDMI_CEC_MODE Mode);
void SetCECAutoView(bool OnOff); void SetCECAutoView(bool OnOff);
void SetCECAutoStandby(bool OnOff); void SetCECAutoStandby(bool OnOff);
void ShowPicture(const char * fname); bool ShowPicture(const char * fname);
void StopPicture(); void StopPicture();
void Standby(bool bOn); void Standby(bool bOn);
void Pig(int x, int y, int w, int h, int osd_w = 1064, int osd_h = 600); void Pig(int x, int y, int w, int h, int osd_w = 1064, int osd_h = 600);

5
src/driver/fb_generic.cpp
View File

@@ -1607,13 +1607,8 @@ bool CFrameBuffer::showFrame(const std::string & filename, int fallback_mode)
{ {
if (videoDecoder) 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())) if (videoDecoder->ShowPicture(picture.c_str()))
ret = true; ret = true;
#endif
} }
else else
dprintf(DEBUG_NORMAL,"[CFrameBuffer]\[%s - %d], no videoplayer instance available\n", __func__, __LINE__); dprintf(DEBUG_NORMAL,"[CFrameBuffer]\[%s - %d], no videoplayer instance available\n", __func__, __LINE__);