[MPlayer-dev-eng] [PATCH] libmpdvdkit2/dvd_reader.c: do not second-guess user

[Reimar Döffinger]

Hi,
the attached patch stops MPlayer from using the dvd device instead of
the directory given by -dvd-device. This is just annoying and I don't
see any point in it.

Greetings,
Reimar Döffinger
-------------- next part --------------
Index: libmpdvdkit2/dvd_reader.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdvdkit2/dvd_reader.c,v
retrieving revision 1.16
diff -u -r1.16 dvd_reader.c
--- libmpdvdkit2/dvd_reader.c	17 Sep 2005 20:53:20 -0000	1.16
+++ libmpdvdkit2/dvd_reader.c	13 Oct 2005 20:15:52 -0000
@@ -40,6 +40,7 @@
 #define SYS_BSD 1
 #endif
 
+#if 0
 #if defined(__sun)
 #include <sys/mnttab.h>
 #elif defined(hpux)
@@ -49,6 +50,7 @@
 #elif defined(__linux__) || defined(__CYGWIN__)
 #include <mntent.h>
 #endif
+#endif
 
 #ifdef __MINGW32__
 #include <sys/timeb.h>
@@ -371,6 +373,9 @@
 #endif
 
     } else if( S_ISDIR( fileinfo.st_mode ) ) {
+#ifdef __MINGW32__
+// if we are given a path, do not try to second-guess the user.
+// MinGW is different since you cannot specify the device there
 	dvd_reader_t *auth_drive = 0;
 	char *path_copy;
 #if defined(SYS_BSD)
@@ -486,6 +491,7 @@
          */
         if( auth_drive ) return auth_drive;
 
+#endif
         /**
          * Otherwise, we now try to open the directory tree instead.
          */