diff options
| author |  arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-01 23:40:24 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-01 23:40:24 +0000 |
| commit | b4608fa5678e9c4a0f28958c812e3eb7295d2020 (patch) | |
| tree | 8d1258b94f1a6238c5c9787a57f65b423e4fd436 /libmpdemux | |
| parent | 00201b1e0a9e43cf04464b2ed368c83aa725d484 (diff) | |
using #ifdef HAVE_VCD
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3262 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/open.c | 2 | ||||
| -rw-r--r-- | libmpdemux/stream.c | 8 | ||||
| -rw-r--r-- | libmpdemux/vcd_read.h | 29 |
3 files changed, 13 insertions, 26 deletions
diff --git a/libmpdemux/open.c b/libmpdemux/open.c index bf1bd82012..c6fce78b0c 100644 --- a/libmpdemux/open.c +++ b/libmpdemux/open.c @@ -75,6 +75,7 @@ int bsize = VCD_SECTOR_SIZE; #endif //============ Open VideoCD track ============== +#ifdef HAVE_VCD if(vcd_track){ int ret,ret2; if(!filename) filename=DEFAULT_CDROM_DEVICE; @@ -100,6 +101,7 @@ if(vcd_track){ stream->end_pos=ret2; return stream; } +#endif //============ Open DVD title ============== #ifdef USE_DVDREAD diff --git a/libmpdemux/stream.c b/libmpdemux/stream.c index b51fe147b7..ce7b718100 100644 --- a/libmpdemux/stream.c +++ b/libmpdemux/stream.c @@ -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 @@ int stream_fill_buffer(stream_t *s){ #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 @@ if(newpos==0 || newpos!=s->pos){ 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 @@ if(newpos==0 || newpos!=s->pos){ vcd_set_msf(s->pos/VCD_SECTOR_DATA); #endif break; +#endif #ifdef USE_DVDREAD case STREAMTYPE_DVD: s->pos=newpos; // real seek diff --git a/libmpdemux/vcd_read.h b/libmpdemux/vcd_read.h index 77ec9e7ad4..818f99a675 100644 --- a/libmpdemux/vcd_read.h +++ b/libmpdemux/vcd_read.h @@ -254,31 +254,8 @@ int vcd_cache_read(int fd,char* mem){ } #endif -#else /* linux || sun */ +#else /* linux || sun || __bsdi__ */ -int vcd_seek_to_track(int fd,int track) -{ - return -1; -} - -int vcd_get_track_end(int fd,int track) -{ - return -1; -} +#error vcd is not yet supported on this arch... -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 |