|
From: <lin...@us...> - 2004-06-18 21:57:53
|
Update of /cvsroot/dvbtools/dvbtext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29769 Modified Files: dvbtext.c Log Message: Fix update to NEWSTRUCT Index: dvbtext.c =================================================================== RCS file: /cvsroot/dvbtools/dvbtext/dvbtext.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dvbtext.c 18 Jul 2003 07:05:09 -0000 1.2 --- dvbtext.c 18 Jun 2004 21:57:44 -0000 1.3 *************** *** 32,35 **** --- 32,37 ---- #include <stdio.h> #include <stdlib.h> + #include <stdint.h> + #include <string.h> #include <sys/ioctl.h> #include <fcntl.h> *************** *** 219,223 **** --- 221,229 ---- for (i=0;i<count;i++) { + #ifdef NEWSTRUCT + if((fd[i] = open("/dev/dvb/adapter0/demux0",O_RDWR)) < 0){ + #else if((fd[i] = open("/dev/ost/demux",O_RDWR)) < 0){ + #endif fprintf(stderr,"FD %i: ",i); perror("DEMUX DEVICE: "); *************** *** 226,230 **** --- 232,240 ---- } + #ifdef NEWSTRUCT + if((fd_dvr = open("/dev/dvb/adapter0/dvr0",O_RDONLY)) < 0){ + #else if((fd_dvr = open("/dev/ost/dvr",O_RDONLY)) < 0){ + #endif perror("DVR DEVICE: "); return -1; |