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

cleanup from unsupported DUCKBOX_HARDWARE

Browse Source 
Origin commit data
------------------
Commit: bc0de58721
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-08 (Wed, 08 Nov 2017)

Origin message was:
------------------
- cleanup from unsupported DUCKBOX_HARDWARE
This commit is contained in:
vanhofen
2017-11-08 09:28:34 +01:00
parent 8a9c7996ed
commit c8da6fe89f
12 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libtuxtxt/teletext.h
View File

@@ -6,7 +6,7 @@ int tuxtxt_init();
void tuxtxt_close(); void tuxtxt_close();
void tuxtxt_start(int tpid, int source = 0); // Start caching void tuxtxt_start(int tpid, int source = 0); // Start caching
int tuxtxt_stop(); // Stop caching int tuxtxt_stop(); // Stop caching
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
int tuxtx_main(int pid, int page = 0, int source = 0, bool _isEplayer = false); int tuxtx_main(int pid, int page = 0, int source = 0, bool _isEplayer = false);
#else #else
int tuxtx_main(int pid, int page = 0, int source = 0); int tuxtx_main(int pid, int page = 0, int source = 0);

50
lib/libtuxtxt/tuxtxt.cpp
View File

@@ -29,7 +29,7 @@
#define KEY_TTZOOM KEY_FN_2 #define KEY_TTZOOM KEY_FN_2
#define KEY_REVEAL KEY_FN_D #define KEY_REVEAL KEY_FN_D
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
#define MARK_FB(a, b, c, d) if (p == lfb) CFrameBuffer::getInstance()->mark(a, b, (a) + (c), (b) + (d)) #define MARK_FB(a, b, c, d) if (p == lfb) CFrameBuffer::getInstance()->mark(a, b, (a) + (c), (b) + (d))
#else #else
#define MARK_FB(a, b, c, d) #define MARK_FB(a, b, c, d)
@@ -44,7 +44,7 @@ static int ttx_req_pause;
static int sub_pid, sub_page; static int sub_pid, sub_page;
static bool use_gui; static bool use_gui;
static int cfg_national_subset; static int cfg_national_subset;
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
bool isTtxEplayer = false; bool isTtxEplayer = false;
#endif #endif
@@ -1553,7 +1553,7 @@ void tuxtx_pause_subtitle(bool pause)
//printf("TuxTxt subtitle unpause, running %d pid %d page %d\n", reader_running, sub_pid, sub_page); //printf("TuxTxt subtitle unpause, running %d pid %d page %d\n", reader_running, sub_pid, sub_page);
ttx_paused = 0; ttx_paused = 0;
if(!reader_running && sub_pid && sub_page) if(!reader_running && sub_pid && sub_page)
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
tuxtx_main(sub_pid, sub_page, 0, isTtxEplayer); tuxtx_main(sub_pid, sub_page, 0, isTtxEplayer);
#else #else
tuxtx_main(sub_pid, sub_page); tuxtx_main(sub_pid, sub_page);
@@ -1615,7 +1615,7 @@ int tuxtx_subtitle_running(int *pid, int *page, int *running)
return ret; return ret;
} }
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
int tuxtx_main(int pid, int page, int source, bool isEplayer) int tuxtx_main(int pid, int page, int source, bool isEplayer)
#else #else
int tuxtx_main(int pid, int page, int source) int tuxtx_main(int pid, int page, int source)
@@ -1623,7 +1623,7 @@ int tuxtx_main(int pid, int page, int source)
{ {
char cvs_revision[] = "$Revision: 1.95 $"; char cvs_revision[] = "$Revision: 1.95 $";
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
if (isTtxEplayer != isEplayer) { if (isTtxEplayer != isEplayer) {
tuxtxt_stop(); tuxtxt_stop();
tuxtxt_clear_cache(); tuxtxt_clear_cache();
@@ -1653,7 +1653,7 @@ int tuxtx_main(int pid, int page, int source)
CFrameBuffer *fbp = CFrameBuffer::getInstance(); CFrameBuffer *fbp = CFrameBuffer::getInstance();
lfb = fbp->getFrameBufferPointer(); lfb = fbp->getFrameBufferPointer();
lbb = fbp->getBackBufferPointer(); lbb = fbp->getBackBufferPointer();
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
fb_pixel_t old_border_color = fbp->getBorderColor(); fb_pixel_t old_border_color = fbp->getBorderColor();
#endif #endif
@@ -1848,7 +1848,7 @@ int tuxtx_main(int pid, int page, int source)
/* update page or timestring and lcd */ /* update page or timestring and lcd */
RenderPage(); RenderPage();
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
fbp->blit(); fbp->blit();
#endif #endif
} while ((RCCode != RC_HOME) && (RCCode != RC_STANDBY)); } while ((RCCode != RC_HOME) && (RCCode != RC_STANDBY));
@@ -1862,7 +1862,7 @@ int tuxtx_main(int pid, int page, int source)
if ( initialized ) if ( initialized )
tuxtxt_close(); tuxtxt_close();
#endif #endif
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
fbp->setBorderColor(old_border_color); fbp->setBorderColor(old_border_color);
#endif #endif
@@ -2319,7 +2319,7 @@ void CleanUp()
******************************************************************************/ ******************************************************************************/
int GetTeletextPIDs() int GetTeletextPIDs()
{ {
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
if (isTtxEplayer) if (isTtxEplayer)
return 0; return 0;
#endif #endif
@@ -2336,7 +2336,7 @@ int GetTeletextPIDs()
unsigned char mask[DMX_FILTER_SIZE] = { 0 }; unsigned char mask[DMX_FILTER_SIZE] = { 0 };
int res; int res;
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
cDemux * dmx = new cDemux(0); // live demux cDemux * dmx = new cDemux(0); // live demux
#else #else
cDemux * dmx = new cDemux(1); cDemux * dmx = new cDemux(1);
@@ -3401,7 +3401,7 @@ void ConfigMenu(int Init)
break; break;
} }
} }
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
CopyBB2FB(); CopyBB2FB();
#endif #endif
UpdateLCD(); /* update number of cached pages */ UpdateLCD(); /* update number of cached pages */
@@ -3696,7 +3696,7 @@ void PageCatching()
RCCode = -1; RCCode = -1;
return; return;
} }
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
CopyBB2FB(); CopyBB2FB();
#endif #endif
UpdateLCD(); UpdateLCD();
@@ -3853,14 +3853,14 @@ void RenderCatchedPage()
if (zoommode == 1 && catch_row > 11) if (zoommode == 1 && catch_row > 11)
{ {
zoommode = 2; zoommode = 2;
#if !HAVE_SPARK_HARDWARE && !HAVE_DUCKBOX_HARDWARE #if !HAVE_SPARK_HARDWARE
CopyBB2FB(); CopyBB2FB();
#endif #endif
} }
else if (zoommode == 2 && catch_row < 12) else if (zoommode == 2 && catch_row < 12)
{ {
zoommode = 1; zoommode = 1;
#if !HAVE_SPARK_HARDWARE && !HAVE_DUCKBOX_HARDWARE #if !HAVE_SPARK_HARDWARE
CopyBB2FB(); CopyBB2FB();
#endif #endif
} }
@@ -3885,7 +3885,7 @@ void RenderCatchedPage()
RenderCharFB(page_char[catch_row*40 + catch_col ], &a0); RenderCharFB(page_char[catch_row*40 + catch_col ], &a0);
RenderCharFB(page_char[catch_row*40 + catch_col + 1], &a1); RenderCharFB(page_char[catch_row*40 + catch_col + 1], &a1);
RenderCharFB(page_char[catch_row*40 + catch_col + 2], &a2); RenderCharFB(page_char[catch_row*40 + catch_col + 2], &a2);
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
CopyBB2FB(); CopyBB2FB();
#endif #endif
} }
@@ -3996,7 +3996,7 @@ void SwitchScreenMode(int newscreenmode)
setfontwidth(fw); setfontwidth(fw);
CFrameBuffer *f = CFrameBuffer::getInstance(); CFrameBuffer *f = CFrameBuffer::getInstance();
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
if (!boxed && (f->get3DMode() == CFrameBuffer::Mode3D_off)) if (!boxed && (f->get3DMode() == CFrameBuffer::Mode3D_off))
videoDecoder->Pig(tx, ty, tw, th, videoDecoder->Pig(tx, ty, tw, th,
f->getScreenWidth(true), f->getScreenHeight(true), f->getScreenWidth(true), f->getScreenHeight(true),
@@ -4893,7 +4893,7 @@ void RenderChar(int Char, tstPageAttr *Attribute, int zoom, int yoffset)
void RenderCharFB(int Char, tstPageAttr *Attribute) void RenderCharFB(int Char, tstPageAttr *Attribute)
{ {
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
if (zoommode != 2) if (zoommode != 2)
RenderCharBB(Char, Attribute); RenderCharBB(Char, Attribute);
#else #else
@@ -5051,7 +5051,7 @@ void RenderMessage(int Message)
for (byte = 0; byte < 38; byte++) for (byte = 0; byte < 38; byte++)
RenderCharFB(message_6[byte], &atrtable[imenuatr + 2]); RenderCharFB(message_6[byte], &atrtable[imenuatr + 2]);
national_subset = national_subset_back; national_subset = national_subset_back;
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
CFrameBuffer::getInstance()->blit(); CFrameBuffer::getInstance()->blit();
#endif #endif
} }
@@ -5163,7 +5163,7 @@ void DoFlashing(int startrow)
} }
PosY += fontheight*factor; PosY += fontheight*factor;
} }
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
CopyBB2FB(); CopyBB2FB();
#endif #endif
} }
@@ -5375,7 +5375,7 @@ void RenderPage()
RenderCharFB(ns[0],&atrtable[ATR_WB]); RenderCharFB(ns[0],&atrtable[ATR_WB]);
RenderCharFB(ns[1],&atrtable[ATR_WB]); RenderCharFB(ns[1],&atrtable[ATR_WB]);
RenderCharFB(ns[2],&atrtable[ATR_WB]); RenderCharFB(ns[2],&atrtable[ATR_WB]);
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
CopyBB2FB(); CopyBB2FB();
#endif #endif
@@ -5595,7 +5595,7 @@ void CopyBB2FB()
{ {
fb_pixel_t *src, *dst, *topsrc; fb_pixel_t *src, *dst, *topsrc;
int fillcolor, i, screenwidth, swtmp; int fillcolor, i, screenwidth, swtmp;
#if HAVE_SPARK_HARDWARE || HAVE_COOL_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE || HAVE_COOL_HARDWARE
CFrameBuffer *f = CFrameBuffer::getInstance(); CFrameBuffer *f = CFrameBuffer::getInstance();
#endif #endif
@@ -5606,7 +5606,7 @@ void CopyBB2FB()
/* copy backbuffer to framebuffer */ /* copy backbuffer to framebuffer */
if (!zoommode) if (!zoommode)
{ {
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
f->blit2FB(lbb, var_screeninfo.xres, var_screeninfo.yres, 0, 0, 0, 0, true); f->blit2FB(lbb, var_screeninfo.xres, var_screeninfo.yres, 0, 0, 0, 0, true);
#elif HAVE_COOL_HARDWARE #elif HAVE_COOL_HARDWARE
f->fbCopyArea(var_screeninfo.xres, var_screeninfo.yres, 0, 0, 0, var_screeninfo.yres); f->fbCopyArea(var_screeninfo.xres, var_screeninfo.yres, 0, 0, 0, var_screeninfo.yres);
@@ -5629,7 +5629,7 @@ void CopyBB2FB()
FillBorder(*lbb, true); FillBorder(*lbb, true);
// ClearBB(*(lfb + var_screeninfo.xres * var_screeninfo.yoffset)); // ClearBB(*(lfb + var_screeninfo.xres * var_screeninfo.yoffset));
} }
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
f->blit(); f->blit();
#endif #endif
@@ -5660,7 +5660,7 @@ void CopyBB2FB()
if (screenmode == 1) if (screenmode == 1)
{ {
screenwidth = ( TV43STARTX ); screenwidth = ( TV43STARTX );
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
int cx = var_screeninfo.xres - TV43STARTX; /* x start */ int cx = var_screeninfo.xres - TV43STARTX; /* x start */
int cw = TV43STARTX; /* width */ int cw = TV43STARTX; /* width */
int cy = StartY; int cy = StartY;
@@ -5705,7 +5705,7 @@ void CopyBB2FB()
for (swtmp=0; swtmp<= screenwidth;swtmp++) for (swtmp=0; swtmp<= screenwidth;swtmp++)
*(dst + stride * (fontheight + i) + swtmp) = bgra[fillcolor]; *(dst + stride * (fontheight + i) + swtmp) = bgra[fillcolor];
} }
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
f->mark(0, 0, var_screeninfo.xres, var_screeninfo.yres); f->mark(0, 0, var_screeninfo.xres, var_screeninfo.yres);
f->blit(); f->blit();
#endif #endif

18
lib/libtuxtxt/tuxtxt_common.h
View File

@@ -571,7 +571,7 @@ void tuxtxt_allocate_cache(int magazine)
pthread_mutex_unlock(&tuxtxt_cache_lock); pthread_mutex_unlock(&tuxtxt_cache_lock);
} }
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
/****************************************************************************** /******************************************************************************
* Handling of packets injected by libeplayer3 * * Handling of packets injected by libeplayer3 *
******************************************************************************/ ******************************************************************************/
@@ -663,7 +663,7 @@ static bool read_injected_packet(unsigned char * &packet, int &size, int timeout
/****************************************************************************** /******************************************************************************
* CacheThread * * CacheThread *
******************************************************************************/ ******************************************************************************/
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
extern bool isTtxEplayer; extern bool isTtxEplayer;
#endif #endif
static int stop_cache = 0; static int stop_cache = 0;
@@ -680,7 +680,7 @@ void *tuxtxt_CacheThread(void * /*arg*/)
0x30,0xb0,0x70,0xf0 }; 0x30,0xb0,0x70,0xf0 };
unsigned char pes_packet_dmx[184*20]; unsigned char pes_packet_dmx[184*20];
unsigned char *pes_packet_ptr = NULL; unsigned char *pes_packet_ptr = NULL;
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
unsigned char *pes_packet_eplayer3 = NULL; unsigned char *pes_packet_eplayer3 = NULL;
#endif #endif
unsigned char vtxt_row[42]; unsigned char vtxt_row[42];
@@ -692,7 +692,7 @@ void *tuxtxt_CacheThread(void * /*arg*/)
unsigned char pagedata[9][23*40]; unsigned char pagedata[9][23*40];
tstPageinfo *pageinfo_thread; tstPageinfo *pageinfo_thread;
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
sem_init(&inject_sem, 0, 0); sem_init(&inject_sem, 0, 0);
#endif #endif
set_threadname("tuxtxt:cache"); set_threadname("tuxtxt:cache");
@@ -710,7 +710,7 @@ void *tuxtxt_CacheThread(void * /*arg*/)
/* read packet */ /* read packet */
ssize_t readcnt = 0; ssize_t readcnt = 0;
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
if (isTtxEplayer) { if (isTtxEplayer) {
pes_packet_ptr = NULL; pes_packet_ptr = NULL;
if (pes_packet_eplayer3) { if (pes_packet_eplayer3) {
@@ -1188,7 +1188,7 @@ void *tuxtxt_CacheThread(void * /*arg*/)
} }
pthread_mutex_unlock(&tuxtxt_cache_biglock); pthread_mutex_unlock(&tuxtxt_cache_biglock);
} }
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
if (pes_packet_eplayer3) if (pes_packet_eplayer3)
free(pes_packet_eplayer3); free(pes_packet_eplayer3);
#endif #endif
@@ -1205,14 +1205,14 @@ int tuxtxt_start_thread(int source)
return 0; return 0;
tuxtxt_cache.thread_starting = 1; tuxtxt_cache.thread_starting = 1;
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
if (!isTtxEplayer) { if (!isTtxEplayer) {
#endif #endif
tuxtxt_init_demuxer(source); tuxtxt_init_demuxer(source);
dmx->pesFilter(tuxtxt_cache.vtxtpid); dmx->pesFilter(tuxtxt_cache.vtxtpid);
dmx->Start(); dmx->Start();
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
} }
#endif #endif
stop_cache = 0; stop_cache = 0;
@@ -1260,7 +1260,7 @@ int tuxtxt_stop_thread()
delete dmx; delete dmx;
dmx = NULL; dmx = NULL;
} }
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
clear_inject_queue(); clear_inject_queue();
#endif #endif
#if 1//TUXTXT_DEBUG #if 1//TUXTXT_DEBUG

