From 9580417f22c2b5a68daf68cb5808b506a12311f9 Mon Sep 17 00:00:00 2001 From: Laurent Aimar Date: Tue, 13 Apr 2010 22:33:46 +0200 Subject: [PATCH] Do not use video_filter wrapper for puzzle/magnify/logo. --- modules/gui/qt4/components/extended_panels.cpp | 5 +---- modules/video_filter/wrapper.c | 13 ------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/modules/gui/qt4/components/extended_panels.cpp b/modules/gui/qt4/components/extended_panels.cpp index 9296c57eb9..3c1c990d7d 100644 --- a/modules/gui/qt4/components/extended_panels.cpp +++ b/modules/gui/qt4/components/extended_panels.cpp @@ -274,10 +274,7 @@ void ExtVideo::ChangeVFiltersString( const char *psz_name, bool b_add ) /* FIXME temporary hack */ const char *psz_module_name = psz_name; - if( !strcmp( psz_name, "magnify" ) || - !strcmp( psz_name, "puzzle" ) || - !strcmp( psz_name, "logo" ) || - !strcmp( psz_name, "wall" ) || + if( !strcmp( psz_name, "wall" ) || !strcmp( psz_name, "panoramix" ) || !strcmp( psz_name, "clone" ) ) psz_module_name = "video_filter_wrapper"; diff --git a/modules/video_filter/wrapper.c b/modules/video_filter/wrapper.c index 0f45f51a3b..99ff4276e7 100644 --- a/modules/video_filter/wrapper.c +++ b/modules/video_filter/wrapper.c @@ -47,10 +47,6 @@ static void Close( vlc_object_t * ); #define DECLARE_OPEN(name,filter) \ static int Open##name ( vlc_object_t *p_this ) { return Open( p_this, #name, filter ); } -DECLARE_OPEN(magnify, true) -DECLARE_OPEN(puzzle, true) -DECLARE_OPEN(logo, true) - DECLARE_OPEN(clone, false) DECLARE_OPEN(wall, false) DECLARE_OPEN(panoramix, false) @@ -68,15 +64,6 @@ vlc_module_begin() set_category( CAT_VIDEO ) set_subcategory( SUBCAT_VIDEO_VFILTER ) - DECLARE_MODULE(magnify) - - add_submodule() - DECLARE_MODULE(puzzle) - - add_submodule() - DECLARE_MODULE(logo) - - add_submodule() DECLARE_MODULE(clone) add_submodule() -- 2.39.2