* access2: added shortcuts for vcd/svcd.

[vlc] / modules / video_filter / logo.c

diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c
index 169aff01fc2c119f4ba5dcfa0d92b7cf567d507c..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.9 2004/01/25 15:55:37 sigmunau 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 );
+    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 );
-    set_description( _("Logo video filter") );
-    set_capability( "video filter", 0 );
+    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;
 }