Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git modules/gui/macosx/intf.m modules/gui/macosx/intf.m
- index acf1d30..46d610c 100644
- --- modules/gui/macosx/intf.m
- +++ modules/gui/macosx/intf.m
- @@ -882,7 +882,7 @@ static VLCMain *_o_sharedMainInstance = nil;
- - (BOOL)application:(NSApplication *)o_app openFile:(NSString *)o_filename
- {
- BOOL b_autoplay = config_GetInt( VLCIntf, "macosx-autoplay" );
- - char *psz_uri = make_URI([o_filename UTF8String], "file" );
- + char *psz_uri = make_URI([[o_filename precomposedStringWithCanonicalMapping] UTF8String], "file" );
- if( !psz_uri )
- return( FALSE );
- diff --git modules/gui/macosx/misc.m modules/gui/macosx/misc.m
- index 39d17a6..fee4556 100644
- --- modules/gui/macosx/misc.m
- +++ modules/gui/macosx/misc.m
- @@ -433,7 +433,7 @@ static NSMutableArray *blackoutWindows = NULL;
- if (count == 1 && p_input)
- {
- - b_returned = input_AddSubtitle( p_input, make_URI([[o_values objectAtIndex:0] UTF8String], NULL), true );
- + b_returned = input_AddSubtitle( p_input, make_URI([[[o_values objectAtIndex:0] precomposedStringWithCanonicalMapping] UTF8String], NULL), true );
- vlc_object_release( p_input );
- if(!b_returned)
- return YES;
- @@ -444,7 +444,7 @@ static NSMutableArray *blackoutWindows = NULL;
- for( NSUInteger i = 0; i < count; i++)
- {
- NSDictionary *o_dic;
- - char *psz_uri = make_URI([[o_values objectAtIndex:i] UTF8String], NULL);
- + char *psz_uri = make_URI([[[o_values objectAtIndex:i] precomposedStringWithCanonicalMapping] UTF8String], NULL);
- if( !psz_uri )
- continue;
- @@ -533,7 +533,7 @@ static NSMutableArray *blackoutWindows = NULL;
- if (count == 1 && p_input)
- {
- - b_returned = input_AddSubtitle( p_input, make_URI([[o_values objectAtIndex:0] UTF8String], NULL), true );
- + b_returned = input_AddSubtitle( p_input, make_URI([[[o_values objectAtIndex:0] precomposedStringWithCanonicalMapping] UTF8String], NULL), true );
- vlc_object_release( p_input );
- if(!b_returned)
- return YES;
- @@ -544,7 +544,7 @@ static NSMutableArray *blackoutWindows = NULL;
- for( NSUInteger i = 0; i < count; i++)
- {
- NSDictionary *o_dic;
- - char *psz_uri = make_URI([[o_values objectAtIndex:i] UTF8String], NULL);
- + char *psz_uri = make_URI([[[o_values objectAtIndex:i] precomposedStringWithCanonicalMapping] UTF8String], NULL);
- if( !psz_uri )
- continue;
- @@ -944,7 +944,7 @@ void _drawFrameInRect(NSRect frameRect)
- if (count == 1 && p_input)
- {
- - b_returned = input_AddSubtitle( p_input, make_URI([[o_values objectAtIndex:0] UTF8String], NULL), true );
- + b_returned = input_AddSubtitle( p_input, make_URI([[[o_values objectAtIndex:0] precomposedStringWithCanonicalMapping] UTF8String], NULL), true );
- vlc_object_release( p_input );
- if(!b_returned)
- return YES;
- @@ -955,7 +955,7 @@ void _drawFrameInRect(NSRect frameRect)
- for( NSUInteger i = 0; i < count; i++)
- {
- NSDictionary *o_dic;
- - char *psz_uri = make_URI([[o_values objectAtIndex:i] UTF8String], NULL);
- + char *psz_uri = make_URI([[[o_values objectAtIndex:i] precomposedStringWithCanonicalMapping] UTF8String], NULL);
- if( !psz_uri )
- continue;
- diff --git modules/gui/macosx/open.m modules/gui/macosx/open.m
- index 9a67fc3..e45a2fe 100644
- --- modules/gui/macosx/open.m
- +++ modules/gui/macosx/open.m
- @@ -592,7 +592,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
- [[NSFileManager defaultManager] fileExistsAtPath:o_file_path isDirectory:&b_dir];
- - char *psz_uri = make_URI([o_file_path UTF8String], "file");
- + char *psz_uri = make_URI([[o_file_path UTF8String] precomposedStringWithCanonicalMapping], "file");
- if( !psz_uri ) return;
- NSMutableString *o_mrl_string = [NSMutableString stringWithUTF8String: psz_uri ];
- @@ -1142,7 +1142,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
- for( NSUInteger i = 0; i < count; i++ )
- {
- NSDictionary *o_dic;
- - char *psz_uri = make_URI([[o_values objectAtIndex:i] UTF8String], "file");
- + char *psz_uri = make_URI([[[o_values objectAtIndex:i] precomposedStringWithCanonicalMapping] UTF8String], "file");
- if( !psz_uri )
- continue;
- diff --git modules/gui/macosx/playlist.m modules/gui/macosx/playlist.m
- index 41f0f93..428c118 100644
- --- modules/gui/macosx/playlist.m
- +++ modules/gui/macosx/playlist.m
- @@ -1659,7 +1659,7 @@
- if (count == 1 && p_input)
- {
- - b_returned = input_AddSubtitle( p_input, make_URI([[o_values objectAtIndex:0] UTF8String], NULL), true );
- + b_returned = input_AddSubtitle( p_input, make_URI([[[o_values objectAtIndex:0] precomposedStringWithCanonicalMapping] UTF8String], NULL), true );
- vlc_object_release( p_input );
- if(!b_returned)
- return YES;
- @@ -1670,7 +1670,7 @@
- for( NSUInteger i = 0; i < count; i++)
- {
- NSDictionary *o_dic;
- - char *psz_uri = make_URI([[o_values objectAtIndex:i] UTF8String], NULL);
- + char *psz_uri = make_URI([[[o_values objectAtIndex:i] precomposedStringWithCanonicalMapping] UTF8String], NULL);
- if( !psz_uri )
- continue;
Advertisement
Add Comment
Please, Sign In to add comment