osx/framework: propagate NSInteger and NSUInteger

[vlc] / projects / macosx / framework / Sources / VLCLibrary.m

diff --git a/projects/macosx/framework/Sources/VLCLibrary.m b/projects/macosx/framework/Sources/VLCLibrary.m
index a66143a2b8c70ab1b7b6d50724e744dc7191fc72..4a58f5c02affffe0d59a8bd7d2a5b9b6fe6549a6 100644 (file)
--- a/projects/macosx/framework/Sources/VLCLibrary.m
+++ b/projects/macosx/framework/Sources/VLCLibrary.m
@@ -70,22 +70,23 @@ void __catch_exception( void * e, const char * function, const char * file, int
         NSArray *vlcParams = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"VLCParams"];
         if (!vlcParams) {
             NSMutableArray *defaultParams = [NSMutableArray array];
-            [defaultParams addObject:@"-I dummy"];                                  // No interface
+            [defaultParams addObject:@"-I macosx_dialog_provider"];                 // No actual interface, just dialogs and nagging
             [defaultParams addObject:@"--no-video-title-show"];                     // Don't show the title on overlay when starting to play
             [defaultParams addObject:@"--no-sout-keep"];
             [defaultParams addObject:@"--ignore-config"];                           // Don't read and write VLC config files
-            [defaultParams addObject:@"--opengl-provider=minimal_macosx"];          // Use minimal_macosx
-            [defaultParams addObject:@"--vout=minimal_macosx"];
-            [defaultParams addObject:@"--verbose=2"];                               // Don't polute the log
-            [defaultParams addObject:@"--vout=minimal_macosx"];
+            [defaultParams addObject:@"--vout=macosx"];
+            [defaultParams addObject:@"--text-renderer=quartztext"];                // our CoreText-based renderer
+            [defaultParams addObject:@"--verbose=-1"];                               // Don't polute the log
             [defaultParams addObject:@"--no-color"];
-            [defaultParams addObject:@"--play-and-pause"];                          // When ending a stream pause it instead of stopping it
+            [defaultParams addObject:@"--no-media-library"];
+            [defaultParams addObject:@"--play-and-pause"];
             vlcParams = defaultParams;
         }
-    
-        int paramNum = 0;
-        const char *lib_vlc_params[[vlcParams count]];
-        while (paramNum < [vlcParams count]) {
+
+        NSUInteger paramNum = 0;
+        NSUInteger count = [vlcParams count];
+        const char *lib_vlc_params[count];
+        while (paramNum < count) {
             NSString *vlcParam = [vlcParams objectAtIndex:paramNum];
             lib_vlc_params[paramNum] = [vlcParam cStringUsingEncoding:NSASCIIStringEncoding];
             paramNum++;
@@ -93,7 +94,7 @@ void __catch_exception( void * e, const char * function, const char * file, int
         instance = (void *)libvlc_new( sizeof(lib_vlc_params)/sizeof(lib_vlc_params[0]), lib_vlc_params, &ex );
         catch_exception( &ex );
         NSAssert(instance, @"libvlc failed to initialize");
-        
+
         // Assignment unneeded, as the audio unit will do it for us
         /*audio = */ [[VLCAudio alloc] initWithLibrary:self];
     }