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

more rename hardware defined macros for coolstream stb

Browse Source 
Origin commit data
------------------
Commit: 5962554382
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
- more rename hardware defined macros for coolstream stb
This commit is contained in:
vanhofen
2017-02-12 22:21:18 +01:00
parent ba302de46b
commit 5b0a65a16d
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Makefile.am
View File

@@ -19,7 +19,7 @@ SUBDIRS += \
endif endif
if BOXTYPE_COOL if BOXTYPE_COOL
if BOXMODEL_APOLLO if BOXMODEL_CS_HD2
SUBDIRS += \ SUBDIRS += \
libcoolstream2 libcoolstream2
else else

2
src/Makefile.am
View File

@@ -199,7 +199,7 @@ endif
if BOXTYPE_COOL if BOXTYPE_COOL
bin_PROGRAMS += uncooloff bin_PROGRAMS += uncooloff
uncooloff_SOURCES = uncooloff.c uncooloff_SOURCES = uncooloff.c
if BOXMODEL_APOLLO if BOXMODEL_CS_HD2
else else
noinst_PROGRAMS = uncoolinit noinst_PROGRAMS = uncoolinit
uncoolinit_SOURCES = uncoolinit.cpp uncoolinit_SOURCES = uncoolinit.cpp

2
src/driver/fbaccel.cpp
View File

@@ -68,7 +68,7 @@ extern GLFramebuffer *glfb;
#define NEED_BLIT_THREAD 1 #define NEED_BLIT_THREAD 1
#endif #endif
#ifdef BOXMODEL_APOLLO #ifdef BOXMODEL_CS_HD2
#ifndef FB_HW_ACCELERATION #ifndef FB_HW_ACCELERATION
#define FB_HW_ACCELERATION #define FB_HW_ACCELERATION
#endif #endif

4
src/driver/framebuffer_ng.cpp
View File

@@ -378,7 +378,7 @@ fprintf(stderr, "CFrameBuffer::setMode avail: %d active: %d\n", available, activ
printf("FB: %dx%dx%d line length %d. %s accelerator.\n", xRes, yRes, bpp, stride, printf("FB: %dx%dx%d line length %d. %s accelerator.\n", xRes, yRes, bpp, stride,
#if defined(USE_NEVIS_GXA) #if defined(USE_NEVIS_GXA)
"Using nevis GXA" "Using nevis GXA"
#elif defined(BOXMODEL_APOLLO) #elif defined(BOXMODEL_CS_HD2)
"Using fb hw graphics" "Using fb hw graphics"
#else #else
"Not using graphics" "Not using graphics"
@@ -600,7 +600,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)

6
src/gui/videosettings.cpp
View File

@@ -58,7 +58,7 @@
#include <cs_api.h> #include <cs_api.h>
#include <video.h> #include <video.h>
#ifdef BOXMODEL_APOLLO #ifdef BOXMODEL_CS_HD2
#include <cnxtfb.h> #include <cnxtfb.h>
#endif #endif
@@ -119,7 +119,7 @@ const CMenuOptionChooser::keyval VIDEOMENU_43MODE_OPTIONS[] =
}; };
#define VIDEOMENU_43MODE_OPTION_COUNT (sizeof(VIDEOMENU_43MODE_OPTIONS)/sizeof(CMenuOptionChooser::keyval)) #define VIDEOMENU_43MODE_OPTION_COUNT (sizeof(VIDEOMENU_43MODE_OPTIONS)/sizeof(CMenuOptionChooser::keyval))
#ifndef BOXMODEL_APOLLO #ifndef BOXMODEL_CS_HD2
#define VIDEOMENU_VIDEOSIGNAL_TD_OPTION_COUNT 2 #define VIDEOMENU_VIDEOSIGNAL_TD_OPTION_COUNT 2
const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_TD_OPTIONS[VIDEOMENU_VIDEOSIGNAL_TD_OPTION_COUNT] = const CMenuOptionChooser::keyval VIDEOMENU_VIDEOSIGNAL_TD_OPTIONS[VIDEOMENU_VIDEOSIGNAL_TD_OPTION_COUNT] =
{ {
@@ -353,7 +353,7 @@ int CVideoSettings::showVideoSetup()
vs_chinch_ch->setHint("", LOCALE_MENU_HINT_VIDEO_CINCH_MODE); vs_chinch_ch->setHint("", LOCALE_MENU_HINT_VIDEO_CINCH_MODE);
#endif #endif
} }
#ifndef BOXMODEL_APOLLO #ifndef BOXMODEL_CS_HD2
else if (g_info.hw_caps->has_SCART) /* TRIPLEDRAGON hack... :-) TODO: SPARK? */ else if (g_info.hw_caps->has_SCART) /* TRIPLEDRAGON hack... :-) TODO: SPARK? */
{ {
vs_scart_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_SCART, &g_settings.analog_mode1, VIDEOMENU_VIDEOSIGNAL_TD_OPTIONS, VIDEOMENU_VIDEOSIGNAL_TD_OPTION_COUNT, true, this); vs_scart_ch = new CMenuOptionChooser(LOCALE_VIDEOMENU_SCART, &g_settings.analog_mode1, VIDEOMENU_VIDEOSIGNAL_TD_OPTIONS, VIDEOMENU_VIDEOSIGNAL_TD_OPTION_COUNT, true, this);