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

- TRIPLEDRAGON: deleted

Browse Source 
Conflicts:
	lib/libdvbsub/dvbsub.cpp
	src/system/flashtool.cpp
This commit is contained in:
max_10
2020-10-03 22:47:34 +02:00
committed by Thilo Graf
parent fa91372706
commit 1fa824cab3
26 changed files with 22 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libdvbsub/dvbsub.cpp
View File

@@ -243,8 +243,8 @@ static void* reader_thread(void * /*arg*/)
bool bad_startcode = false;
set_threadname("dvbsub:reader");
dmx = new cDemux(0);
dmx->Open(DMX_PES_CHANNEL, NULL, 64*1024);
dmx = new cDemux(0);
dmx->Open(DMX_PES_CHANNEL, NULL, 64*1024);
while (reader_running) {
if(dvbsub_stopped /*dvbsub_paused*/) {

7
lib/libtuxtxt/tuxtxt.h
View File

@@ -173,16 +173,9 @@ int tv_pip_y;
#define RC_TTTV CRCInput::RC_tttv
#define RC_TTZOOM CRCInput::RC_ttzoom
#define RC_TTREVEAL CRCInput::RC_ttreveal
#if HAVE_TRIPLEDRAGON
/* td has more keys so use ttx key for switching split mode... */
#define RC_SPLIT CRCInput::RC_text
/* rc_text is now unused */
#define RC_TEXT (CRCInput::RC_MaxRC + 1)
#else
/* ...while other receivers use the vol- key for that, so rc_split is unused */
#define RC_SPLIT (CRCInput::RC_MaxRC + 1)
#define RC_TEXT CRCInput::RC_text
#endif
typedef enum /* object type */
{