Should fix playback of cdda://D:\ under win32. Please test (Refs:#490)

diff --git a/modules/access/cdda.c b/modules/access/cdda.c
index e90cc984f555b2e974caf50df0372fc56feca3e8..2bd053f29a4665c46b3a22648918ed625ed0a07e 100644 (file)
--- a/modules/access/cdda.c
+++ b/modules/access/cdda.c
@@ -154,6 +154,11 @@ static int Open( vlc_object_t *p_this )
     }
     else psz_name = strdup( p_access->psz_path );
 
+#ifdef WIN32
+    if( psz_name[0] && psz_name[1] == ':' &&
+        psz_name[2] == '\\' && psz_name[3] == '\0' ) psz_name[2] = '\0';
+#endif
+
     /* Open CDDA */
     if( (vcddev = ioctl_Open( VLC_OBJECT(p_access), psz_name )) == NULL )
     {

diff --git a/modules/access/vcd/vcd.c b/modules/access/vcd/vcd.c
index 0d050c01e46cecc904a13d0f9cd0dfec3e717d0b..58e7773a30107bf6de75cc5b13c9b3619a5dfeaf 100644 (file)
--- a/modules/access/vcd/vcd.c
+++ b/modules/access/vcd/vcd.c
@@ -124,6 +124,11 @@ static int Open( vlc_object_t *p_this )
         }
     }
 
+#ifdef WIN32
+    if( psz_dup[0] && psz_dup[1] == ':' &&
+        psz_dup[2] == '\\' && psz_dup[3] == '\0' ) psz_dup[2] = '\0';
+#endif
+
     /* Open VCD */
     if( !(vcddev = ioctl_Open( p_this, psz_dup )) )
     {