Qt4 - pixmaps again. Removing bigger images, useless ones, and cleaning.

[vlc] / modules / video_filter / logo.c

diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c
index 5e63e56b260d3b90dcf47094a69c7db14312eadb..8147d1638014ff9983f1fde2402041da28307211 100644 (file)
--- a/modules/video_filter/logo.c
+++ b/modules/video_filter/logo.c
@@ -25,8 +25,6 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
 
 #include <vlc/vlc.h>
 #include <vlc_vout.h>
@@ -122,7 +120,6 @@ vlc_module_begin();
     set_capability( "sub filter", 0 );
     set_callbacks( CreateFilter, DestroyFilter );
     set_description( _("Logo sub filter") );
-    add_shortcut( "logo" );
 vlc_module_end();
 
 static const char *ppsz_filter_options[] = {
@@ -171,7 +168,11 @@ static picture_t *LoadImage( vlc_object_t *p_this, char *psz_filename )
 {
     picture_t *p_pic;
     image_handler_t *p_image;
-    video_format_t fmt_in = {0}, fmt_out = {0};
+    video_format_t fmt_in;
+    video_format_t fmt_out;
+
+    memset( &fmt_in, 0, sizeof(video_format_t) );
+    memset( &fmt_out, 0, sizeof(video_format_t) );
 
     fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A');
     p_image = image_HandlerCreate( p_this );
@@ -304,7 +305,6 @@ static int Create( vlc_object_t *p_this )
 {
     vout_thread_t *p_vout = (vout_thread_t *)p_this;
     vout_sys_t *p_sys;
-    vlc_value_t val;
     logo_list_t *p_logo_list;
 
     /* Allocate structure */
@@ -329,22 +329,25 @@ static int Create( vlc_object_t *p_this )
     p_vout->pf_display = NULL;
     p_vout->pf_control = Control;
 
-    p_logo_list->psz_filename = var_CreateGetStringCommand( p_this,
+    config_ChainParse( p_vout, CFG_PREFIX, ppsz_filter_options,
+                       p_vout->p_cfg );
+
+    p_logo_list->psz_filename = var_CreateGetStringCommand( p_vout,
                                                             "logo-file" );
     if( !p_logo_list->psz_filename || !*p_logo_list->psz_filename )
     {
-        msg_Err( p_this, "logo file not specified" );
+        msg_Err( p_vout, "logo file not specified" );
         return 0;
     }
 
-    p_sys->pos = var_CreateGetIntegerCommand( p_this, "logo-position" );
-    p_sys->posx = var_CreateGetIntegerCommand( p_this, "logo-x" );
-    p_sys->posy = var_CreateGetIntegerCommand( p_this, "logo-y" );
+    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" );
     p_logo_list->i_delay = __MAX( __MIN(
-        var_CreateGetIntegerCommand( p_this, "logo-delay" ) , 60000 ), 0 );
-    p_logo_list->i_repeat = var_CreateGetIntegerCommand( p_this, "logo-repeat");
+        var_CreateGetIntegerCommand( p_vout, "logo-delay" ) , 60000 ), 0 );
+    p_logo_list->i_repeat = var_CreateGetIntegerCommand( p_vout, "logo-repeat");
     p_logo_list->i_alpha = __MAX( __MIN(
-        var_CreateGetIntegerCommand( p_this, "logo-transparency" ), 255 ), 0 );
+        var_CreateGetIntegerCommand( p_vout, "logo-transparency" ), 255 ), 0 );
 
     LoadLogoList( p_vout, p_logo_list );
 
@@ -359,11 +362,11 @@ static int Init( vout_thread_t *p_vout )
     vout_sys_t *p_sys = p_vout->p_sys;
     picture_t *p_pic;
     int i_index;
-    video_format_t fmt = {0};
-
+    video_format_t fmt;
     logo_list_t *p_logo_list = p_sys->p_logo_list;
 
     I_OUTPUTPICTURES = 0;
