cvdsub: remove unused variable

[vlc] / modules / video_filter / osdmenu.c

diff --git a/modules/video_filter/osdmenu.c b/modules/video_filter/osdmenu.c
index 7e2efd2b86fbe517c25d795fb45f7cf594fe4325..1b4b9444fe683b69ee89651516dee32f558e5e2a 100644 (file)
--- a/modules/video_filter/osdmenu.c
+++ b/modules/video_filter/osdmenu.c
@@ -84,7 +84,7 @@ static const char *const ppsz_pos_descriptions[] =
 { N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"),
   N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") };
 
-/* subfilter functions */
+/* subsource functions */
 static int  CreateFilter ( vlc_object_t * );
 static void DestroyFilter( vlc_object_t * );
 static subpicture_t *Filter( filter_t *, mtime_t );
@@ -106,7 +106,7 @@ static int MouseEvent( filter_t *,
 #if defined( WIN32 ) || defined( UNDER_CE )
 #define OSD_DEFAULT_CFG "osdmenu/default.cfg"
 #else
-#define OSD_DEFAULT_CFG "share/osdmenu/default.cfg"
+#define OSD_DEFAULT_CFG PKGDATADIR"/osdmenu/default.cfg"
 #endif
 
 #define OSD_UPDATE_MIN     0
@@ -114,7 +114,7 @@ static int MouseEvent( filter_t *,
 #define OSD_UPDATE_MAX     1000
 
 vlc_module_begin ()
-    set_capability( "sub filter", 100 )
+    set_capability( "sub source", 100 )
     set_description( N_("On Screen Display menu") )
     set_shortname( N_("OSD menu") )
     add_shortcut( "osdmenu" )
@@ -129,22 +129,22 @@ vlc_module_begin ()
     add_integer( OSD_CFG "position", 8, POS_TEXT, POS_LONGTEXT,
                  false )
         change_integer_list( pi_pos_values, ppsz_pos_descriptions )
-    add_string( OSD_CFG "file", OSD_DEFAULT_CFG, OSD_FILE_TEXT,
+    add_loadfile( OSD_CFG "file", OSD_DEFAULT_CFG, OSD_FILE_TEXT,
         OSD_FILE_LONGTEXT, false )
-    add_string( OSD_CFG "file-path", NULL, OSD_PATH_TEXT,
+    add_directory( OSD_CFG "file-path", NULL, OSD_PATH_TEXT,
         OSD_PATH_LONGTEXT, false )
     add_integer( OSD_CFG "timeout", 15, TIMEOUT_TEXT,
         TIMEOUT_LONGTEXT, false )
     add_integer_with_range( OSD_CFG "update", OSD_UPDATE_DEFAULT,
-        OSD_UPDATE_MIN, OSD_UPDATE_MAX, NULL, OSD_UPDATE_TEXT,
+        OSD_UPDATE_MIN, OSD_UPDATE_MAX, OSD_UPDATE_TEXT,
         OSD_UPDATE_LONGTEXT, true )
-    add_integer_with_range( OSD_CFG "alpha", 255, 0, 255, NULL,
+    add_integer_with_range( OSD_CFG "alpha", 255, 0, 255,
         OSD_ALPHA_TEXT, OSD_ALPHA_LONGTEXT, true )
 
 vlc_module_end ()
 
 /*****************************************************************************
- * Sub filter code
+ * Sub source code
  *****************************************************************************/
 
 /*****************************************************************************
@@ -250,8 +250,8 @@ static int CreateFilter ( vlc_object_t *p_this )
     var_AddCallback( p_sys->p_menu, "osd-menu-visible",
                      OSDMenuVisibleEvent, p_filter );
 
-    /* Attach subpicture filter callback */
-    p_filter->pf_sub_filter = Filter;
+    /* Attach subpicture source callback */
+    p_filter->pf_sub_source = Filter;
     p_filter->pf_sub_mouse  = MouseEvent;
 
     es_format_Init( &p_filter->fmt_out, SPU_ES, VLC_CODEC_SPU );
@@ -462,7 +462,6 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t i_date )
         p_sys->i_end_date = p_spu->i_stop;
     }
 
-    p_sys->i_last_date = i_date;
     p_spu->i_start = p_sys->i_last_date = i_date;
 
     /* Send an empty subpicture to clear the display
@@ -572,7 +571,7 @@ static int OSDMenuCallback( vlc_object_t *p_this, char const *psz_var,
     if( !p_sys )
         return VLC_SUCCESS;
 
-    if( !strncmp( psz_var, OSD_CFG"position", 16) )
+    if( !strcmp( psz_var, OSD_CFG"position") )
     {
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
         unsigned int i;
@@ -586,8 +585,8 @@ static int OSDMenuCallback( vlc_object_t *p_this, char const *psz_var,
         }
 #undef ARRAY_SIZE
     }
-    else if( !strncmp( psz_var, OSD_CFG"x", 9) ||
-             !strncmp( psz_var, OSD_CFG"y", 9))
+    else if( !strcmp( psz_var, OSD_CFG"x") ||
+             !strcmp( psz_var, OSD_CFG"y"))
     {
         p_sys->b_absolute = true;
         if( (p_sys->i_x < 0) || (p_sys->i_y < 0) )
@@ -602,11 +601,11 @@ static int OSDMenuCallback( vlc_object_t *p_this, char const *psz_var,
             p_sys->p_menu->i_y = p_sys->i_y;
         }
     }
-    else if( !strncmp( psz_var, OSD_CFG"update", 14) )
+    else if( !strcmp( psz_var, OSD_CFG"update") )
         p_sys->i_update =  newval.i_int * INT64_C(1000);
-    else if( !strncmp( psz_var, OSD_CFG"timeout", 15) )
+    else if( !strcmp( psz_var, OSD_CFG"timeout") )
         p_sys->i_update = newval.i_int % 1000;
-    else if( !strncmp( psz_var, OSD_CFG"alpha", 13) )
+    else if( !strcmp( psz_var, OSD_CFG"alpha") )
         p_sys->i_alpha = newval.i_int % 256;
 
     p_sys->b_update = p_sys->b_visible ? true : false;