Guest User

Untitled

a guest
Apr 3rd, 2012
312
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 5.70 KB | None | 0 0
  1. diff --git modules/gui/macosx/intf.m modules/gui/macosx/intf.m
  2. index acf1d30..46d610c 100644
  3. --- modules/gui/macosx/intf.m
  4. +++ modules/gui/macosx/intf.m
  5. @@ -882,7 +882,7 @@ static VLCMain *_o_sharedMainInstance = nil;
  6.  - (BOOL)application:(NSApplication *)o_app openFile:(NSString *)o_filename
  7.  {
  8.      BOOL b_autoplay = config_GetInt( VLCIntf, "macosx-autoplay" );
  9. -    char *psz_uri = make_URI([o_filename UTF8String], "file" );
  10. +    char *psz_uri = make_URI([[o_filename precomposedStringWithCanonicalMapping] UTF8String], "file" );
  11.      if( !psz_uri )
  12.          return( FALSE );
  13.  
  14. diff --git modules/gui/macosx/misc.m modules/gui/macosx/misc.m
  15. index 39d17a6..fee4556 100644
  16. --- modules/gui/macosx/misc.m
  17. +++ modules/gui/macosx/misc.m
  18. @@ -433,7 +433,7 @@ static NSMutableArray *blackoutWindows = NULL;
  19.  
  20.              if (count == 1 && p_input)
  21.              {
  22. -                b_returned = input_AddSubtitle( p_input, make_URI([[o_values objectAtIndex:0] UTF8String], NULL), true );
  23. +                b_returned = input_AddSubtitle( p_input, make_URI([[[o_values objectAtIndex:0] precomposedStringWithCanonicalMapping] UTF8String], NULL), true );
  24.                  vlc_object_release( p_input );
  25.                  if(!b_returned)
  26.                      return YES;
  27. @@ -444,7 +444,7 @@ static NSMutableArray *blackoutWindows = NULL;
  28.              for( NSUInteger i = 0; i < count; i++)
  29.              {
  30.                  NSDictionary *o_dic;
  31. -                char *psz_uri = make_URI([[o_values objectAtIndex:i] UTF8String], NULL);
  32. +                char *psz_uri = make_URI([[[o_values objectAtIndex:i] precomposedStringWithCanonicalMapping] UTF8String], NULL);
  33.                  if( !psz_uri )
  34.                      continue;
  35.  
  36. @@ -533,7 +533,7 @@ static NSMutableArray *blackoutWindows = NULL;
  37.  
  38.              if (count == 1 && p_input)
  39.              {
  40. -                b_returned = input_AddSubtitle( p_input, make_URI([[o_values objectAtIndex:0] UTF8String], NULL), true );
  41. +                b_returned = input_AddSubtitle( p_input, make_URI([[[o_values objectAtIndex:0] precomposedStringWithCanonicalMapping] UTF8String], NULL), true );
  42.                  vlc_object_release( p_input );
  43.                  if(!b_returned)
  44.                      return YES;
  45. @@ -544,7 +544,7 @@ static NSMutableArray *blackoutWindows = NULL;
  46.              for( NSUInteger i = 0; i < count; i++)
  47.              {
  48.                  NSDictionary *o_dic;
  49. -                char *psz_uri = make_URI([[o_values objectAtIndex:i] UTF8String], NULL);
  50. +                char *psz_uri = make_URI([[[o_values objectAtIndex:i] precomposedStringWithCanonicalMapping] UTF8String], NULL);
  51.                  if( !psz_uri )
  52.                      continue;
  53.  
  54. @@ -944,7 +944,7 @@ void _drawFrameInRect(NSRect frameRect)
  55.  
  56.              if (count == 1 && p_input)
  57.              {
  58. -                b_returned = input_AddSubtitle( p_input, make_URI([[o_values objectAtIndex:0] UTF8String], NULL), true );
  59. +                b_returned = input_AddSubtitle( p_input, make_URI([[[o_values objectAtIndex:0] precomposedStringWithCanonicalMapping] UTF8String], NULL), true );
  60.                  vlc_object_release( p_input );
  61.                  if(!b_returned)
  62.                      return YES;
  63. @@ -955,7 +955,7 @@ void _drawFrameInRect(NSRect frameRect)
  64.              for( NSUInteger i = 0; i < count; i++)
  65.              {
  66.                  NSDictionary *o_dic;
  67. -                char *psz_uri = make_URI([[o_values objectAtIndex:i] UTF8String], NULL);
  68. +                char *psz_uri = make_URI([[[o_values objectAtIndex:i] precomposedStringWithCanonicalMapping] UTF8String], NULL);
  69.                  if( !psz_uri )
  70.                      continue;
  71.  
  72. diff --git modules/gui/macosx/open.m modules/gui/macosx/open.m
  73. index 9a67fc3..e45a2fe 100644
  74. --- modules/gui/macosx/open.m
  75. +++ modules/gui/macosx/open.m
  76. @@ -592,7 +592,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
  77.  
  78.          [[NSFileManager defaultManager] fileExistsAtPath:o_file_path isDirectory:&b_dir];
  79.  
  80. -        char *psz_uri = make_URI([o_file_path UTF8String], "file");
  81. +        char *psz_uri = make_URI([[o_file_path UTF8String] precomposedStringWithCanonicalMapping], "file");
  82.          if( !psz_uri ) return;
  83.  
  84.          NSMutableString *o_mrl_string = [NSMutableString stringWithUTF8String: psz_uri ];
  85. @@ -1142,7 +1142,7 @@ static VLCOpen *_o_sharedMainInstance = nil;
  86.          for( NSUInteger i = 0; i < count; i++ )
  87.          {
  88.              NSDictionary *o_dic;
  89. -            char *psz_uri = make_URI([[o_values objectAtIndex:i] UTF8String], "file");
  90. +            char *psz_uri = make_URI([[[o_values objectAtIndex:i] precomposedStringWithCanonicalMapping] UTF8String], "file");
  91.              if( !psz_uri )
  92.                  continue;
  93.  
  94. diff --git modules/gui/macosx/playlist.m modules/gui/macosx/playlist.m
  95. index 41f0f93..428c118 100644
  96. --- modules/gui/macosx/playlist.m
  97. +++ modules/gui/macosx/playlist.m
  98. @@ -1659,7 +1659,7 @@
  99.  
  100.          if (count == 1 && p_input)
  101.          {
  102. -            b_returned = input_AddSubtitle( p_input, make_URI([[o_values objectAtIndex:0] UTF8String], NULL), true );
  103. +            b_returned = input_AddSubtitle( p_input, make_URI([[[o_values objectAtIndex:0] precomposedStringWithCanonicalMapping] UTF8String], NULL), true );
  104.              vlc_object_release( p_input );
  105.              if(!b_returned)
  106.                  return YES;
  107. @@ -1670,7 +1670,7 @@
  108.          for( NSUInteger i = 0; i < count; i++)
  109.          {
  110.              NSDictionary *o_dic;
  111. -            char *psz_uri = make_URI([[o_values objectAtIndex:i] UTF8String], NULL);
  112. +            char *psz_uri = make_URI([[[o_values objectAtIndex:i] precomposedStringWithCanonicalMapping] UTF8String], NULL);
  113.              if( !psz_uri )
  114.                  continue;
Advertisement
Add Comment
Please, Sign In to add comment