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

pu/fb-modules: Rename hardware defined macros for coolstream stb

Browse Source 
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2


Origin commit data
------------------
Branch: ni/coolstream
Commit: 987dbe7f1d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
pu/fb-modules: Rename hardware defined macros for coolstream stb

 BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2


------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2017-02-12 08:18:18 +01:00
parent 9b465b3b50
commit 2956e6d7f9
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/screenshot.cpp
View File

@@ -77,7 +77,7 @@ bool CScreenShot::GetData()
bool res = false;
mutex.lock();
#if HAVE_COOL_HARDWARE && BOXMODEL_NEVIS
#ifdef BOXMODEL_CS_HD1
CFrameBuffer::getInstance()->setActive(false);
#endif
if (videoDecoder->getBlank())
@@ -86,7 +86,7 @@ bool CScreenShot::GetData()
res = videoDecoder->GetScreenImage(pixel_data, xres, yres, get_video, get_osd, scale_to_video);
#endif
#if HAVE_COOL_HARDWARE && BOXMODEL_NEVIS
#ifdef BOXMODEL_CS_HD1
/* sort of hack. GXA used to transfer/convert live image to RGB,
* so setup GXA back */
CFrameBuffer::getInstance()->setupGXA();