Commit 8aa3a9c4 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

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

parent 0fd1b747
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include <vlc_input.h> #include <vlc_input.h>
#include <vlc_access.h> #include <vlc_access.h>
#include <vlc_meta.h> #include <vlc_meta.h>
#include <vlc_charset.h>
#include <vlc_codecs.h> /* For WAVEHEADER */ #include <vlc_codecs.h> /* For WAVEHEADER */
#include "vcd/cdrom.h" #include "vcd/cdrom.h"
...@@ -158,7 +159,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -158,7 +159,7 @@ static int Open( vlc_object_t *p_this )
return VLC_EGENERIC; return VLC_EGENERIC;
} }
} }
else psz_name = strdup( p_access->psz_path ); else psz_name = ToLocaleDup( p_access->psz_path );
#ifdef WIN32 #ifdef WIN32
if( psz_name[0] && psz_name[1] == ':' && if( psz_name[0] && psz_name[1] == ':' &&
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <vlc_input.h> #include <vlc_input.h>
#include <vlc_access.h> #include <vlc_access.h>
#include <vlc_demux.h> #include <vlc_demux.h>
#include <vlc_charset.h>
#include <vlc_interface.h> #include <vlc_interface.h>
...@@ -189,7 +190,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -189,7 +190,7 @@ static int Open( vlc_object_t *p_this )
} }
} }
else else
psz_name = strdup( p_demux->psz_path ); psz_name = ToLocaleDup( p_demux->psz_path );
#ifdef WIN32 #ifdef WIN32
if( psz_name[0] && psz_name[1] == ':' && if( psz_name[0] && psz_name[1] == ':' &&
......
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc_input.h> #include <vlc_input.h>
#include <vlc_access.h> #include <vlc_access.h>
#include <vlc_charset.h>
#include <vlc_interface.h> #include <vlc_interface.h>
...@@ -203,7 +204,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -203,7 +204,7 @@ static int Open( vlc_object_t *p_this )
} }
} }
else else
psz_name = strdup( p_demux->psz_path ); psz_name = ToLocaleDup( p_demux->psz_path );
#ifdef WIN32 #ifdef WIN32
if( psz_name[0] && psz_name[1] == ':' && if( psz_name[0] && psz_name[1] == ':' &&
......
...@@ -94,7 +94,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -94,7 +94,7 @@ static int Open( vlc_object_t *p_this )
{ {
access_t *p_access = (access_t *)p_this; access_t *p_access = (access_t *)p_this;
access_sys_t *p_sys; access_sys_t *p_sys;
char *psz_dup = strdup( p_access->psz_path ); char *psz_dup = ToLocaleDup( p_access->psz_path );
char *psz; char *psz;
int i_title = 0; int i_title = 0;
int i_chapter = 0; int i_chapter = 0;
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include <vlc_interface.h> #include <vlc_interface.h>
#include <vlc_input.h> #include <vlc_input.h>
#include <vlc_access.h> #include <vlc_access.h>
#include <vlc_charset.h>
#include "vlc_keys.h" #include "vlc_keys.h"
#include <cdio/cdio.h> #include <cdio/cdio.h>
...@@ -759,7 +760,7 @@ vcd_Open( vlc_object_t *p_this, const char *psz_dev ) ...@@ -759,7 +760,7 @@ vcd_Open( vlc_object_t *p_this, const char *psz_dev )
if( !psz_dev ) return NULL; 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) != if ( vcdinfo_open(&p_vcdobj, &actual_dev, DRIVER_UNKNOWN, NULL) !=
VCDINFO_OPEN_VCD) { VCDINFO_OPEN_VCD) {
free(actual_dev); free(actual_dev);
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#endif #endif
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc_charset.h>
/***************************************************************************** /*****************************************************************************
* Exported prototypes * Exported prototypes
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment