lua: remove variable callback

[vlc] / modules / video_filter / mosaic.c

diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c
index 31f2a12c5819b0f66445e5a2343c97d979ed8738..ed73a7bd5801f79abe2029f055af949e2eb245da 100644 (file)
--- a/modules/video_filter/mosaic.c
+++ b/modules/video_filter/mosaic.c
@@ -58,7 +58,6 @@ static int MosaicCallback   ( vlc_object_t *, char const *, vlc_value_t,
 struct filter_sys_t
 {
     vlc_mutex_t lock;         /* Internal filter lock */
-    vlc_mutex_t *p_lock;      /* Pointer to mosaic bridge lock */
 
     image_handler_t *p_image;
 
@@ -125,12 +124,12 @@ struct filter_sys_t
 #define ROWS_TEXT N_("Number of rows")
 #define ROWS_LONGTEXT N_( \
         "Number of image rows in the mosaic (only used if " \
-        "positionning method is set to \"fixed\")." )
+        "positioning method is set to \"fixed\")." )
 
 #define COLS_TEXT N_("Number of columns")
 #define COLS_LONGTEXT N_( \
         "Number of image columns in the mosaic (only used if " \
-        "positionning method is set to \"fixed\"." )
+        "positioning method is set to \"fixed\"." )
 
 #define AR_TEXT N_("Keep aspect ratio")
 #define AR_LONGTEXT N_( \
@@ -181,7 +180,7 @@ vlc_module_begin ()
     set_capability( "sub source", 0 )
     set_callbacks( CreateFilter, DestroyFilter )
 
-    add_integer_with_range( CFG_PREFIX "alpha", 255, 0, 255, NULL,
+    add_integer_with_range( CFG_PREFIX "alpha", 255, 0, 255,
                             ALPHA_TEXT, ALPHA_LONGTEXT, false )
 
     add_integer( CFG_PREFIX "height", 100,
@@ -200,10 +199,8 @@ vlc_module_begin ()
 
     add_integer( CFG_PREFIX "borderw", 0,
                  BORDERW_TEXT, BORDERW_LONGTEXT, true )
-        add_deprecated_alias( CFG_PREFIX "vborder" )
     add_integer( CFG_PREFIX "borderh", 0,
                  BORDERH_TEXT, BORDERH_LONGTEXT, true )
-        add_deprecated_alias( CFG_PREFIX "hborder" )
 
     add_integer( CFG_PREFIX "position", 0,
                  POS_TEXT, POS_LONGTEXT, false )
@@ -240,9 +237,7 @@ static const char *const ppsz_filter_options[] = {
  * parse the "--mosaic-offsets x1,y1,x2,y2,x3,y3" parameter
  * and set the corresponding struct filter_sys_t entries.
  *****************************************************************************/
-#define mosaic_ParseSetOffsets( a, b, c ) \
-      __mosaic_ParseSetOffsets( VLC_OBJECT( a ), b, c )
-static void __mosaic_ParseSetOffsets( vlc_object_t *p_this,
+static void mosaic_ParseSetOffsets( vlc_object_t *p_this,
                                       filter_sys_t *p_sys,
                                       char *psz_offsets )
 {
@@ -274,6 +269,8 @@ static void __mosaic_ParseSetOffsets( vlc_object_t *p_this,
         p_sys->i_offsets_length = i_index;
     }
 }
+#define mosaic_ParseSetOffsets( a, b, c ) \
+            mosaic_ParseSetOffsets( VLC_OBJECT( a ), b, c )
 
 /*****************************************************************************
  * CreateFiler: allocate mosaic video filter
@@ -282,11 +279,9 @@ static int CreateFilter( vlc_object_t *p_this )
 {
     filter_t *p_filter = (filter_t *)p_this;
     filter_sys_t *p_sys;
-    vlc_object_t *p_libvlc = VLC_OBJECT( p_filter->p_libvlc );
     char *psz_order, *_psz_order;
     char *psz_offsets;
     int i_index;
-    vlc_value_t val;
     int i_command;
 
     /* Allocate structure */
@@ -299,10 +294,6 @@ static int CreateFilter( vlc_object_t *p_this )
     vlc_mutex_init( &p_sys->lock );
     vlc_mutex_lock( &p_sys->lock );
 
-    var_Create( p_libvlc, "mosaic-lock", VLC_VAR_MUTEX );
-    var_Get( p_libvlc, "mosaic-lock", &val );
-    p_sys->p_lock = val.p_address;
-
     config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options,
                        p_filter->p_cfg );
 
@@ -466,12 +457,12 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
     p_spu->b_absolute = false;
 
     vlc_mutex_lock( &p_sys->lock );
-    vlc_mutex_lock( p_sys->p_lock );
+    vlc_global_lock( VLC_MOSAIC_MUTEX );
 
     p_bridge = GetBridge( p_filter );
     if ( p_bridge == NULL )
     {
-        vlc_mutex_unlock( p_sys->p_lock );
+        vlc_global_unlock( VLC_MOSAIC_MUTEX );
         vlc_mutex_unlock( &p_sys->lock );
         return p_spu;
     }
@@ -657,7 +648,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
         {
             msg_Err( p_filter, "cannot allocate SPU region" );
             p_filter->pf_sub_buffer_del( p_filter, p_spu );
-            vlc_mutex_unlock( p_sys->p_lock );
+            vlc_global_unlock( VLC_MOSAIC_MUTEX );
             vlc_mutex_unlock( &p_sys->lock );
             return p_spu;
         }
@@ -725,7 +716,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
         p_region_prev = p_region;
     }
 
-    vlc_mutex_unlock( p_sys->p_lock );
+    vlc_global_unlock( VLC_MOSAIC_MUTEX );
     vlc_mutex_unlock( &p_sys->lock );
 
     return p_spu;