Package: dvbstream Version: 0.6+cvs20090621-1 Severity: normal Tags: patch
dvbstream currently cannot address cards above the 4th (0-3). The enclosed patch adds support for addressing up to eight cards. The patch is an updated version of the patch submitted at https://sourceforge.net/tracker/?func=detail&aid=2611204&group_id=50669&atid=460567 *** dvbstream-8-card-0.7 --- dvbstream.c.orig 2010-11-19 21:44:28.000000000 -0800 +++ dvbstream.c 2010-11-19 22:09:46.000000000 -0800 @@ -78,9 +78,21 @@ unsigned int LOF1=(9750*1000UL); unsigned int LOF2=(10600*1000UL); -char* frontenddev[4]={"/dev/dvb/adapter0/frontend0","/dev/dvb/adapter1/frontend0","/dev/dvb/adapter2/frontend0","/dev/dvb/adapter3/frontend0"}; -char* dvrdev[4]={"/dev/dvb/adapter0/dvr0","/dev/dvb/adapter1/dvr0","/dev/dvb/adapter2/dvr0","/dev/dvb/adapter3/dvr0"}; -char* demuxdev[4]={"/dev/dvb/adapter0/demux0","/dev/dvb/adapter1/demux0","/dev/dvb/adapter2/demux0","/dev/dvb/adapter3/demux0"}; +char* frontenddev[8]={ + "/dev/dvb/adapter0/frontend0","/dev/dvb/adapter1/frontend0", + "/dev/dvb/adapter2/frontend0","/dev/dvb/adapter3/frontend0", + "/dev/dvb/adapter4/frontend0","/dev/dvb/adapter5/frontend0", + "/dev/dvb/adapter6/frontend0","/dev/dvb/adapter7/frontend0"}; +char* dvrdev[8]={ + "/dev/dvb/adapter0/dvr0","/dev/dvb/adapter1/dvr0", + "/dev/dvb/adapter2/dvr0","/dev/dvb/adapter3/dvr0", + "/dev/dvb/adapter4/dvr0","/dev/dvb/adapter5/dvr0", + "/dev/dvb/adapter6/dvr0","/dev/dvb/adapter7/dvr0"}; +char* demuxdev[8]={ + "/dev/dvb/adapter0/demux0","/dev/dvb/adapter1/demux0", + "/dev/dvb/adapter2/demux0","/dev/dvb/adapter3/demux0", + "/dev/dvb/adapter4/demux0","/dev/dvb/adapter5/demux0", + "/dev/dvb/adapter6/demux0","/dev/dvb/adapter7/demux0"}; int card=0; long now; @@ -902,9 +914,9 @@ pids_map = NULL; map_cnt = 0; - fprintf(stderr,"dvbstream v0.7 - (C) Dave Chapman 2001-2004\n"); + fprintf(stderr,"dvbstream v0.7.01 - (C) Dave Chapman 2001-2004\n"); fprintf(stderr,"Released under the GPL.\n"); - fprintf(stderr,"Latest version available from http://www.linuxstb.org/\n";); + fprintf(stderr,"Latest version available from http://dvbtools.sourceforge.net/\n";); /* Initialise PID map */ for (i=0;i<8192;i++) { @@ -953,7 +965,7 @@ fprintf(stderr,"-s N Symbol rate (DVB-S or DVB-C)\n"); fprintf(stderr,"\nAdvanced tuning options:\n\n"); - fprintf(stderr,"-c [0-3] Use DVB card #[0-3]\n"); + fprintf(stderr,"-c [0-7] Use DVB card #[0-7]\n"); fprintf(stderr,"-D [0-4AB] DiSEqC command (0=none)\n\n"); fprintf(stderr,"-I [0|1|2] 0=Spectrum Inversion off, 1=Spectrum Inversion on, 2=auto\n"); fprintf(stderr,"-qam X DVB-T/C and ATSC modulation - 16%s, 32%s, 64%s, 128%s or 256%s\n",(CONSTELLATION_DEFAULT==QAM_16 ? " (default)" : ""),(CONSTELLATION_DEFAULT==QAM_32 ? " (default)" : ""),(CONSTELLATION_DEFAULT==QAM_64 ? " (default)" : ""),(CONSTELLATION_DEFAULT==QAM_128 ? " (default)" : ""),(CONSTELLATION_DEFAULT==QAM_256 ? " (default)" : "")); @@ -1123,8 +1135,8 @@ } else if (strcmp(argv[i],"-c")==0) { i++; card=atoi(argv[i]); - if ((card < 0) || (card > 3)) { - fprintf(stderr,"ERROR: card parameter must be between 0 and 4\n"); + if ((card < 0) || (card > 7)) { + fprintf(stderr,"ERROR: card parameter must be between 0 and 7\n"); } } else if (strcmp(argv[i],"-v")==0) { pestype=DMX_PES_VIDEO; -- System Information: Debian Release: squeeze/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32.5 (SMP w/8 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=ISO-8859-1) (ignored: LC_ALL set to en_US) Shell: /bin/sh linked to /bin/dash Versions of packages dvbstream depends on: ii libc6 2.11.2-7 Embedded GNU C Library: Shared lib dvbstream recommends no packages. Versions of packages dvbstream suggests: ii dvbtune 0.5-12 Simple tuning application for DVB pn mpg123 <none> (no description available) -- no debconf information -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
