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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	configure.ac
	src/driver/Makefile.am
	src/driver/framebuffer.h
	src/gui/bookmarkmanager.cpp
	src/gui/filebrowser.cpp
	src/gui/widget/buttons.cpp
	src/system/httptool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: dd6244f33e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-09 13:19:03 +01:00
parent 2f63d963eb 695c7d3df9
commit c80102a917
132 changed files with 4170 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/driver/screenshot.cpp
View File

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