* modules/video_filter/*: implemented a forwarding vout_vaControl().

[vlc] / modules / video_filter / logo.c

diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c
index 239818a28bcd693e2f78f7489346ae5f18a39cff..357e0c26489df3346019dfe7b1e6282994dc26fa 100644 (file)
--- a/modules/video_filter/logo.c
+++ b/modules/video_filter/logo.c
@@ -2,7 +2,7 @@
  * logo.c : logo video plugin for vlc
  *****************************************************************************
  * Copyright (C) 2003-2004 VideoLAN
- * $Id: logo.c,v 1.8 2004/01/25 10:17:19 gbazin Exp $
+ * $Id$
  *
  * Authors: Simon Latapie <garf@videolan.org>
  *
@@ -65,13 +65,15 @@ static int MouseEvent( vlc_object_t *, char const *,
 #define TRANS_LONGTEXT N_("You can change it by middle-clicking and moving mouse left or right")
 
 vlc_module_begin();
-    add_category_hint( N_("logo"), NULL, VLC_FALSE );
-    add_file( "logo_file", NULL, NULL, FILE_TEXT, FILE_LONGTEXT, VLC_FALSE );
-    add_integer( "logo_x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_FALSE );
-    add_integer( "logo_y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, VLC_FALSE );
-    add_integer_with_range( "logo_transparency", 255, 0, 255, NULL, TRANS_TEXT, TRANS_LONGTEXT, VLC_FALSE );
     set_description( _("Logo video filter") );
     set_capability( "video filter", 0 );
+
+    add_file( "logo-file", NULL, NULL, FILE_TEXT, FILE_LONGTEXT, VLC_FALSE );
+    add_integer( "logo-x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_FALSE );
+    add_integer( "logo-y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, VLC_FALSE );
+    add_integer_with_range( "logo-transparency", 255, 0, 255, NULL,
+        TRANS_TEXT, TRANS_LONGTEXT, VLC_FALSE );
+
     add_shortcut( "logo" );
     set_callbacks( Create, Destroy );
 vlc_module_end();
@@ -98,6 +100,14 @@ struct vout_sys_t
     int trans;
 };
 
+/*****************************************************************************
+ * Control: control facility for the vout (forwards to child vout)
+ *****************************************************************************/
+static int Control( vout_thread_t *p_vout, int i_query, va_list args )
+{
+    return vout_vaControl( p_vout->p_sys->p_vout, i_query, args );
+}
+
 /*****************************************************************************
  * Create: allocates logo video thread output method
  *****************************************************************************
@@ -120,6 +130,7 @@ static int Create( vlc_object_t *p_this )
     p_vout->pf_manage = NULL;
     p_vout->pf_render = Render;
     p_vout->pf_display = NULL;
+    p_vout->pf_control = Control;
 
     return VLC_SUCCESS;
 }
@@ -150,7 +161,7 @@ static int Init( vout_thread_t *p_vout )
     int i_parity_height;
 
     /*  read png file  */
-    filename = config_GetPsz( p_vout, "logo_file" );
+    filename = config_GetPsz( p_vout, "logo-file" );
     fp = fopen( filename , "rb");
     png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL , NULL , NULL);
     info_ptr = png_create_info_struct(png_ptr);
@@ -279,9 +290,9 @@ static int Init( vout_thread_t *p_vout )
 
     ADD_PARENT_CALLBACKS( SendEventsToChild );
 
-    p_vout->p_sys->posx = config_GetInt( p_vout, "logo_x" );
-    p_vout->p_sys->posy = config_GetInt( p_vout, "logo_y" );
-    p_vout->p_sys->trans = config_GetInt( p_vout, "logo_transparency");
+    p_vout->p_sys->posx = config_GetInt( p_vout, "logo-x" );
+    p_vout->p_sys->posy = config_GetInt( p_vout, "logo-y" );
+    p_vout->p_sys->trans = config_GetInt( p_vout, "logo-transparency");
 
     return VLC_SUCCESS;
 }
@@ -307,8 +318,8 @@ static void End( vout_thread_t *p_vout )
     vlc_object_detach( p_vout->p_sys->p_vout );
     vout_Destroy( p_vout->p_sys->p_vout );
 
-    config_PutInt( p_vout, "logo_x", p_vout->p_sys->posx );
-    config_PutInt( p_vout, "logo_y", p_vout->p_sys->posy );
+    config_PutInt( p_vout, "logo-x", p_vout->p_sys->posx );
+    config_PutInt( p_vout, "logo-y", p_vout->p_sys->posy );
 
     if (p_vout->p_sys->error == 0)
     {