X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openvuplus;a=blobdiff_plain;f=meta-openvuplus%2Frecipes-vuplus%2Ftuxtxt%2Ftuxbox-tuxtxt-32bpp%2Fallow_different_demux.diff;fp=meta-openvuplus%2Frecipes-vuplus%2Ftuxtxt%2Ftuxbox-tuxtxt-32bpp%2Fallow_different_demux.diff;h=b2881f75cdac6ccaf17c489e180a365c74bb9b57;hp=0000000000000000000000000000000000000000;hb=0e6c5d97c12ae5eb100dc835a2ec6df30c9ebb95;hpb=e56f897c120c6a2c70e6b3129dde975f92d105cc

diff --git a/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-tuxtxt-32bpp/allow_different_demux.diff b/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-tuxtxt-32bpp/allow_different_demux.diff
new file mode 100644
index 0000000..b2881f7
--- /dev/null
+++ b/meta-openvuplus/recipes-vuplus/tuxtxt/tuxbox-tuxtxt-32bpp/allow_different_demux.diff
@@ -0,0 +1,77 @@
+--- tuxtxt-org/tuxtxt.c	2010-02-10 20:48:39.000000000 +0100
++++ tuxtxt/tuxtxt.c	2010-02-10 20:52:39.000000000 +0100
+@@ -172,6 +172,7 @@
+ {
+ 	char cvs_revision[] = "$Revision: 1.108 $";
+ 
++	int demux = 0;
+ 	int cnt=0;
+ 	int rc_num = 0;
+ #if !TUXTXT_CFG_STANDALONE
+@@ -187,18 +188,31 @@
+ 
+ 	tuxtxt_SetRenderingDefaults(&renderinfo);
+ 	/* get params */
+-	tuxtxt_cache.vtxtpid = renderinfo.fb = lcd = renderinfo.sx = renderinfo.ex = renderinfo.sy = renderinfo.ey = -1;
++	tuxtxt_cache.vtxtpid = 0;
++	renderinfo.fb = lcd = renderinfo.sx = renderinfo.ex = renderinfo.sy = renderinfo.ey = -1;
+ 	if (argc==1)
+ 	{
+-		printf("\nUSAGE: tuxtxt vtpid\n");
+-		printf("No PID given, so scanning for PIDs ...\n\n");
+-		tuxtxt_cache.vtxtpid=0;
++		printf("\nUSAGE: tuxtxt [demux] [vtpid]\n");
++		printf("No Demux and PID given, so using demux0 and scanning for PIDs ...\n\n");
+ 	}
+-	else 
++	else
+ 	{
+-		tuxtxt_cache.vtxtpid = atoi(argv[1]);
++		demux = atoi(argv[1]);
++		if (argc > 2)
++			tuxtxt_cache.vtxtpid = atoi(argv[2]);
++		else
++		{
++			printf("\nUSAGE: tuxtxt [demux] [vtpid]\n");
++			printf("No PID given, so scanning for PIDs ...\n\n");
++		}
+ 	}
+ 
++#if HAVE_DVB_API_VERSION < 3
++	snprintf(tuxtxt_cache.demux, 64, "/dev/dvb/card0/demux%d", demux);
++#else
++	snprintf(tuxtxt_cache.demux, 64, "/dev/dvb/adapter0/demux%d", demux);
++#endif
++
+ 	/* open Framebuffer */
+ 	if ((renderinfo.fb=open("/dev/fb/0", O_RDWR)) == -1)
+ 	{
+@@ -616,7 +630,7 @@
+ 	tuxtxt_init_demuxer();
+ 	tuxtxt_start_thread();
+ #else
+-	tuxtxt_start(tuxtxt_cache.vtxtpid);
++	tuxtxt_start(tuxtxt_cache.vtxtpid, -1);
+ #endif
+ 
+ 
+@@ -1821,7 +1835,7 @@
+ 								tuxtxt_cache.vtxtpid = pid_table[current_pid].vtxt_pid;
+ 								tuxtxt_start_thread();
+ #else
+-								tuxtxt_start(pid_table[current_pid].vtxt_pid);
++								tuxtxt_start(pid_table[current_pid].vtxt_pid, -1);
+ #endif
+ 							}
+ //							tuxtxt_cache.pageupdate = 1;
+--- tuxtxt-org/tuxtxt.h	2010-02-10 20:48:39.000000000 +0100
++++ tuxtxt/tuxtxt.h	2010-02-10 20:49:07.000000000 +0100
+@@ -63,7 +63,7 @@
+ extern tstPageAttr tuxtxt_atrtable[];
+ extern int tuxtxt_init();
+ extern void tuxtxt_close();
+-extern int  tuxtxt_start(int tpid);  // Start caching
++extern int  tuxtxt_start(int tpid, int demux);  // Start caching
+ extern int  tuxtxt_stop(); // Stop caching
+ extern void tuxtxt_next_dec(int *i); /* skip to next decimal */
+ extern void tuxtxt_prev_dec(int *i); /* counting down */