1 --- tuxtxt-org/tuxtxt.c 2010-02-10 20:48:39.000000000 +0100
2 +++ tuxtxt/tuxtxt.c 2010-02-10 20:52:39.000000000 +0100
5 char cvs_revision[] = "$Revision: 1.108 $";
10 #if !TUXTXT_CFG_STANDALONE
13 tuxtxt_SetRenderingDefaults(&renderinfo);
15 - tuxtxt_cache.vtxtpid = renderinfo.fb = lcd = renderinfo.sx = renderinfo.ex = renderinfo.sy = renderinfo.ey = -1;
16 + tuxtxt_cache.vtxtpid = 0;
17 + renderinfo.fb = lcd = renderinfo.sx = renderinfo.ex = renderinfo.sy = renderinfo.ey = -1;
20 - printf("\nUSAGE: tuxtxt vtpid\n");
21 - printf("No PID given, so scanning for PIDs ...\n\n");
22 - tuxtxt_cache.vtxtpid=0;
23 + printf("\nUSAGE: tuxtxt [demux] [vtpid]\n");
24 + printf("No Demux and PID given, so using demux0 and scanning for PIDs ...\n\n");
29 - tuxtxt_cache.vtxtpid = atoi(argv[1]);
30 + demux = atoi(argv[1]);
32 + tuxtxt_cache.vtxtpid = atoi(argv[2]);
35 + printf("\nUSAGE: tuxtxt [demux] [vtpid]\n");
36 + printf("No PID given, so scanning for PIDs ...\n\n");
40 +#if HAVE_DVB_API_VERSION < 3
41 + snprintf(tuxtxt_cache.demux, 64, "/dev/dvb/card0/demux%d", demux);
43 + snprintf(tuxtxt_cache.demux, 64, "/dev/dvb/adapter0/demux%d", demux);
46 /* open Framebuffer */
47 if ((renderinfo.fb=open("/dev/fb/0", O_RDWR)) == -1)
50 tuxtxt_init_demuxer();
51 tuxtxt_start_thread();
53 - tuxtxt_start(tuxtxt_cache.vtxtpid);
54 + tuxtxt_start(tuxtxt_cache.vtxtpid, -1);
59 tuxtxt_cache.vtxtpid = pid_table[current_pid].vtxt_pid;
60 tuxtxt_start_thread();
62 - tuxtxt_start(pid_table[current_pid].vtxt_pid);
63 + tuxtxt_start(pid_table[current_pid].vtxt_pid, -1);
66 // tuxtxt_cache.pageupdate = 1;
67 --- tuxtxt-org/tuxtxt.h 2010-02-10 20:48:39.000000000 +0100
68 +++ tuxtxt/tuxtxt.h 2010-02-10 20:49:07.000000000 +0100
70 extern tstPageAttr tuxtxt_atrtable[];
71 extern int tuxtxt_init();
72 extern void tuxtxt_close();
73 -extern int tuxtxt_start(int tpid); // Start caching
74 +extern int tuxtxt_start(int tpid, int demux); // Start caching
75 extern int tuxtxt_stop(); // Stop caching
76 extern void tuxtxt_next_dec(int *i); /* skip to next decimal */
77 extern void tuxtxt_prev_dec(int *i); /* counting down */