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

- rename HAVE_COOL_HARDWARE => HAVE_CST_HARDWARE

Browse Source 
Conflicts:
	src/driver/rcinput.cpp
	src/gui/info_menue.cpp
	src/gui/mediaplayer.cpp
	src/gui/movieplayer.cpp
	src/zapit/src/frontend.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2020-09-03 22:07:12 +02:00
committed by Thilo Graf
parent 67650751ac
commit d29c98d7d5
34 changed files with 119 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/driver/audiodec/vis.cpp
View File

@@ -20,7 +20,7 @@
#include <global.h>
#include <neutrino.h>
#if HAVE_COOL_HARDWARE
#if HAVE_CST_HARDWARE
#include <driver/vfd.h>
#endif

2
src/driver/display.h
View File

@@ -1,5 +1,5 @@
/* helper for different display CVFD implementations */
#if HAVE_COOL_HARDWARE
#if HAVE_CST_HARDWARE
#include <driver/vfd.h>
#endif
#if HAVE_TRIPLEDRAGON

8
src/driver/fade.cpp
View File

@@ -29,7 +29,7 @@
#include <driver/framebuffer.h>
#include <unistd.h>
#if HAVE_COOL_HARDWARE
#if HAVE_CST_HARDWARE
#include <cnxtfb.h>
#endif
@@ -58,7 +58,7 @@ void COSDFader::StartFadeIn()
frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha
frameBuffer->setBlendLevel(fadeValue);
#if HAVE_SPARK_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_CS_HD2))
#if HAVE_SPARK_HARDWARE || (HAVE_CST_HARDWARE && defined(BOXMODEL_CS_HD2))
usleep(60000);
#endif
fadeTimer = g_RCInput->addTimer( FADE_TIME, false );
@@ -86,7 +86,7 @@ void COSDFader::StopFade()
if ( fadeIn || fadeOut ) {
g_RCInput->killTimer(fadeTimer);
frameBuffer->setBlendMode(1); // Global alpha multiplied with pixel alpha
#if HAVE_SPARK_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_CS_HD2))
#if HAVE_SPARK_HARDWARE || (HAVE_CST_HARDWARE && defined(BOXMODEL_CS_HD2))
usleep(60000);
#endif
fadeIn = fadeOut = false;
@@ -113,7 +113,7 @@ bool COSDFader::FadeDone()
g_RCInput->killTimer (fadeTimer);
fadeIn = false;
frameBuffer->setBlendMode(1); // Global alpha multiplied with pixel alpha
#if HAVE_SPARK_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_CS_HD2))
#if HAVE_SPARK_HARDWARE || (HAVE_CST_HARDWARE && defined(BOXMODEL_CS_HD2))
usleep(60000);
#endif
} else

4
src/driver/fb_generic.cpp
View File

@@ -129,7 +129,7 @@ CFrameBuffer* CFrameBuffer::getInstance()
#if HAVE_SPARK_HARDWARE
frameBuffer = new CFbAccelSTi();
#endif
#if HAVE_COOL_HARDWARE
#if HAVE_CST_HARDWARE
#ifdef BOXMODEL_CS_HD1
frameBuffer = new CFbAccelCSHD1();
#endif
@@ -1582,7 +1582,7 @@ bool CFrameBuffer::showFrame(const std::string & filename, int fallback_mode)
{
if (videoDecoder)
{
#if HAVE_COOL_HARDWARE //FIXME: inside libcs no return value available
#if HAVE_CST_HARDWARE //FIXME: inside libcs no return value available
videoDecoder->ShowPicture(picture.c_str());
ret = true;
#else

8
src/driver/rcinput.cpp
View File

@@ -1403,7 +1403,13 @@ void CRCInput::getMsg_us(neutrino_msg_t * msg, neutrino_msg_data_t * data, uint6
if (trkey == rc_last_key) {
/* only allow selected keys to be repeated */
if (mayRepeat(trkey, bAllowRepeatLR) ||
(g_settings.shutdown_real_rcdelay && ((trkey == RC_standby) && (g_info.hw_caps->can_shutdown))))
(g_settings.shutdown_real_rcdelay && ((trkey == RC_standby) &&
#if HAVE_CST_HARDWARE
(cs_get_revision() > 7)
#else
(g_info.hw_caps->can_shutdown)
#endif
)))
{
#ifdef ENABLE_REPEAT_CHECK
if (rc_last_repeat_key != trkey) {