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

neutrino: Replace USE_NEVIS_GXA with hardware-specific macros

Browse Source 
- Existing USE_NEVIS_GXA definitions in the build system
  (neutrino configure) can be removed.
This commit is contained in:
M. Liebmann
2017-02-08 06:02:42 +01:00
parent 98b2461da7
commit 02d85f2ff2
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/driver/fb_accel.h
View File

@@ -33,13 +33,6 @@
#define PARTIAL_BLIT 1 #define PARTIAL_BLIT 1
#endif #endif
#if HAVE_COOL_HARDWARE
#ifndef BOXMODEL_APOLLO
/* not needed -- if you don't want acceleration, don't call CFbAccel ;) */
#define USE_NEVIS_GXA 1
#endif
#endif
class CFbAccel class CFbAccel
: public CFrameBuffer : public CFrameBuffer
{ {

2
src/driver/fb_generic.h
View File

@@ -184,7 +184,7 @@ class CFrameBuffer : public sigc::trackable
bool getActive() const; // is framebuffer active? bool getActive() const; // is framebuffer active?
void setActive(bool enable); // is framebuffer active? void setActive(bool enable); // is framebuffer active?
#ifdef USE_NEVIS_GXA #if HAVE_COOL_HARDWARE && BOXMODEL_NEVIS
virtual void setupGXA() {}; virtual void setupGXA() {};
virtual void add_gxa_sync_marker() {}; virtual void add_gxa_sync_marker() {};
#endif #endif

4
src/driver/screenshot.cpp
View File

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