vlc_threads_funcs.h and vlc_module_macros.h have been deleted

[vlc] / modules / video_filter / logo.c

diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c
index 37d812bd43f143e5d6d7e89eb6351e4c59dcce64..038e248c86a0281b5d4c2866b1835bc2c4cefcb0 100644 (file)
--- a/modules/video_filter/logo.c
+++ b/modules/video_filter/logo.c
@@ -25,10 +25,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <vlc/vlc.h>
+#include <vlc_plugin.h>
 #include <vlc_vout.h>
 
 #include "vlc_filter.h"
@@ -106,15 +109,15 @@ vlc_module_begin();
     add_shortcut( "logo" );
     set_callbacks( Create, Destroy );
 
-    add_file( CFG_PREFIX "file", NULL, NULL, FILE_TEXT, FILE_LONGTEXT, VLC_FALSE );
-    add_integer( CFG_PREFIX "x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_TRUE );
-    add_integer( CFG_PREFIX "y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, VLC_TRUE );
+    add_file( CFG_PREFIX "file", NULL, NULL, FILE_TEXT, FILE_LONGTEXT, false );
+    add_integer( CFG_PREFIX "x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, true );
+    add_integer( CFG_PREFIX "y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, true );
     /* default to 1000 ms per image, continuously cycle through them */
-    add_integer( CFG_PREFIX "delay", 1000, NULL, DELAY_TEXT, DELAY_LONGTEXT, VLC_TRUE );
-    add_integer( CFG_PREFIX "repeat", -1, NULL, REPEAT_TEXT, REPEAT_LONGTEXT, VLC_TRUE );
+    add_integer( CFG_PREFIX "delay", 1000, NULL, DELAY_TEXT, DELAY_LONGTEXT, true );
+    add_integer( CFG_PREFIX "repeat", -1, NULL, REPEAT_TEXT, REPEAT_LONGTEXT, true );
     add_integer_with_range( CFG_PREFIX "transparency", 255, 0, 255, NULL,
-        TRANS_TEXT, TRANS_LONGTEXT, VLC_FALSE );
-    add_integer( CFG_PREFIX "position", 6, NULL, POS_TEXT, POS_LONGTEXT, VLC_FALSE );
+        TRANS_TEXT, TRANS_LONGTEXT, false );
+    add_integer( CFG_PREFIX "position", -1, NULL, POS_TEXT, POS_LONGTEXT, false );
         change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
 
     /* subpicture filter submodule */
@@ -324,13 +327,6 @@ static int Create( vlc_object_t *p_this )
         return VLC_ENOMEM;
     }
 
-    p_vout->pf_init = Init;
-    p_vout->pf_end = End;
-    p_vout->pf_manage = NULL;
-    p_vout->pf_render = Render;
-    p_vout->pf_display = NULL;
-    p_vout->pf_control = Control;
-
     config_ChainParse( p_vout, CFG_PREFIX, ppsz_filter_options,
                        p_vout->p_cfg );
 
@@ -339,9 +335,16 @@ static int Create( vlc_object_t *p_this )
     if( !p_logo_list->psz_filename || !*p_logo_list->psz_filename )
     {
         msg_Err( p_vout, "logo file not specified" );
-        return 0;
+        return VLC_EGENERIC;
     }
 
+    p_vout->pf_init = Init;
+    p_vout->pf_end = End;
+    p_vout->pf_manage = NULL;
+    p_vout->pf_render = Render;
+    p_vout->pf_display = NULL;
+    p_vout->pf_control = Control;
+
     p_sys->pos = var_CreateGetIntegerCommand( p_vout, "logo-position" );
     p_sys->posx = var_CreateGetIntegerCommand( p_vout, "logo-x" );
     p_sys->posy = var_CreateGetIntegerCommand( p_vout, "logo-y" );
@@ -415,7 +418,7 @@ static int Init( vout_thread_t *p_vout )
     {
         msg_Err( p_vout, "can't open blending filter, aborting" );
         vlc_object_detach( p_sys->p_blend );
-        vlc_object_destroy( p_sys->p_blend );
+        vlc_object_release( p_sys->p_blend );
         return VLC_EGENERIC;
     }
 
@@ -496,7 +499,7 @@ static void End( vout_thread_t *p_vout )
     if( p_sys->p_blend->p_module )
         module_Unneed( p_sys->p_blend, p_sys->p_blend->p_module );
     vlc_object_detach( p_sys->p_blend );
-    vlc_object_destroy( p_sys->p_blend );
+    vlc_object_release( p_sys->p_blend );
 }
 
 /*****************************************************************************
@@ -602,6 +605,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_inpic )
 static int SendEvents( vlc_object_t *p_this, char const *psz_var,
                        vlc_value_t oldval, vlc_value_t newval, void *p_data )
 {
+    VLC_UNUSED(p_this); VLC_UNUSED(oldval);
     var_Set( (vlc_object_t *)p_data, psz_var, newval );
     return VLC_SUCCESS;
 }
@@ -612,6 +616,7 @@ static int SendEvents( vlc_object_t *p_this, char const *psz_var,
 static int MouseEvent( vlc_object_t *p_this, char const *psz_var,
                        vlc_value_t oldval, vlc_value_t newval, void *p_data )
 {
+    VLC_UNUSED(p_this); VLC_UNUSED(oldval);
     vout_thread_t *p_vout = (vout_thread_t*)p_data;
     vout_sys_t *p_sys = p_vout->p_sys;
     vlc_value_t valb;
@@ -670,6 +675,7 @@ static int Control( vout_thread_t *p_vout, int i_query, va_list args )
 static int SendEventsToChild( vlc_object_t *p_this, char const *psz_var,
                        vlc_value_t oldval, vlc_value_t newval, void *p_data )
 {
+    VLC_UNUSED(p_data); VLC_UNUSED(oldval);
     vout_thread_t *p_vout = (vout_thread_t *)p_this;
     var_Set( p_vout->p_sys->p_vout, psz_var, newval );
     return VLC_SUCCESS;
@@ -684,11 +690,11 @@ struct filter_sys_t
 
     int pos, posx, posy;
 
-    vlc_bool_t b_absolute;
+    bool b_absolute;
     mtime_t i_last_date;
 
     /* On the fly control variable */
-    vlc_bool_t b_need_update;
+    bool b_need_update;
 };
 
 static subpicture_t *Filter( filter_t *, mtime_t );