+    memset( &fmt, 0, sizeof(video_format_t) );
 
     /* adjust index to the next logo */
     p_logo_list->i_counter =
@@ -715,10 +718,9 @@ static int CreateFilter( vlc_object_t *p_this )
     config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options,
                        p_filter->p_cfg );
 
-
     /* Hook used for callback variables */
     p_logo_list->psz_filename =
-        var_CreateGetStringCommand( p_filter->p_libvlc_global , "logo-file" );
+        var_CreateGetStringCommand( p_filter, "logo-file" );
     if( !p_logo_list->psz_filename || !*p_logo_list->psz_filename )
     {
         msg_Err( p_this, "logo file not specified" );
@@ -737,12 +739,12 @@ static int CreateFilter( vlc_object_t *p_this )
     p_logo_list->i_repeat =
         var_CreateGetIntegerCommand( p_filter, "logo-repeat" );
 
-    var_AddCallback( p_filter->p_libvlc_global, "logo-file", LogoCallback, p_sys );
-    var_AddCallback( p_filter->p_libvlc_global, "logo-x", LogoCallback, p_sys );
-    var_AddCallback( p_filter->p_libvlc_global, "logo-y", LogoCallback, p_sys );
-    var_AddCallback( p_filter->p_libvlc_global, "logo-position", LogoCallback, p_sys );
-    var_AddCallback( p_filter->p_libvlc_global, "logo-transparency", LogoCallback, p_sys );
-    var_AddCallback( p_filter->p_libvlc_global, "logo-repeat", LogoCallback, p_sys );
+    var_AddCallback( p_filter, "logo-file", LogoCallback, p_sys );
+    var_AddCallback( p_filter, "logo-x", LogoCallback, p_sys );
+    var_AddCallback( p_filter, "logo-y", LogoCallback, p_sys );
+    var_AddCallback( p_filter, "logo-position", LogoCallback, p_sys );
+    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_lock( &p_logo_list->lock );
@@ -774,13 +776,13 @@ static void DestroyFilter( vlc_object_t *p_this )
     free( p_sys );
 
     /* Delete the logo variables from INPUT */
-    var_Destroy( p_filter->p_libvlc_global , "logo-file" );
-    var_Destroy( p_filter->p_libvlc_global , "logo-x" );
-    var_Destroy( p_filter->p_libvlc_global , "logo-y" );
-    var_Destroy( p_filter->p_libvlc_global , "logo-delay" );
-    var_Destroy( p_filter->p_libvlc_global , "logo-repeat" );
-    var_Destroy( p_filter->p_libvlc_global , "logo-position" );
-    var_Destroy( p_filter->p_libvlc_global , "logo-transparency" );
+    var_Destroy( p_filter->p_libvlc, "logo-file" );
+    var_Destroy( p_filter->p_libvlc, "logo-x" );
+    var_Destroy( p_filter->p_libvlc, "logo-y" );
+    var_Destroy( p_filter->p_libvlc, "logo-delay" );
+    var_Destroy( p_filter->p_libvlc, "logo-repeat" );
+    var_Destroy( p_filter->p_libvlc, "logo-position" );
+    var_Destroy( p_filter->p_libvlc, "logo-transparency" );
 }
 
 /*****************************************************************************
@@ -877,14 +879,14 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
     /*  where to locate the logo: */
     if( p_sys->posx < 0 || p_sys->posy < 0 )
     {   /* set to one of the 9 relative locations */
-        p_spu->i_flags = p_sys->pos;
+        p_region->i_align = p_sys->pos;
         p_spu->i_x = 0;
         p_spu->i_y = 0;
         p_spu->b_absolute = VLC_FALSE;
     }
     else
     {   /*  set to an absolute xy, referenced to upper left corner */
-        p_spu->i_flags = OSD_ALIGN_LEFT | OSD_ALIGN_TOP;
+        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;