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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: af8c4b8d97
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
This commit is contained in:
vanhofen
2017-02-12 23:01:15 +01:00
parent e97d93f824 75355dda2b
commit 999b2cf2ce
35 changed files with 111 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libtuxtxt/tuxtxt.cpp
View File

@@ -19,6 +19,7 @@
#include <dmx.h>
#include <video.h>
#include <sys/stat.h>
#include <system/set_threadname.h>
/* same as in rcinput.h... */
#define KEY_TTTV KEY_FN_1
@@ -1514,6 +1515,7 @@ static void cleanup_fb_pan()
static void* reader_thread(void * /*arg*/)
{
printf("TuxTxt subtitle thread started\n");
set_threadname("tuxtxt:reader");
reader_running = 1;
//ttx_paused = 0;
while(reader_running) {