diff --git a/src/driver/screenshot.cpp b/src/driver/screenshot.cpp index 445a8a84e..cf5739ee4 100644 --- a/src/driver/screenshot.cpp +++ b/src/driver/screenshot.cpp @@ -74,7 +74,9 @@ CScreenShot::CScreenShot(const std::string fname, screenshot_format_t fmt) yres = 0; get_video = g_settings.screenshot_mode & 1; get_osd = g_settings.screenshot_mode & 2; -#if HAVE_GENERIC_HARDWARE || HAVE_ARM_HARDWARE +#if HAVE_COOL_HARDWARE + scale_to_video = g_settings.screenshot_scale; +#elif HAVE_GENERIC_HARDWARE || HAVE_ARM_HARDWARE scale_to_video = (g_settings.screenshot_mode == 3); #else scale_to_video = (g_settings.screenshot_mode == 3) & (g_settings.screenshot_res & 1); @@ -257,9 +259,15 @@ void CScreenShot::cleanupThread(void *arg) } #endif +#if HAVE_COOL_HARDWARE +/* start ::run in new thread to save file in selected format */ +bool CScreenShot::Start() +{ +#else /* start ::run in new thread to save file in selected format */ bool CScreenShot::Start(const std::string custom_cmd) { +#endif #if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE std::string cmd = "/bin/grab "; if (get_osd && !get_video) diff --git a/src/driver/vfd.cpp b/src/driver/vfd.cpp index c5c186726..e9c0b7c09 100644 --- a/src/driver/vfd.cpp +++ b/src/driver/vfd.cpp @@ -1052,7 +1052,9 @@ void CVFD::setMode(const MODES m, const char * const title) ShowIcon(FP_ICON_COL1, true); ShowIcon(FP_ICON_COL2, true); #endif +#if ! HAVE_COOL_HARDWARE ClearIcons(); +#endif ShowIcon(FP_ICON_USB, false); ShowIcon(FP_ICON_HDD, false); showclock = true; diff --git a/src/zapit/src/capmt.cpp b/src/zapit/src/capmt.cpp index 5d245c1b4..fe4831eea 100644 --- a/src/zapit/src/capmt.cpp +++ b/src/zapit/src/capmt.cpp @@ -154,7 +154,7 @@ bool CCam::sendCaPmt(uint64_t tpid, uint8_t *rawpmt, int rawlen, uint8_t type, u bool CCam::sendCaPmt(uint64_t tpid, uint8_t *rawpmt, int rawlen, uint8_t type) { return cCA::GetInstance()->SendCAPMT(tpid, source_demux, camask, - rawpmt ? cabuf : NULL, rawpmt ? calen : 0, rawpmt, rawpmt ? rawlen : 0, (CA_SLOT_TYPE) type, scrambled, camap, mode, enable); + rawpmt ? cabuf : NULL, rawpmt ? calen : 0, rawpmt, rawpmt ? rawlen : 0, (CA_SLOT_TYPE) type); } #endif