From 8d5e7cc89b89c12e9fceaae03dfab5f63421c27d Mon Sep 17 00:00:00 2001 From: Erwan Tulou Date: Thu, 11 Feb 2010 17:21:34 +0100 Subject: [PATCH] core: use make_path in subtile_Detect this also solves uri alteration on Windows (recent regression) --- src/input/subtitles.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/input/subtitles.c b/src/input/subtitles.c index f47777c257..2ca105ff08 100644 --- a/src/input/subtitles.c +++ b/src/input/subtitles.c @@ -262,22 +262,7 @@ char **subtitles_Detect( input_thread_t *p_this, char *psz_path, if( !psz_name_org ) return NULL; - if( !strncmp( psz_name_org, "file://", 7 ) ) - { - psz_name_org += 7; -#if defined( WIN32 ) - psz_name_org ++ ; -#endif - if( !strncmp( psz_name_org, "localhost", 9 ) ) - psz_name_org += 9; - } - -#if (DIR_SEP_CHAR != '/') - /* Turn slashes into anti-slashes */ - for( char *s = strchr( psz_name_org, '/' ); s; s = strchr( s + 1, '/' ) ) - *s = DIR_SEP_CHAR; -#endif - char *psz_fname = decode_URI_duplicate( psz_name_org ); + char *psz_fname = make_path( psz_name_org ); if( !psz_fname ) return NULL; -- 2.39.5