6
src/driver/fade.cpp
View File

@@ -58,7 +58,7 @@ void COSDFader::StartFadeIn()
frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha frameBuffer->setBlendMode(2); // Global alpha multiplied with pixel alpha
frameBuffer->setBlendLevel(fadeValue); 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); usleep(60000);
#endif #endif
fadeTimer = g_RCInput->addTimer( FADE_TIME, false ); fadeTimer = g_RCInput->addTimer( FADE_TIME, false );
@@ -86,7 +86,7 @@ void COSDFader::StopFade()
if ( fadeIn || fadeOut ) { if ( fadeIn || fadeOut ) {
g_RCInput->killTimer(fadeTimer); g_RCInput->killTimer(fadeTimer);
frameBuffer->setBlendMode(1); // Global alpha multiplied with pixel alpha 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); usleep(60000);
#endif #endif
fadeIn = fadeOut = false; fadeIn = fadeOut = false;
@@ -113,7 +113,7 @@ bool COSDFader::FadeDone()
g_RCInput->killTimer (fadeTimer); g_RCInput->killTimer (fadeTimer);
fadeIn = false; fadeIn = false;
frameBuffer->setBlendMode(1); // Global alpha multiplied with pixel alpha 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); usleep(60000);
#endif #endif
} else } else