@@ -748,7 +754,7 @@ static int CreateFilter( vlc_object_t *p_this )
     var_AddCallback( p_filter, "logo-transparency", LogoCallback, p_sys );
     var_AddCallback( p_filter, "logo-repeat", LogoCallback, p_sys );
 
-    vlc_mutex_init( p_filter, &p_logo_list->lock );
+    vlc_mutex_init( &p_logo_list->lock );
     vlc_mutex_lock( &p_logo_list->lock );
 
     LoadLogoList( p_this, p_logo_list );
@@ -757,7 +763,7 @@ static int CreateFilter( vlc_object_t *p_this )
 
     /* Misc init */
     p_filter->pf_sub_filter = Filter;
-    p_sys->b_need_update = VLC_TRUE;
+    p_sys->b_need_update = true;
 
     p_sys->i_last_date = 0;
 
@@ -833,9 +839,9 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
     p_spu->b_absolute = p_sys->b_absolute;
     p_spu->i_start = p_sys->i_last_date = date;
     p_spu->i_stop = 0;
-    p_spu->b_ephemer = VLC_TRUE;
+    p_spu->b_ephemer = true;
 
-    p_sys->b_need_update = VLC_FALSE;
+    p_sys->b_need_update = false;
     p_logo_list->i_next_pic = date +
     ( p_logo->i_delay != -1 ? p_logo->i_delay : p_logo_list->i_delay ) * 1000;
 
@@ -879,21 +885,20 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
     vlc_mutex_unlock( &p_logo_list->lock );
 
     /*  where to locate the logo: */
-    if( p_sys->posx < 0 || p_sys->posy < 0 )
-    {   /* set to one of the 9 relative locations */
-        p_region->i_align = p_sys->pos;
-        p_spu->i_x = 0;
-        p_spu->i_y = 0;
-        p_spu->b_absolute = VLC_FALSE;
+    if( p_sys->pos < 0 )
+    {   /*  set to an absolute xy */
+        p_region->i_align = OSD_ALIGN_RIGHT | OSD_ALIGN_TOP;
+        p_spu->b_absolute = true;
     }
     else
-    {   /*  set to an absolute xy, referenced to upper left corner */
-        p_region->i_align = OSD_ALIGN_LEFT | OSD_ALIGN_TOP;
-        p_spu->i_x = p_sys->posx;
-        p_spu->i_y = p_sys->posy;
-        p_spu->b_absolute = VLC_TRUE;
+    {   /* set to one of the 9 relative locations */
+        p_region->i_align = p_sys->pos;
+        p_spu->b_absolute = false;
     }
 
+    p_spu->i_x = p_sys->posx;
+    p_spu->i_y = p_sys->posy;
+
     p_spu->p_region = p_region;
 
     p_spu->i_alpha = ( p_logo->i_alpha != -1 ?
@@ -908,6 +913,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
 static int LogoCallback( vlc_object_t *p_this, char const *psz_var,
                          vlc_value_t oldval, vlc_value_t newval, void *p_data )
 {
+    VLC_UNUSED(oldval);
     filter_sys_t *p_sys = (filter_sys_t *)p_data;
     logo_list_t *p_logo_list = p_sys->p_logo_list;
 
@@ -918,7 +924,7 @@ static int LogoCallback( vlc_object_t *p_this, char const *psz_var,
         p_logo_list->psz_filename = strdup( newval.psz_string );
         LoadLogoList( p_this, p_logo_list );
         vlc_mutex_unlock( &p_logo_list->lock );
-        p_sys->b_need_update = VLC_TRUE;
+        p_sys->b_need_update = true;
     }
     else if ( !strncmp( psz_var, "logo-x", 6 ) )
     {
@@ -944,6 +950,6 @@ static int LogoCallback( vlc_object_t *p_this, char const *psz_var,
         p_logo_list->i_repeat = newval.i_int;
         vlc_mutex_unlock( &p_logo_list->lock );
     }
-    p_sys->b_need_update = VLC_TRUE;
+    p_sys->b_need_update = true;
     return VLC_SUCCESS;
 }