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

cleanup from unsupported DUCKBOX_HARDWARE

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 514bd932fc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-08 (Wed, 08 Nov 2017)

Origin message was:
------------------
- cleanup from unsupported DUCKBOX_HARDWARE

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-11-08 09:28:34 +01:00
committed by Thilo Graf
parent 26a400f279
commit 31520a997e
12 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/driver/fade.cpp
View File

@@ -58,7 +58,7 @@ void COSDFader::StartFadeIn()
frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha
frameBuffer->setBlendLevel(fadeValue);
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_CS_HD2))
#if HAVE_SPARK_HARDWARE || (HAVE_COOL_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_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_CS_HD2))
#if HAVE_SPARK_HARDWARE || (HAVE_COOL_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_DUCKBOX_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_CS_HD2))
#if HAVE_SPARK_HARDWARE || (HAVE_COOL_HARDWARE && defined(BOXMODEL_CS_HD2))
usleep(60000);
#endif
} else

6
src/driver/radiotext.cpp
View File

@@ -2376,7 +2376,7 @@ void CRadioText::run()
uint current_pid = 0;
printf("CRadioText::run: ###################### Starting thread ######################\n");
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || HAVE_GENERIC_HARDWARE
#if HAVE_SPARK_HARDWARE || HAVE_GENERIC_HARDWARE
int buflen = 0;
unsigned char *buf = NULL;
audioDemux = new cDemux(0); // live demux
@@ -2407,7 +2407,7 @@ void CRadioText::run()
}
mutex.unlock();
if (pid) {
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || HAVE_GENERIC_HARDWARE
#if HAVE_SPARK_HARDWARE || HAVE_GENERIC_HARDWARE
int n;
unsigned char tmp[6];
@@ -2450,7 +2450,7 @@ void CRadioText::run()
}
}
}
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE || HAVE_GENERIC_HARDWARE
#if HAVE_SPARK_HARDWARE || HAVE_GENERIC_HARDWARE
if (buf)
free(buf);
#endif

12
src/driver/screenshot.cpp
View File

@@ -61,7 +61,7 @@ CScreenShot::CScreenShot(const std::string fname, screenshot_format_t fmt)
format = fmt;
filename = fname;
pixel_data = NULL;
#if !HAVE_SPARK_HARDWARE && !HAVE_DUCKBOX_HARDWARE
#if !HAVE_SPARK_HARDWARE
fd = NULL;
xres = 0;
yres = 0;
@@ -85,14 +85,14 @@ CScreenShot::CScreenShot(const std::string fname, screenshot_format_t fmt)
CScreenShot::~CScreenShot()
{
#if !HAVE_SPARK_HARDWARE && !HAVE_DUCKBOX_HARDWARE
#if !HAVE_SPARK_HARDWARE
pthread_mutex_destroy(&thread_mutex);
pthread_mutex_destroy(&getData_mutex);
#endif
// printf("[CScreenShot::%s:%d] thread: %p\n", __func__, __LINE__, this);
}
#if !HAVE_SPARK_HARDWARE && !HAVE_DUCKBOX_HARDWARE
#if !HAVE_SPARK_HARDWARE
#ifdef BOXMODEL_CS_HD2
@@ -224,7 +224,7 @@ bool CScreenShot::startThread()
}
#endif
#if !HAVE_SPARK_HARDWARE && !HAVE_DUCKBOX_HARDWARE
#if !HAVE_SPARK_HARDWARE
void* CScreenShot::initThread(void *arg)
{
CScreenShot *scs = static_cast<CScreenShot*>(arg);
@@ -268,7 +268,7 @@ bool CScreenShot::Start()
bool CScreenShot::Start(const std::string custom_cmd)
{
#endif
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE
#if HAVE_SPARK_HARDWARE
std::string cmd = "/bin/grab ";
if (get_osd && !get_video)
cmd += "-o ";
@@ -311,7 +311,7 @@ bool CScreenShot::Start(const std::string custom_cmd)
#endif
}
#if !HAVE_SPARK_HARDWARE && !HAVE_DUCKBOX_HARDWARE
#if !HAVE_SPARK_HARDWARE
/* save file in sync mode, return true if save ok, or false */
bool CScreenShot::StartSync()
{

2
src/driver/screenshot.h
View File

@@ -48,7 +48,7 @@ class CScreenShot
bool get_osd;
bool get_video;
bool scale_to_video;
#if !HAVE_SPARK_HARDWARE && !HAVE_DUCKBOX_HARDWARE
#if !HAVE_SPARK_HARDWARE
FILE *fd;
pthread_t scs_thread;
pthread_mutex_t thread_mutex;