add_integer: remove callback parameter

[vlc] / modules / access / screen / screen.c

diff --git a/modules/access/screen/screen.c b/modules/access/screen/screen.c
index 55169f02782f9d8f505da4b1edce9180acb4d95e..f3bc87400ac587a5094529913345b181a0ea80d5 100644 (file)
--- a/modules/access/screen/screen.c
+++ b/modules/access/screen/screen.c
@@ -32,6 +32,7 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
+#include <vlc_modules.h>
 #include "screen.h"
 
 /*****************************************************************************
@@ -77,7 +78,7 @@
 #ifdef SCREEN_MOUSE
 #define MOUSE_TEXT N_( "Mouse pointer image" )
 #define MOUSE_LONGTEXT N_( \
-    "If specifed, will use the image to draw the mouse pointer on the " \
+    "If specified, will use the image to draw the mouse pointer on the " \
     "capture." )
 #endif
 
@@ -96,26 +97,26 @@ vlc_module_begin ()
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_ACCESS )
 
-    add_integer( "screen-caching", DEFAULT_PTS_DELAY / 1000, NULL,
+    add_integer( "screen-caching", DEFAULT_PTS_DELAY / 1000,
         CACHING_TEXT, CACHING_LONGTEXT, true )
-    add_float( "screen-fps", SCREEN_FPS, 0, FPS_TEXT, FPS_LONGTEXT, true )
+    add_float( "screen-fps", SCREEN_FPS, FPS_TEXT, FPS_LONGTEXT, true )
 
 #ifdef SCREEN_SUBSCREEN
-    add_integer( "screen-top", 0, NULL, TOP_TEXT, TOP_LONGTEXT, true )
-    add_integer( "screen-left", 0, NULL, LEFT_TEXT, LEFT_LONGTEXT, true )
-    add_integer( "screen-width", 0, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, true )
-    add_integer( "screen-height", 0, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, true )
+    add_integer( "screen-top", 0, TOP_TEXT, TOP_LONGTEXT, true )
+    add_integer( "screen-left", 0, LEFT_TEXT, LEFT_LONGTEXT, true )
+    add_integer( "screen-width", 0, WIDTH_TEXT, WIDTH_LONGTEXT, true )
+    add_integer( "screen-height", 0, HEIGHT_TEXT, HEIGHT_LONGTEXT, true )
     add_bool( "screen-follow-mouse", false, NULL, FOLLOW_MOUSE_TEXT,
               FOLLOW_MOUSE_LONGTEXT, true )
 #endif
 
 #ifdef SCREEN_MOUSE
-    add_file( "screen-mouse-image", "", NULL, MOUSE_TEXT, MOUSE_LONGTEXT,
-              true )
+    add_loadfile( "screen-mouse-image", "", MOUSE_TEXT, MOUSE_LONGTEXT,
+                  true )
 #endif
 
 #ifdef WIN32
-    add_integer( "screen-fragment-size", 0, NULL, FRAGS_TEXT,
+    add_integer( "screen-fragment-size", 0, FRAGS_TEXT,
         FRAGS_LONGTEXT, true )
 #endif
 
@@ -301,7 +302,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 
         case DEMUX_GET_PTS_DELAY:
             pi64 = (int64_t*)va_arg( args, int64_t * );
-            *pi64 = (int64_t)var_GetInteger( p_demux, "screen-caching" ) *1000;
+            *pi64 = var_GetInteger( p_demux, "screen-caching" ) *1000;
             return VLC_SUCCESS;
 
         case DEMUX_GET_TIME:
@@ -340,7 +341,8 @@ void RenderCursor( demux_t *p_demux, int i_x, int i_y,
                        p_sys->fmt.video.i_chroma,
                        p_sys->fmt.video.i_width,
                        p_sys->fmt.video.i_height,
-                       p_sys->fmt.video.i_aspect );
+                       p_sys->fmt.video.i_sar_num,
+                       p_sys->fmt.video.i_sar_den );
     if( !p_sys->p_blend )
     {
         p_sys->p_blend = vlc_object_create( p_demux, sizeof(filter_t) );
@@ -355,7 +357,6 @@ void RenderCursor( demux_t *p_demux, int i_x, int i_y,
             if( !p_sys->p_blend->p_module )
             {
                 msg_Err( p_demux, "Could not load video blending module" );
-                vlc_object_detach( p_sys->p_blend );
                 vlc_object_release( p_sys->p_blend );
                 p_sys->p_blend = NULL;
             }