Qt: kill a bunch of warnings

[vlc] / modules / video_filter / mosaic.c

diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c
index f9979379478335b85f17a768b3c91efbde7ee58c..ae33d26de0d3433bcb8d01f1b6536483139b09af 100644 (file)
--- a/modules/video_filter/mosaic.c
+++ b/modules/video_filter/mosaic.c
@@ -174,57 +174,57 @@ static const char *const ppsz_align_descriptions[] =
 #define CFG_PREFIX "mosaic-"
 
 vlc_module_begin ()
-    set_description( N_("Mosaic video sub filter") )
+    set_description( N_("Mosaic video sub source") )
     set_shortname( N_("Mosaic") )
     set_category( CAT_VIDEO )
     set_subcategory( SUBCAT_VIDEO_SUBPIC)
-    set_capability( "sub filter", 0 )
+    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, NULL,
+    add_integer( CFG_PREFIX "height", 100,
                  HEIGHT_TEXT, HEIGHT_LONGTEXT, false )
-    add_integer( CFG_PREFIX "width", 100, NULL,
+    add_integer( CFG_PREFIX "width", 100,
                  WIDTH_TEXT, WIDTH_LONGTEXT, false )
 
-    add_integer( CFG_PREFIX "align", 5, NULL,
+    add_integer( CFG_PREFIX "align", 5,
                  ALIGN_TEXT, ALIGN_LONGTEXT, true)
         change_integer_list( pi_align_values, ppsz_align_descriptions )
 
-    add_integer( CFG_PREFIX "xoffset", 0, NULL,
+    add_integer( CFG_PREFIX "xoffset", 0,
                  XOFFSET_TEXT, XOFFSET_LONGTEXT, true )
-    add_integer( CFG_PREFIX "yoffset", 0, NULL,
+    add_integer( CFG_PREFIX "yoffset", 0,
                  YOFFSET_TEXT, YOFFSET_LONGTEXT, true )
 
-    add_integer( CFG_PREFIX "borderw", 0, NULL,
+    add_integer( CFG_PREFIX "borderw", 0,
                  BORDERW_TEXT, BORDERW_LONGTEXT, true )
         add_deprecated_alias( CFG_PREFIX "vborder" )
-    add_integer( CFG_PREFIX "borderh", 0, NULL,
+    add_integer( CFG_PREFIX "borderh", 0,
                  BORDERH_TEXT, BORDERH_LONGTEXT, true )
         add_deprecated_alias( CFG_PREFIX "hborder" )
 
-    add_integer( CFG_PREFIX "position", 0, NULL,
+    add_integer( CFG_PREFIX "position", 0,
                  POS_TEXT, POS_LONGTEXT, false )
         change_integer_list( pi_pos_values, ppsz_pos_descriptions )
-    add_integer( CFG_PREFIX "rows", 2, NULL,
+    add_integer( CFG_PREFIX "rows", 2,
                  ROWS_TEXT, ROWS_LONGTEXT, false )
-    add_integer( CFG_PREFIX "cols", 2, NULL,
+    add_integer( CFG_PREFIX "cols", 2,
                  COLS_TEXT, COLS_LONGTEXT, false )
 
-    add_bool( CFG_PREFIX "keep-aspect-ratio", false, NULL,
+    add_bool( CFG_PREFIX "keep-aspect-ratio", false,
               AR_TEXT, AR_LONGTEXT, false )
-    add_bool( CFG_PREFIX "keep-picture", false, NULL,
+    add_bool( CFG_PREFIX "keep-picture", false,
               KEEP_TEXT, KEEP_LONGTEXT, false )
 
-    add_string( CFG_PREFIX "order", "", NULL,
+    add_string( CFG_PREFIX "order", "",
                 ORDER_TEXT, ORDER_LONGTEXT, false )
 
-    add_string( CFG_PREFIX "offsets", "", NULL,
+    add_string( CFG_PREFIX "offsets", "",
                 OFFSETS_TEXT, OFFSETS_LONGTEXT, false )
 
-    add_integer( CFG_PREFIX "delay", 0, NULL, DELAY_TEXT, DELAY_LONGTEXT,
+    add_integer( CFG_PREFIX "delay", 0, DELAY_TEXT, DELAY_LONGTEXT,
                  false )
 vlc_module_end ()
 
@@ -289,15 +289,12 @@ static int CreateFilter( vlc_object_t *p_this )
     vlc_value_t val;
     int i_command;
 
-    /* The mosaic thread is more important than the decoder threads */
-    vlc_thread_set_priority( p_this, VLC_THREAD_PRIORITY_OUTPUT );
-
     /* Allocate structure */
     p_sys = p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
     if( p_sys == NULL )
         return VLC_ENOMEM;
 
-    p_filter->pf_sub_filter = Filter;
+    p_filter->pf_sub_source = Filter;
 
     vlc_mutex_init( &p_sys->lock );
     vlc_mutex_lock( &p_sys->lock );