[Mplayer-cvslog] CVS: main/libmpdemux open.c,1.25,1.26 vcd_read.h,1.10,1.11 stream.c,1.23,1.24

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mplayer:/var/tmp.root/cvs-serv21612

Modified Files:
	open.c vcd_read.h stream.c 
Log Message:
using #ifdef HAVE_VCD

Index: open.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/open.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- open.c	21 Nov 2001 10:30:59 -0000	1.25
+++ open.c	1 Dec 2001 23:40:24 -0000	1.26
@@ -75,6 +75,7 @@
 #endif
 
 //============ Open VideoCD track ==============
+#ifdef HAVE_VCD
 if(vcd_track){
   int ret,ret2;
   if(!filename) filename=DEFAULT_CDROM_DEVICE;
@@ -100,6 +101,7 @@
   stream->end_pos=ret2;
   return stream;
 }
+#endif
 
 //============ Open DVD title ==============
 #ifdef USE_DVDREAD

Index: vcd_read.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/vcd_read.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- vcd_read.h	24 Oct 2001 14:02:19 -0000	1.10
+++ vcd_read.h	1 Dec 2001 23:40:24 -0000	1.11
@@ -254,31 +254,8 @@
 }
 #endif
 
-#else /* linux || sun */
+#else /* linux || sun || __bsdi__ */
 
-int vcd_seek_to_track(int fd,int track)
-{
-  return -1;
-}
+#error vcd is not yet supported on this arch...
 
-int vcd_get_track_end(int fd,int track)
-{
-  return -1;
-}
-
-void vcd_read_toc(int fd)
-{
-}
-
-static char vcd_buf[VCD_SECTOR_SIZE];
-
-static int vcd_read(int fd,char *mem)
-{
-  return -1;
-}
-
-static inline void vcd_set_msf(unsigned int sect)
-{
-}
-
-#endif /* !linux && !sun */
+#endif

Index: stream.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stream.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- stream.c	20 Nov 2001 22:22:21 -0000	1.23
+++ stream.c	1 Dec 2001 23:40:24 -0000	1.24
@@ -17,12 +17,16 @@
 
 extern int verbose; // defined in mplayer.c
 
+#ifdef HAVE_VCD
+
 #ifdef __FreeBSD__
 #include "vcd_read_fbsd.h" 
 #else
 #include "vcd_read.h"
 #endif
 
+#endif
+
 #ifdef USE_DVDREAD
 int dvd_read_sector(void* d,void* p2);
 void dvd_seek(void* d,off_t pos);
@@ -45,12 +49,14 @@
 #else
     len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE);break;
 #endif
+#ifdef HAVE_VCD
   case STREAMTYPE_VCD:
 #ifdef VCD_CACHE
     len=vcd_cache_read(s->fd,s->buffer);break;
 #else
     len=vcd_read(s->fd,s->buffer);break;
 #endif
+#endif
 #ifdef USE_DVDREAD
   case STREAMTYPE_DVD: {
     off_t pos=dvd_read_sector(s->priv,s->buffer);
@@ -117,6 +123,7 @@
     s->pos=newpos; // real seek
     if(lseek(s->fd,s->pos,SEEK_SET)<0) s->eof=1;
     break;
+#ifdef HAVE_VCD
   case STREAMTYPE_VCD:
     s->pos=newpos; // real seek
 #ifdef VCD_CACHE
@@ -125,6 +132,7 @@
     vcd_set_msf(s->pos/VCD_SECTOR_DATA);
 #endif
     break;
+#endif
 #ifdef USE_DVDREAD
   case STREAMTYPE_DVD:
     s->pos=newpos; // real seek