6
src/driver/radiotext.cpp
View File

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

12
src/driver/screenshot.cpp
View File

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

2
src/driver/screenshot.h
View File

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

10
src/gui/audio_select.cpp
View File

@@ -70,7 +70,7 @@ CAudioSelectMenuHandler::~CAudioSelectMenuHandler()
} }
#if !HAVE_SPARK_HARDWARE && !HAVE_DUCKBOX_HARDWARE #if !HAVE_SPARK_HARDWARE
// -- this is a copy from neutrino.cpp!! // -- this is a copy from neutrino.cpp!!
#define AUDIOMENU_ANALOGOUT_OPTION_COUNT 3 #define AUDIOMENU_ANALOGOUT_OPTION_COUNT 3
const CMenuOptionChooser::keyval AUDIOMENU_ANALOGOUT_OPTIONS[AUDIOMENU_ANALOGOUT_OPTION_COUNT] = const CMenuOptionChooser::keyval AUDIOMENU_ANALOGOUT_OPTIONS[AUDIOMENU_ANALOGOUT_OPTION_COUNT] =
@@ -103,7 +103,7 @@ int CAudioSelectMenuHandler::exec(CMenuTarget* parent, const std::string &action
} }
perc_str[sel] = to_string(perc_val[sel]) + "%"; perc_str[sel] = to_string(perc_val[sel]) + "%";
#if !HAVE_SPARK_HARDWARE && !HAVE_DUCKBOX_HARDWARE #if !HAVE_SPARK_HARDWARE
int vol = CZapit::getInstance()->GetVolume(); int vol = CZapit::getInstance()->GetVolume();
/* keep resulting volume = (vol * percent)/100 not more than 115 */ /* keep resulting volume = (vol * percent)/100 not more than 115 */
if (vol * perc_val[sel] > 11500) if (vol * perc_val[sel] > 11500)
@@ -150,7 +150,7 @@ int CAudioSelectMenuHandler::doMenu ()
AudioSelector->addKey(CRCInput::RC_right, this, "+"); AudioSelector->addKey(CRCInput::RC_right, this, "+");
AudioSelector->addKey(CRCInput::RC_left, this, "-"); AudioSelector->addKey(CRCInput::RC_left, this, "-");
AudioSelector->addKey(CRCInput::RC_red, this, "x"); AudioSelector->addKey(CRCInput::RC_red, this, "x");
#if !HAVE_SPARK_HARDWARE && !HAVE_DUCKBOX_HARDWARE #if !HAVE_SPARK_HARDWARE
AudioSelector->addKey(CRCInput::RC_green, this, "x"); AudioSelector->addKey(CRCInput::RC_green, this, "x");
#endif #endif
AudioSelector->addKey(CRCInput::RC_yellow, this, "x"); AudioSelector->addKey(CRCInput::RC_yellow, this, "x");
@@ -192,7 +192,7 @@ int CAudioSelectMenuHandler::doMenu ()
AudioSelector->addItem(fw, sel_apid == i); AudioSelector->addItem(fw, sel_apid == i);
} }
unsigned int shortcut_num = p_count; unsigned int shortcut_num = p_count;
#if !HAVE_SPARK_HARDWARE && !HAVE_DUCKBOX_HARDWARE #if !HAVE_SPARK_HARDWARE
if (p_count) if (p_count)
AudioSelector->addItem(GenericMenuSeparatorLine); AudioSelector->addItem(GenericMenuSeparatorLine);
@@ -298,7 +298,7 @@ int CAudioSelectMenuHandler::doMenu ()
//tonbug //tonbug
AudioSelector->addItem(GenericMenuSeparatorLine); AudioSelector->addItem(GenericMenuSeparatorLine);
#if !HAVE_SPARK_HARDWARE && !HAVE_DUCKBOX_HARDWARE #if !HAVE_SPARK_HARDWARE
AudioSelector->addItem(new CMenuForwarder(LOCALE_CI_RESET, true, NULL, CNeutrinoApp::getInstance(), "tonbug", CRCInput::convertDigitToKey(++shortcut_num))); AudioSelector->addItem(new CMenuForwarder(LOCALE_CI_RESET, true, NULL, CNeutrinoApp::getInstance(), "tonbug", CRCInput::convertDigitToKey(++shortcut_num)));
#else #else
AudioSelector->addItem(new CMenuForwarder(LOCALE_CI_RESET, true, NULL, CNeutrinoApp::getInstance(), "tonbug", CRCInput::RC_green)); AudioSelector->addItem(new CMenuForwarder(LOCALE_CI_RESET, true, NULL, CNeutrinoApp::getInstance(), "tonbug", CRCInput::RC_green));

