]> git.sesse.net Git - vlc/blobdiff - modules/gui/minimal_macosx/VLCOpenGLVoutView.m
Don't clutter REGISTRY on windows...
[vlc] / modules / gui / minimal_macosx / VLCOpenGLVoutView.m
index 7da994f7c92f7822e027d96be02bb88d7e091b67..31e53d06439645623b37d6af17481dc968312baa 100644 (file)
@@ -60,7 +60,7 @@ int cocoaglvoutviewInit( vout_thread_t * p_vout )
         msg_Warn( p_vout, "No drawable!, spawing a window" );
     }
 
-    p_vout->p_sys->b_embedded = VLC_FALSE;
+    p_vout->p_sys->b_embedded = false;
 
 
     /* Create the GL view */
@@ -142,12 +142,12 @@ int cocoaglvoutviewManage( vout_thread_t * p_vout )
  *****************************************************************************/
 int cocoaglvoutviewControl( vout_thread_t *p_vout, int i_query, va_list args )
 {
-    vlc_bool_t b_arg;
+    bool b_arg;
 
     switch( i_query )
     {
         case VOUT_SET_STAY_ON_TOP:
-            b_arg = va_arg( args, vlc_bool_t );
+            b_arg = (bool) va_arg( args, int );
             [[p_vout->p_sys->o_glview container] setOnTop: b_arg];
             return VLC_SUCCESS;
 
@@ -163,7 +163,7 @@ int cocoaglvoutviewControl( vout_thread_t *p_vout, int i_query, va_list args )
  *****************************************************************************/
 void cocoaglvoutviewSwap( vout_thread_t * p_vout )
 {
-    p_vout->p_sys->b_got_frame = VLC_TRUE;
+    p_vout->p_sys->b_got_frame = true;
     [[p_vout->p_sys->o_glview openGLContext] flushBuffer];
 }
 
@@ -264,7 +264,7 @@ void cocoaglvoutviewUnlock( vout_thread_t * p_vout )
         /* Swap buffers only during the vertical retrace of the monitor.
         http://developer.apple.com/documentation/GraphicsImaging/
         Conceptual/OpenGL/chap5/chapter_5_section_44.html */
-        long params[] = { 1 };
+        GLint params[] = { 1 };
         CGLSetParameter( CGLGetCurrentContext(), kCGLCPSwapInterval,
                      params );
     }
@@ -290,7 +290,7 @@ void cocoaglvoutviewUnlock( vout_thread_t * p_vout )
     {
         vlc_object_detach( p_vout );
         vlc_object_release( p_vout );
-        vout_Destroy( (vout_thread_t *)p_vout );
+        vlc_object_release( p_vout );
     }
     [objectLock unlock];
 }