Removed non converted omapfb video output module.

[vlc] / modules / video_output / opengl.c

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index c1dfb444b54c361570820b5a93453148a04a984e..874eb0d7f1814e9550c10d1d241fc457d126e3a4 100644 (file)
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -63,7 +63,7 @@ vlc_module_begin ()
     set_subcategory( SUBCAT_VIDEO_VOUT )
     set_description( N_("OpenGL video output") )
 #ifdef __APPLE__
-    set_capability( "video output", 200 )
+    set_capability( "video output", 400 )
 #else
     set_capability( "video output", 20 )
 #endif
@@ -129,10 +129,8 @@ static int CreateVout( vlc_object_t *p_this )
                 VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
 
     /* Forward events from the opengl provider */
-    var_Create( p_sys->p_vout, "mouse-x", VLC_VAR_INTEGER );
-    var_Create( p_sys->p_vout, "mouse-y", VLC_VAR_INTEGER );
-    var_Create( p_sys->p_vout, "mouse-moved", VLC_VAR_BOOL );
-    var_Create( p_sys->p_vout, "mouse-clicked", VLC_VAR_BOOL );
+    var_Create( p_sys->p_vout, "mouse-moved", VLC_VAR_COORDS );
+    var_Create( p_sys->p_vout, "mouse-clicked", VLC_VAR_COORDS );
     var_Create( p_sys->p_vout, "mouse-button-down", VLC_VAR_INTEGER );
     var_Create( p_sys->p_vout, "video-on-top",
                 VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
@@ -141,8 +139,6 @@ static int CreateVout( vlc_object_t *p_this )
     var_Create( p_sys->p_vout, "scale",
                 VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );
 
-    var_AddCallback( p_sys->p_vout, "mouse-x", SendEvents, p_vout );
-    var_AddCallback( p_sys->p_vout, "mouse-y", SendEvents, p_vout );
     var_AddCallback( p_sys->p_vout, "mouse-moved", SendEvents, p_vout );
     var_AddCallback( p_sys->p_vout, "mouse-clicked", SendEvents, p_vout );
     var_AddCallback( p_sys->p_vout, "mouse-button-down", SendEvents, p_vout );
@@ -343,7 +339,7 @@ static int Manage( vout_thread_t *p_vout )
     if (p_sys->p_vout->i_alignment != p_vout->i_alignment)
     {
         p_vout->i_changes |= VOUT_CROP_CHANGE;        //to force change
-        p_sys->p_vout->i_alignment = p_vout->i_alignment;    
+        p_sys->p_vout->i_alignment = p_vout->i_alignment;
     }
 
     /* forward signal that autoscale toggle has changed */
@@ -381,7 +377,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
         p_next = picture_pool_Get( p_sys->p_pool );
         assert( p_next );
     }
-  
+
     if( p_sys->p_current )
     {
         assert( p_sys->p_current->p[0].p_pixels == p_pic->p[0].p_pixels );
@@ -398,7 +394,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
     if( p_sys->p_current != p_next ) {
         if( p_sys->p_current )
             picture_Release( p_sys->p_current );
-        
+
         /* Swap the picture texture on opengl vout side. */
         p_sys->p_current = p_next;