36
src/gui/movieplayer.cpp
View File

@@ -89,7 +89,7 @@ bool glcd_play = false;
#include <gui/widget/stringinput_ext.h> #include <gui/widget/stringinput_ext.h>
#include <gui/screensetup.h> #include <gui/screensetup.h>
#include <gui/widget/msgbox.h> #include <gui/widget/msgbox.h>
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#endif #endif
@@ -1379,19 +1379,19 @@ bool CMoviePlayerGui::PlayFileStart(void)
duration = p_movie_info->length * 60 * 1000; duration = p_movie_info->length * 60 * 1000;
int percent = CZapit::getInstance()->GetPidVolume(p_movie_info->channelId, currentapid, currentac3 == 1); int percent = CZapit::getInstance()->GetPidVolume(p_movie_info->channelId, currentapid, currentac3 == 1);
CZapit::getInstance()->SetVolumePercent(percent); CZapit::getInstance()->SetVolumePercent(percent);
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
CScreenSetup cSS; CScreenSetup cSS;
cSS.showBorder(p_movie_info->epgId); cSS.showBorder(p_movie_info->epgId);
#endif #endif
} else { } else {
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
CScreenSetup cSS; CScreenSetup cSS;
cSS.showBorder(0); cSS.showBorder(0);
#endif #endif
} }
file_prozent = 0; file_prozent = 0;
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
old3dmode = frameBuffer->get3DMode(); old3dmode = frameBuffer->get3DMode();
#endif #endif
#ifdef ENABLE_GRAPHLCD #ifdef ENABLE_GRAPHLCD
@@ -1456,7 +1456,7 @@ bool CMoviePlayerGui::PlayFileStart(void)
repeat_mode = (repeat_mode_enum) g_settings.movieplayer_repeat_on; repeat_mode = (repeat_mode_enum) g_settings.movieplayer_repeat_on;
playstate = CMoviePlayerGui::PLAY; playstate = CMoviePlayerGui::PLAY;
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true); CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true);
#if HAVE_DUCKBOX_HARDWARE || HAVE_SPARK_HARDWARE #if HAVE_SPARK_HARDWARE
CVFD::getInstance()->ShowIcon(FP_ICON_FR, false); CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FF, false); CVFD::getInstance()->ShowIcon(FP_ICON_FF, false);
CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false); CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false);
@@ -1488,7 +1488,7 @@ bool CMoviePlayerGui::PlayFileStart(void)
if (g_settings.timeshift_pause) if (g_settings.timeshift_pause)
{ {
playstate = CMoviePlayerGui::PAUSE; playstate = CMoviePlayerGui::PAUSE;
#if HAVE_DUCKBOX_HARDWARE || HAVE_SPARK_HARDWARE #if HAVE_SPARK_HARDWARE
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, false); CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FR, false); CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FF, false); CVFD::getInstance()->ShowIcon(FP_ICON_FF, false);
@@ -1814,7 +1814,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
repeat_mode = REPEAT_OFF; repeat_mode = REPEAT_OFF;
g_settings.movieplayer_repeat_on = repeat_mode; g_settings.movieplayer_repeat_on = repeat_mode;
callInfoViewer(); callInfoViewer();
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
} else if (msg == (neutrino_msg_t) g_settings.mpkey_next3dmode) { } else if (msg == (neutrino_msg_t) g_settings.mpkey_next3dmode) {
frameBuffer->set3DMode((CFrameBuffer::Mode3D)(((frameBuffer->get3DMode()) + 1) % CFrameBuffer::Mode3D_SIZE)); frameBuffer->set3DMode((CFrameBuffer::Mode3D)(((frameBuffer->get3DMode()) + 1) % CFrameBuffer::Mode3D_SIZE));
#endif #endif
@@ -1830,7 +1830,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
FileTimeOSD->setMpTimeForced(false); FileTimeOSD->setMpTimeForced(false);
if (playstate > CMoviePlayerGui::PLAY) { if (playstate > CMoviePlayerGui::PLAY) {
playstate = CMoviePlayerGui::PLAY; playstate = CMoviePlayerGui::PLAY;
#if HAVE_DUCKBOX_HARDWARE || HAVE_SPARK_HARDWARE #if HAVE_SPARK_HARDWARE
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true); CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true);
CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false); CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FR, false); CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
@@ -1875,7 +1875,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
if (playstate == CMoviePlayerGui::PAUSE) { if (playstate == CMoviePlayerGui::PAUSE) {
playstate = CMoviePlayerGui::PLAY; playstate = CMoviePlayerGui::PLAY;
//CVFD::getInstance()->ShowIcon(VFD_ICON_PAUSE, false); //CVFD::getInstance()->ShowIcon(VFD_ICON_PAUSE, false);
#if HAVE_DUCKBOX_HARDWARE || HAVE_SPARK_HARDWARE #if HAVE_SPARK_HARDWARE
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true); CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true);
CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false); CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FR, false); CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
@@ -1886,7 +1886,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
} else { } else {
playstate = CMoviePlayerGui::PAUSE; playstate = CMoviePlayerGui::PAUSE;
//CVFD::getInstance()->ShowIcon(VFD_ICON_PAUSE, true); //CVFD::getInstance()->ShowIcon(VFD_ICON_PAUSE, true);
#if HAVE_DUCKBOX_HARDWARE || HAVE_SPARK_HARDWARE #if HAVE_SPARK_HARDWARE
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, false); CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, false);
CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, true); CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, true);
CVFD::getInstance()->ShowIcon(FP_ICON_FR, false); CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
@@ -1932,7 +1932,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
bool setSpeed = false; bool setSpeed = false;
if (msg == (neutrino_msg_t) g_settings.mpkey_rewind) { if (msg == (neutrino_msg_t) g_settings.mpkey_rewind) {
newspeed = (speed >= 0) ? -1 : (speed - 1); newspeed = (speed >= 0) ? -1 : (speed - 1);
#if HAVE_DUCKBOX_HARDWARE || HAVE_SPARK_HARDWARE #if HAVE_SPARK_HARDWARE
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true); CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true);
CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false); CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FR, true); CVFD::getInstance()->ShowIcon(FP_ICON_FR, true);
@@ -1940,7 +1940,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
#endif #endif
} else { } else {
newspeed = (speed <= 0) ? 2 : (speed + 1); newspeed = (speed <= 0) ? 2 : (speed + 1);
#if HAVE_DUCKBOX_HARDWARE || HAVE_SPARK_HARDWARE #if HAVE_SPARK_HARDWARE
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true); CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, true);
CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false); CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FR, false); CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
@@ -2055,7 +2055,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
#if 0 #if 0
clearSubtitle(); clearSubtitle();
#endif #endif
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
} else if (msg == CRCInput::RC_text) { } else if (msg == CRCInput::RC_text) {
int pid = playback->GetFirstTeletextPid(); int pid = playback->GetFirstTeletextPid();
if (pid > -1) { if (pid > -1) {
@@ -2194,7 +2194,7 @@ void CMoviePlayerGui::PlayFileEnd(bool restore)
playback->SetSpeed(1); playback->SetSpeed(1);
playback->Close(); playback->Close();
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
frameBuffer->set3DMode(old3dmode); frameBuffer->set3DMode(old3dmode);
CScreenSetup cSS; CScreenSetup cSS;
cSS.showBorder(CZapit::getInstance()->GetCurrentChannelID()); cSS.showBorder(CZapit::getInstance()->GetCurrentChannelID());
@@ -2213,7 +2213,7 @@ void CMoviePlayerGui::PlayFileEnd(bool restore)
CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, false); CVFD::getInstance()->ShowIcon(FP_ICON_PLAY, false);
CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false); CVFD::getInstance()->ShowIcon(FP_ICON_PAUSE, false);
#if HAVE_DUCKBOX_HARDWARE || HAVE_SPARK_HARDWARE #if HAVE_SPARK_HARDWARE
CVFD::getInstance()->ShowIcon(FP_ICON_FR, false); CVFD::getInstance()->ShowIcon(FP_ICON_FR, false);
CVFD::getInstance()->ShowIcon(FP_ICON_FF, false); CVFD::getInstance()->ShowIcon(FP_ICON_FF, false);
#endif #endif
@@ -2799,7 +2799,7 @@ void CMoviePlayerGui::UpdatePosition()
void CMoviePlayerGui::StopSubtitles(bool enable_glcd_mirroring __attribute__((unused))) void CMoviePlayerGui::StopSubtitles(bool enable_glcd_mirroring __attribute__((unused)))
{ {
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
printf("[CMoviePlayerGui] %s\n", __FUNCTION__); printf("[CMoviePlayerGui] %s\n", __FUNCTION__);
int ttx, ttxpid, ttxpage; int ttx, ttxpid, ttxpage;
@@ -2850,7 +2850,7 @@ void CMoviePlayerGui::showHelp()
void CMoviePlayerGui::StartSubtitles(bool show __attribute__((unused))) void CMoviePlayerGui::StartSubtitles(bool show __attribute__((unused)))
{ {
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
printf("[CMoviePlayerGui] %s: %s\n", __FUNCTION__, show ? "Show" : "Not show"); printf("[CMoviePlayerGui] %s: %s\n", __FUNCTION__, show ? "Show" : "Not show");
#ifdef ENABLE_GRAPHLCD #ifdef ENABLE_GRAPHLCD
nGLCD::MirrorOSD(false); nGLCD::MirrorOSD(false);
@@ -3537,7 +3537,7 @@ void CMoviePlayerGui::makeScreenShot(bool autoshot, bool forcover)
sc->SetSize(w, h); sc->SetSize(w, h);
} }
} }
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
sc->Start("-r 320 -j 75"); sc->Start("-r 320 -j 75");
#else #else
sc->Start(); sc->Start();

2
src/gui/movieplayer.h
View File

@@ -183,7 +183,7 @@ class CMoviePlayerGui : public CMenuTarget
MI_MOVIE_INFO movie_info; MI_MOVIE_INFO movie_info;
P_MI_MOVIE_LIST milist; P_MI_MOVIE_LIST milist;
const static short MOVIE_HINT_BOX_TIMER = 5; // time to show bookmark hints in seconds const static short MOVIE_HINT_BOX_TIMER = 5; // time to show bookmark hints in seconds
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
CFrameBuffer::Mode3D old3dmode; CFrameBuffer::Mode3D old3dmode;
#endif #endif

2
src/system/setting_helpers.cpp
View File

@@ -504,7 +504,7 @@ printf("CSubtitleChangeExec::exec: TTX, pid %x page %x lang %s\n", pid, page, pt
playback->SetSubtitlePid(0); playback->SetSubtitlePid(0);
playback->SetTeletextPid(pid); playback->SetTeletextPid(pid);
tuxtx_set_pid(pid, page, ptr); tuxtx_set_pid(pid, page, ptr);
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
tuxtx_main(pid, page, 0, true); tuxtx_main(pid, page, 0, true);
#else #else
tuxtx_main(pid, page, 0); tuxtx_main(pid, page, 0);

2
src/system/setting_helpers.h
View File

@@ -37,7 +37,7 @@
#include <gui/widget/menue.h> #include <gui/widget/menue.h>
#include <zapit/client/zapittypes.h> #include <zapit/client/zapittypes.h>
#include <playback.h> #include <playback.h>
#if HAVE_SPARK_HARDWARE || HAVE_DUCKBOX_HARDWARE #if HAVE_SPARK_HARDWARE
#include <audio.h> #include <audio.h>
#endif #endif