XCB/window: implement --video-title, UTF-8 names

[vlc] / modules / video_filter / mosaic.c

diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c
index 6bbdb4a0f62f1a9114f0e809a1405d24d4f22889..fdc506c31b763fb65bcb9a7f9cfa6c815554ca1c 100644 (file)
--- a/modules/video_filter/mosaic.c
+++ b/modules/video_filter/mosaic.c
@@ -174,60 +174,60 @@ static const char *const ppsz_align_descriptions[] =
 
 #define CFG_PREFIX "mosaic-"
 
-vlc_module_begin();
-    set_description( N_("Mosaic video sub filter") );
-    set_shortname( N_("Mosaic") );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_SUBPIC);
-    set_capability( "sub filter", 0 );
-    set_callbacks( CreateFilter, DestroyFilter );
+vlc_module_begin ()
+    set_description( N_("Mosaic video sub filter") )
+    set_shortname( N_("Mosaic") )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_SUBPIC)
+    set_capability( "sub filter", 0 )
+    set_callbacks( CreateFilter, DestroyFilter )
 
     add_integer_with_range( CFG_PREFIX "alpha", 255, 0, 255, NULL,
-                            ALPHA_TEXT, ALPHA_LONGTEXT, false );
+                            ALPHA_TEXT, ALPHA_LONGTEXT, false )
 
     add_integer( CFG_PREFIX "height", 100, NULL,
-                 HEIGHT_TEXT, HEIGHT_LONGTEXT, false );
+                 HEIGHT_TEXT, HEIGHT_LONGTEXT, false )
     add_integer( CFG_PREFIX "width", 100, NULL,
-                 WIDTH_TEXT, WIDTH_LONGTEXT, false );
+                 WIDTH_TEXT, WIDTH_LONGTEXT, false )
 
     add_integer( CFG_PREFIX "align", 5, NULL,
-                 ALIGN_TEXT, ALIGN_LONGTEXT, true);
-        change_integer_list( pi_align_values, ppsz_align_descriptions, NULL );
+                 ALIGN_TEXT, ALIGN_LONGTEXT, true)
+        change_integer_list( pi_align_values, ppsz_align_descriptions, NULL )
 
     add_integer( CFG_PREFIX "xoffset", 0, NULL,
-                 XOFFSET_TEXT, XOFFSET_LONGTEXT, true );
+                 XOFFSET_TEXT, XOFFSET_LONGTEXT, true )
     add_integer( CFG_PREFIX "yoffset", 0, NULL,
-                 YOFFSET_TEXT, YOFFSET_LONGTEXT, true );
+                 YOFFSET_TEXT, YOFFSET_LONGTEXT, true )
 
     add_integer( CFG_PREFIX "borderw", 0, NULL,
-                 BORDERW_TEXT, BORDERW_LONGTEXT, true );
-        add_deprecated_alias( CFG_PREFIX "vborder" );
+                 BORDERW_TEXT, BORDERW_LONGTEXT, true )
+        add_deprecated_alias( CFG_PREFIX "vborder" )
     add_integer( CFG_PREFIX "borderh", 0, NULL,
-                 BORDERH_TEXT, BORDERH_LONGTEXT, true );
-        add_deprecated_alias( CFG_PREFIX "hborder" );
+                 BORDERH_TEXT, BORDERH_LONGTEXT, true )
+        add_deprecated_alias( CFG_PREFIX "hborder" )
 
     add_integer( CFG_PREFIX "position", 0, NULL,
-                 POS_TEXT, POS_LONGTEXT, false );
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
+                 POS_TEXT, POS_LONGTEXT, false )
+        change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL )
     add_integer( CFG_PREFIX "rows", 2, NULL,
-                 ROWS_TEXT, ROWS_LONGTEXT, false );
+                 ROWS_TEXT, ROWS_LONGTEXT, false )
     add_integer( CFG_PREFIX "cols", 2, NULL,
-                 COLS_TEXT, COLS_LONGTEXT, false );
+                 COLS_TEXT, COLS_LONGTEXT, false )
 
     add_bool( CFG_PREFIX "keep-aspect-ratio", 0, NULL,
-              AR_TEXT, AR_LONGTEXT, false );
+              AR_TEXT, AR_LONGTEXT, false )
     add_bool( CFG_PREFIX "keep-picture", 0, NULL,
-              KEEP_TEXT, KEEP_LONGTEXT, false );
+              KEEP_TEXT, KEEP_LONGTEXT, false )
 
     add_string( CFG_PREFIX "order", "", NULL,
-                ORDER_TEXT, ORDER_LONGTEXT, false );
+                ORDER_TEXT, ORDER_LONGTEXT, false )
 
     add_string( CFG_PREFIX "offsets", "", NULL,
-                OFFSETS_TEXT, OFFSETS_LONGTEXT, false );
+                OFFSETS_TEXT, OFFSETS_LONGTEXT, false )
 
     add_integer( CFG_PREFIX "delay", 0, NULL, DELAY_TEXT, DELAY_LONGTEXT,
-                 false );
-vlc_module_end();
+                 false )
+vlc_module_end ()
 
 static const char *const ppsz_filter_options[] = {
     "alpha", "height", "width", "align", "xoffset", "yoffset",
@@ -288,6 +288,7 @@ static int CreateFilter( vlc_object_t *p_this )
     char *psz_offsets;
     int i_index;
     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 );
@@ -310,8 +311,8 @@ static int CreateFilter( vlc_object_t *p_this )
                        p_filter->p_cfg );
 
 #define GET_VAR( name, min, max )                                           \
-    p_sys->i_##name = __MIN( max, __MAX( min,                               \
-        var_CreateGetIntegerCommand( p_filter, CFG_PREFIX #name ) ) );      \
+    i_command = var_CreateGetIntegerCommand( p_filter, CFG_PREFIX #name );  \
+    p_sys->i_##name = __MIN( max, __MAX( min, i_command ) );                \
     var_AddCallback( p_filter, CFG_PREFIX #name, MosaicCallback, p_sys );
 
     GET_VAR( width, 0, INT_MAX );
@@ -330,6 +331,7 @@ static int CreateFilter( vlc_object_t *p_this )
     GET_VAR( alpha, 0, 255 );
     GET_VAR( position, 0, 2 );
     GET_VAR( delay, 100, INT_MAX );
+#undef GET_VAR
     p_sys->i_delay *= 1000;
 
     p_sys->b_ar = var_CreateGetBoolCommand( p_filter,
@@ -495,7 +497,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
             if ( !p_es->b_empty )
             {
                 i_numpics ++;
-                if( p_sys->i_order_length && p_es->psz_id != 0 )
+                if( p_sys->i_order_length && p_es->psz_id != NULL )
                 {
                     /* We also want to leave slots for images given in
                      * mosaic-order that are not available in p_vout_picture */