diff options
| author | bertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-15 17:50:21 +0000 |
|---|---|---|
| committer | bertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-15 17:50:21 +0000 |
| commit | 67218a1e0a8d260f0a010cf592f6fd89f939b929 (patch) | |
| tree | 1fb0beeba9412c756bf0e231671963b5b0360855 /libmpdemux/cdda.c | |
| parent | 23486f48a5034b3a25be6ced6cdba9a86131e1f0 (diff) | |
| download | mpv-67218a1e0a8d260f0a010cf592f6fd89f939b929.tar.bz2 mpv-67218a1e0a8d260f0a010cf592f6fd89f939b929.tar.xz | |
Removed the hardcoded /dev/cdrom for NetBSD and added an work around
for problem with cdparanoia.
Patch from Frederick Bruckman <fredb@immanent.net>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8959 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux/cdda.c')
| -rw-r--r-- | libmpdemux/cdda.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmpdemux/cdda.c b/libmpdemux/cdda.c index e87b0864af..25f0cf24d6 100644 --- a/libmpdemux/cdda.c +++ b/libmpdemux/cdda.c @@ -12,11 +12,7 @@ static int speed = -1; static int paranoia_mode = 1; -#if defined(__NetBSD__) -static char* generic_dev = "/dev/cdrom"; -#else static char* generic_dev = NULL; -#endif static int sector_size = 0; static int search_overlap = -1; static int toc_bias = 0; @@ -72,7 +68,11 @@ stream_t* open_cdda(char* dev,char* track) { if(generic_dev) cdd = cdda_identify_scsi(generic_dev,dev,0,NULL); else +#if defined(__NetBSD__) + cdd = cdda_identify_scsi(dev,dev,0,NULL); +#else cdd = cdda_identify(dev,0,NULL); +#endif if(!cdd) { mp_msg(MSGT_OPEN,MSGL_ERR,"Can't open cdda device\n"); |