mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 17:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix compile for coolstream hardware (works on HD2)

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f420744b5
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-11-03 (Fri, 03 Nov 2017)

Origin message was:
------------------
- fix compile for coolstream hardware (works on HD2)

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
gixxpunk
2017-11-03 15:58:22 +01:00
parent 27643130a3
commit cb7c02d2ac
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/driver/screenshot.cpp
View File

@@ -74,7 +74,9 @@ CScreenShot::CScreenShot(const std::string fname, screenshot_format_t fmt)
yres = 0; yres = 0;
get_video = g_settings.screenshot_mode & 1; get_video = g_settings.screenshot_mode & 1;
get_osd = g_settings.screenshot_mode & 2; 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); scale_to_video = (g_settings.screenshot_mode == 3);
#else #else
scale_to_video = (g_settings.screenshot_mode == 3) & (g_settings.screenshot_res & 1); scale_to_video = (g_settings.screenshot_mode == 3) & (g_settings.screenshot_res & 1);
@@ -257,9 +259,15 @@ void CScreenShot::cleanupThread(void *arg)
} }
#endif #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 */ /* start ::run in new thread to save file in selected format */
bool CScreenShot::Start(const std::string custom_cmd) bool CScreenShot::Start(const std::string custom_cmd)
{ {
#endif
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE
std::string cmd = "/bin/grab "; std::string cmd = "/bin/grab ";
if (get_osd && !get_video) if (get_osd && !get_video)

2
src/driver/vfd.cpp
View File

@@ -1052,7 +1052,9 @@ void CVFD::setMode(const MODES m, const char * const title)
ShowIcon(FP_ICON_COL1, true); ShowIcon(FP_ICON_COL1, true);
ShowIcon(FP_ICON_COL2, true); ShowIcon(FP_ICON_COL2, true);
#endif #endif
#if ! HAVE_COOL_HARDWARE
ClearIcons(); ClearIcons();
#endif
ShowIcon(FP_ICON_USB, false); ShowIcon(FP_ICON_USB, false);
ShowIcon(FP_ICON_HDD, false); ShowIcon(FP_ICON_HDD, false);
showclock = true; showclock = true;

2
src/zapit/src/capmt.cpp
View File

@@ -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) bool CCam::sendCaPmt(uint64_t tpid, uint8_t *rawpmt, int rawlen, uint8_t type)
{ {
return cCA::GetInstance()->SendCAPMT(tpid, source_demux, camask, 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 #endif