mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +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
This commit is contained in:
M. Liebmann
2017-02-12 08:18:18 +01:00
parent 0cb26e6e98
commit 987dbe7f1d
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/Makefile.am
View File

@@ -46,7 +46,7 @@ libneutrino_driver_a_SOURCES = \
volume.cpp volume.cpp
if BOXTYPE_COOL if BOXTYPE_COOL
if BOXMODEL_APOLLO if BOXMODEL_CS_HD2
libneutrino_driver_a_SOURCES += \ libneutrino_driver_a_SOURCES += \
fb_accel_cs_hd2.cpp \ fb_accel_cs_hd2.cpp \
vfd.cpp vfd.cpp

6
src/driver/fb_generic.cpp
View File

@@ -124,10 +124,10 @@ CFrameBuffer* CFrameBuffer::getInstance()
frameBuffer = new CFbAccelSTi(); frameBuffer = new CFbAccelSTi();
#endif #endif
#if HAVE_COOL_HARDWARE #if HAVE_COOL_HARDWARE
#ifdef BOXMODEL_NEVIS #ifdef BOXMODEL_CS_HD1
frameBuffer = new CFbAccelCSHD1(); frameBuffer = new CFbAccelCSHD1();
#endif #endif
#ifdef BOXMODEL_APOLLO #ifdef BOXMODEL_CS_HD2
frameBuffer = new CFbAccelCSHD2(); frameBuffer = new CFbAccelCSHD2();
#endif #endif
#endif #endif
@@ -511,7 +511,7 @@ fb_pixel_t* CFrameBuffer::paintBoxRel(const int x, const int y, const int dx, co
int w_align; int w_align;
int offs_align; int offs_align;
#ifdef BOXMODEL_APOLLO #ifdef BOXMODEL_CS_HD2
if (_dx%4 != 0) { if (_dx%4 != 0) {
w_align = GetWidth4FB_HW_ACC(x, _dx, true); w_align = GetWidth4FB_HW_ACC(x, _dx, true);
if (w_align < _dx) if (w_align < _dx)

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?
#if HAVE_COOL_HARDWARE && BOXMODEL_NEVIS #ifdef BOXMODEL_CS_HD1
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();
#if HAVE_COOL_HARDWARE && BOXMODEL_NEVIS #ifdef BOXMODEL_CS_HD1
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
#if HAVE_COOL_HARDWARE && BOXMODEL_NEVIS #ifdef BOXMODEL_CS_HD1
/* 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();