1 diff -u libs/libtuxtxt_orig/libtuxtxt.c libs/libtuxtxt/libtuxtxt.c
2 --- libs/libtuxtxt_orig/libtuxtxt.c 2009-01-29 21:21:08.000000000 +0100
3 +++ libs/libtuxtxt/libtuxtxt.c 2009-01-29 21:26:49.000000000 +0100
5 tuxtxt_cache.thread_id = 0;
7 pthread_mutex_unlock(&tuxtxt_control_lock);
9 +#if HAVE_DVB_API_VERSION < 3
10 + strcpy(tuxtxt_cache.demux, "/dev/dvb/card0/demux0");
12 + strcpy(tuxtxt_cache.demux, "/dev/dvb/adapter0/demux0");
15 return 1;//tuxtxt_init_demuxer();
19 pthread_mutex_unlock(&tuxtxt_control_lock);
22 -int tuxtxt_start(int tpid)
23 +int tuxtxt_start(int tpid, int demux)
26 pthread_mutex_lock(&tuxtxt_control_lock);
29 tuxtxt_cache.page = 0x100;
30 tuxtxt_cache.vtxtpid = tpid;
33 +#if HAVE_DVB_API_VERSION < 3
34 + snprintf(tuxtxt_cache.demux, 64, "/dev/dvb/card0/demux%d", demux);
36 + snprintf(tuxtxt_cache.demux, 64, "/dev/dvb/adapter0/demux%d", demux);
39 ret = tuxtxt_start_thread();
41 else if (!tuxtxt_cache.thread_starting && !tuxtxt_cache.receiving)
45 +#if HAVE_DVB_API_VERSION < 3
46 + snprintf(tuxtxt_cache.demux, 64, "/dev/dvb/card0/demux%d", demux);
48 + snprintf(tuxtxt_cache.demux, 64, "/dev/dvb/adapter0/demux%d", demux);
51 ret = tuxtxt_start_thread();
53 pthread_mutex_unlock(&tuxtxt_control_lock);
54 diff -u libs/libtuxtxt_orig/tuxtxt_common.h libs/libtuxtxt/tuxtxt_common.h
55 --- libs/libtuxtxt_orig/tuxtxt_common.h 2009-01-29 21:24:32.000000000 +0100
56 +++ libs/libtuxtxt/tuxtxt_common.h 2009-01-29 21:26:49.000000000 +0100
58 if (tuxtxt_cache.dmx != -1)
60 ioctl(tuxtxt_cache.dmx, DMX_STOP);
61 -// close(tuxtxt_cache.dmx);
63 -// tuxtxt_cache.dmx = -1;
64 + close(tuxtxt_cache.dmx);
66 + tuxtxt_cache.dmx = -1;
68 printf("TuxTxt stopped service %x\n", tuxtxt_cache.vtxtpid);
70 diff -u libs/libtuxtxt_orig/tuxtxt_def.h libs/libtuxtxt/tuxtxt_def.h
71 --- libs/libtuxtxt_orig/tuxtxt_def.h 2009-01-29 21:19:23.000000000 +0100
72 +++ libs/libtuxtxt/tuxtxt_def.h 2009-01-29 21:26:49.000000000 +0100
74 #define pes_type pesType
75 #define dmx_sct_filter_params dmxSctFilterParams
77 - #define DMX "/dev/dvb/card0/demux0"
79 #include <linux/dvb/dmx.h>
80 - #define DMX "/dev/dvb/adapter0/demux0"
83 +#define DMX tuxtxt_cache.demux
86 #include FT_FREETYPE_H
89 short flofpages[0x900][FLOFSIZE];
90 unsigned char adip[0x900][13];
91 unsigned char subpagetable[0x900];
95 int cached_pages, page, subpage, pageupdate,page_receiving, current_page[9], current_subpage[9];