diff options
| author | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-08-13 11:18:24 +0000 |
|---|---|---|
| committer | albeu <albeu@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-08-13 11:18:24 +0000 |
| commit | e5e805b73ff0bdf92799e6ae371d6e2005b4df46 (patch) | |
| tree | e499e773de3bcab7f0ced4ebc8558a4c7d038fdb /libmpdemux/stream_vcd.c | |
| parent | b129045b120f74ce4ebbd0aa33290b8bf397345b (diff) | |
| download | mpv-e5e805b73ff0bdf92799e6ae371d6e2005b4df46.tar.bz2 mpv-e5e805b73ff0bdf92799e6ae371d6e2005b4df46.tar.xz | |
Fix -cdrom-device to work again with cdda and vcd.
Based on patch from Arwed von Merkatz.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10592 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/stream_vcd.c')
| -rw-r--r-- | libmpdemux/stream_vcd.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/libmpdemux/stream_vcd.c b/libmpdemux/stream_vcd.c index 1904b4bc56..7f4bace00a 100644 --- a/libmpdemux/stream_vcd.c +++ b/libmpdemux/stream_vcd.c @@ -23,12 +23,14 @@ #include "vcd_read.h" #endif +extern char *cdrom_device; + static struct stream_priv_s { int track; char* device; } stream_priv_dflts = { 1, - DEFAULT_CDROM_DEVICE + NULL }; #define ST_OFF(f) M_ST_OFF(struct stream_priv_s,f) @@ -75,6 +77,13 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { return STREAM_UNSUPORTED; } + if (!p->device) { + if(cdrom_device) + p->device = strdup(cdrom_device); + else + p->device = strdup(DEFAULT_CDROM_DEVICE); + } + f=open(p->device,O_RDONLY); if(f<0){ mp_msg(MSGT_OPEN,MSGL_ERR,MSGTR_CdDevNotfound,p->device); |