[MPlayer-cvslog] CVS: main/libmpdvdkit2 dvd_reader.c,1.12,1.13

Diego Biurrun CVS syncmail at mplayerhq.hu
Sat May 21 13:05:48 CEST 2005


CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/libmpdvdkit2
In directory mail:/var2/tmp/cvs-serv10598/libmpdvdkit2

Modified Files:
	dvd_reader.c 
Log Message:
Support playing DVDs from harddrive directories.
idea from Björn Hermansson < Bjorn dot Hermansson at teliasonera dot com >


Index: dvd_reader.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdvdkit2/dvd_reader.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- dvd_reader.c	11 Mar 2005 02:40:28 -0000	1.12
+++ dvd_reader.c	21 May 2005 11:05:45 -0000	1.13
@@ -45,7 +45,7 @@
 #include </usr/conf/h/mnttab.h>
 #elif defined(SYS_BSD)
 #include <fstab.h>
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__CYGWIN__)
 #include <mntent.h>
 #endif
 
@@ -320,7 +320,7 @@
 	char *path_copy;
 #if defined(SYS_BSD)
 	struct fstab* fe;
-#elif defined(__sun) || defined(__linux__)
+#elif defined(__sun) || defined(__linux__) || defined(__CYGWIN__)
 	FILE *mntfile;
 #endif
 
@@ -393,7 +393,7 @@
 	    }
 	    fclose( mntfile );
 	}
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(__CYGWIN__)
         mntfile = fopen( MOUNTED, "r" );
         if( mntfile ) {
             struct mntent *me;
@@ -412,7 +412,7 @@
             }
             fclose( mntfile );
 	}
-#elif defined(WIN32)	
+#elif defined(__MINGW32__)	
 	dev_name = strdup(path);
 	auth_drive = DVDOpenImageFile( path, have_css );
 #endif




More information about the MPlayer-cvslog mailing list