Disc reading libs want ANSI rather than UTF-8 paths - fixes #1560

diff --git a/modules/access/cdda.c b/modules/access/cdda.c
index 2735bd9e703ae091f66030eb1f63b9be5edeeb7e..13c3f334443b553ce739f92788f85fd3817053be 100644 (file)
--- a/modules/access/cdda.c
+++ b/modules/access/cdda.c
@@ -40,6 +40,7 @@
 #include <vlc_input.h>
 #include <vlc_access.h>
 #include <vlc_meta.h>
+#include <vlc_charset.h>
 
 #include <vlc_codecs.h> /* For WAVEHEADER */
 #include "vcd/cdrom.h"
@@ -158,7 +159,7 @@ static int Open( vlc_object_t *p_this )
             return VLC_EGENERIC;
         }
     }
-    else psz_name = strdup( p_access->psz_path );
+    else psz_name = ToLocaleDup( p_access->psz_path );
 
 #ifdef WIN32
     if( psz_name[0] && psz_name[1] == ':' &&

diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index f9df8aa02e50126b081aca02a28ad932b52c8209..0fbce334e923d92ffeca94b72529e8276fcbccee 100644 (file)
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -33,6 +33,7 @@
 #include <vlc_input.h>
 #include <vlc_access.h>
 #include <vlc_demux.h>
+#include <vlc_charset.h>
 
 #include <vlc_interface.h>
 
@@ -189,7 +190,7 @@ static int Open( vlc_object_t *p_this )
         }
     }
     else
-        psz_name = strdup( p_demux->psz_path );
+        psz_name = ToLocaleDup( p_demux->psz_path );
 
 #ifdef WIN32
     if( psz_name[0] && psz_name[1] == ':' &&

diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index f6cfad65c0d93edd3516bdd6e5541b0ed1838ba5..41774d13e35ccb340390dc41da76ed58063d5205 100644 (file)
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -33,6 +33,7 @@
 #include <vlc/vlc.h>
 #include <vlc_input.h>
 #include <vlc_access.h>
+#include <vlc_charset.h>
 
 #include <vlc_interface.h>
 
@@ -203,7 +204,7 @@ static int Open( vlc_object_t *p_this )
         }
     }
     else
-        psz_name = strdup( p_demux->psz_path );
+        psz_name = ToLocaleDup( p_demux->psz_path );
 
 #ifdef WIN32
     if( psz_name[0] && psz_name[1] == ':' &&

diff --git a/modules/access/vcd/vcd.c b/modules/access/vcd/vcd.c
index 4492cd2bf9605964c95ce815ae76b0a5d22df9bc..97ef305ec21ec5f18c4b9ef8cf42a241d5dd5498 100644 (file)
--- a/modules/access/vcd/vcd.c
+++ b/modules/access/vcd/vcd.c
@@ -94,7 +94,7 @@ static int Open( vlc_object_t *p_this )
 {
     access_t     *p_access = (access_t *)p_this;
     access_sys_t *p_sys;
-    char *psz_dup = strdup( p_access->psz_path );
+    char *psz_dup = ToLocaleDup( p_access->psz_path );
     char *psz;
     int i_title = 0;
     int i_chapter = 0;

diff --git a/modules/access/vcdx/access.c b/modules/access/vcdx/access.c
index d28ad46d8daaa43bbb89bce94be2707b4125fe10..c54d6d16d7b0f400fd53bf4e8936b86df350106d 100644 (file)
--- a/modules/access/vcdx/access.c
+++ b/modules/access/vcdx/access.c
@@ -37,6 +37,7 @@
 #include <vlc_interface.h>
 #include <vlc_input.h>
 #include <vlc_access.h>
+#include <vlc_charset.h>
 #include "vlc_keys.h"
 
 #include <cdio/cdio.h>
@@ -759,7 +760,7 @@ vcd_Open( vlc_object_t *p_this, const char *psz_dev )
 
     if( !psz_dev ) return NULL;
 
-    actual_dev=strdup(psz_dev);
+    actual_dev= ToLocaleDup(psz_dev);
     if ( vcdinfo_open(&p_vcdobj, &actual_dev, DRIVER_UNKNOWN, NULL) !=
          VCDINFO_OPEN_VCD) {
       free(actual_dev);

diff --git a/modules/access/vcdx/vcd.c b/modules/access/vcdx/vcd.c
index b89b5e797eec5d9b210a0ca5f115b705b32dae83..83a6d1b20a754e6ce2c720916ea1bc786fb30769 100644 (file)
--- a/modules/access/vcdx/vcd.c
+++ b/modules/access/vcdx/vcd.c
@@ -34,6 +34,7 @@
 #endif
 
 #include <vlc/vlc.h>
+#include <vlc_charset.h>
 
 /*****************************************************************************
  * Exported prototypes