modules/video_filter/Modules.am: added time, for those that don't know the

fen-trick
time.c: fixed a few copy/paste bugs and some warnings

diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am
index 92b74ccde4812e067189456f69df55a3a50e81bc..cb9473fd9ac2d3d9ace66a232a8262f928edc31a 100644 (file)
--- a/modules/video_filter/Modules.am
+++ b/modules/video_filter/Modules.am
@@ -10,4 +10,5 @@ SOURCES_logo = logo.c
 SOURCES_deinterlace = deinterlace.c
 SOURCES_blend = blend.c
 SOURCES_scale = scale.c
+SOURCES_time = time.c
 noinst_HEADERS += filter_common.h

diff --git a/modules/video_filter/time.c b/modules/video_filter/time.c
index 21813240a1f73d7ec4d40ac491d929ec54a92281..2945136e6e732a838bf3666c14c33b2fdccfc6aa 100644 (file)
--- a/modules/video_filter/time.c
+++ b/modules/video_filter/time.c
@@ -31,7 +31,6 @@
 #include <vlc/vout.h>
 
 #include "vlc_filter.h"
-#include "filter_common.h"
 #include "vlc_block.h"
 
 /*****************************************************************************
@@ -46,13 +45,6 @@ static subpicture_t *Filter( filter_t *, mtime_t );
  *****************************************************************************/
 struct filter_sys_t
 {
-    picture_t *p_pic;
-
-    int i_width, i_height;
-    int posx, posy;
-
-    mtime_t i_last_date;
-    filter_t *p_text;
 };
 
 
@@ -62,8 +54,8 @@ struct filter_sys_t
 vlc_module_begin();
     set_capability( "sub filter", 0 );
     set_callbacks( CreateFilter, DestroyFilter );
-    set_description( _("Logo sub filter") );
-    add_shortcut( "logo" );
+    set_description( _("Time display sub filter") );
+    add_shortcut( "time" );
 vlc_module_end();
 
 /*****************************************************************************
@@ -116,9 +108,7 @@ char *myCtime( time_t *t )
  ****************************************************************************/
 static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
 {
-    filter_sys_t *p_sys = p_filter->p_sys;
     subpicture_t *p_spu;
-    subpicture_region_t *p_region;
     video_format_t fmt;
     time_t t;
     p_spu = p_filter->pf_sub_buffer_new( p_filter );