From 1fa3f9dd6e748b80c83a4b358c6b262e62494cdb Mon Sep 17 00:00:00 2001
From: =?utf8?q?Cl=C3=A9ment=20Stenac?= <zorglub@videolan.org>
Date: Wed, 6 Sep 2006 21:05:21 +0000
Subject: [PATCH] Preferences categories are *not* categories. They are *user*
 strings.

---
 include/vlc_config_cat.h           | 8 --------
 modules/video_filter/adjust.c      | 2 +-
 modules/video_filter/gradient.c    | 2 +-
 modules/video_filter/invert.c      | 2 +-
 modules/video_filter/psychedelic.c | 2 +-
 modules/video_filter/ripple.c      | 2 +-
 modules/video_filter/wave.c        | 2 +-
 7 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/include/vlc_config_cat.h b/include/vlc_config_cat.h
index 7578d41a5e..f963a3f069 100644
--- a/include/vlc_config_cat.h
+++ b/include/vlc_config_cat.h
@@ -86,10 +86,6 @@
 #define VFILTER_HELP N_( \
     "Video filters are used to postprocess the video stream." )
 
-#define VFILTER2_TITLE N_("Filters (v2)" )
-#define VFILTER2_HELP N_( \
-    "Video filters are used to postprocess the video stream." )
-
 #define SUBPIC_TITLE N_( "Subtitles/OSD")
 #define SUBPIC_HELP N_( "Miscellaneous settings related to On-Screen-Display,"\
         " subtitles and \"overlay subpictures\".")
@@ -231,9 +227,6 @@
     "In this section you can force the behavior of the subtitle demuxer, " \
     "for example by setting the subtitles type or file name.")
 
-#define VIDEO_FILTER2_TITLE N_("Video filters settings")
-#define VIDEO_FILTER2_HELP " "
-
 /*
  *  A little help for modules with unknown capabilities
  */
@@ -317,7 +310,6 @@ static struct config_category_t categories_array[] =
     { SUBCAT_VIDEO_GENERAL, VIDEO_GENERAL_TITLE, VIDEO_GENERAL_HELP },
     { SUBCAT_VIDEO_VOUT, _VOUT_TITLE, VOUT_HELP },
     { SUBCAT_VIDEO_VFILTER, VFILTER_TITLE, VFILTER_HELP },
-    { SUBCAT_VIDEO_VFILTER2, VFILTER2_TITLE, VFILTER2_HELP },
     { SUBCAT_VIDEO_SUBPIC, SUBPIC_TITLE, SUBPIC_HELP },
 
     { CAT_INPUT, INPUT_TITLE, INPUT_HELP },
diff --git a/modules/video_filter/adjust.c b/modules/video_filter/adjust.c
index 71b6e7b474..478397e256 100644
--- a/modules/video_filter/adjust.c
+++ b/modules/video_filter/adjust.c
@@ -73,7 +73,7 @@ vlc_module_begin();
     set_description( _("Image properties filter") );
     set_shortname( N_("Image adjust" ));
     set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER2 );
+    set_subcategory( SUBCAT_VIDEO_VFILTER );
     set_capability( "video filter2", 0 );
 
     add_float_with_range( "contrast", 1.0, 0.0, 2.0, NULL,
diff --git a/modules/video_filter/gradient.c b/modules/video_filter/gradient.c
index e2e59b7a1a..97ce1aabf5 100644
--- a/modules/video_filter/gradient.c
+++ b/modules/video_filter/gradient.c
@@ -74,7 +74,7 @@ vlc_module_begin();
     set_shortname( N_( "Gradient" ));
     set_capability( "video filter2", 0 );
     set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER2 );
+    set_subcategory( SUBCAT_VIDEO_VFILTER );
 
     add_string( FILTER_PREFIX "mode", "gradient", NULL,
                 MODE_TEXT, MODE_LONGTEXT, VLC_FALSE );
diff --git a/modules/video_filter/invert.c b/modules/video_filter/invert.c
index fdd4eda5f0..f07f8901f1 100644
--- a/modules/video_filter/invert.c
+++ b/modules/video_filter/invert.c
@@ -47,7 +47,7 @@ vlc_module_begin();
     set_description( _("Invert video filter") );
     set_shortname( N_("Color inversion" ));
     set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER2 );
+    set_subcategory( SUBCAT_VIDEO_VFILTER );
     set_capability( "video filter2", 0 );
     add_shortcut( "invert" );
     set_callbacks( Create, Destroy );
diff --git a/modules/video_filter/psychedelic.c b/modules/video_filter/psychedelic.c
index c7fcd36e42..4fb31b6ace 100644
--- a/modules/video_filter/psychedelic.c
+++ b/modules/video_filter/psychedelic.c
@@ -52,7 +52,7 @@ vlc_module_begin();
     set_shortname( N_( "Psychedelic" ));
     set_capability( "video filter2", 0 );
     set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER2 );
+    set_subcategory( SUBCAT_VIDEO_VFILTER );
 
     add_shortcut( "psychedelic" );
     set_callbacks( Create, Destroy );
diff --git a/modules/video_filter/ripple.c b/modules/video_filter/ripple.c
index 0eb361b8d7..de43d2d3e2 100644
--- a/modules/video_filter/ripple.c
+++ b/modules/video_filter/ripple.c
@@ -51,7 +51,7 @@ vlc_module_begin();
     set_shortname( N_( "Ripple" ));
     set_capability( "video filter2", 0 );
     set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER2 );
+    set_subcategory( SUBCAT_VIDEO_VFILTER );
 
     add_shortcut( "ripple" );
     set_callbacks( Create, Destroy );
diff --git a/modules/video_filter/wave.c b/modules/video_filter/wave.c
index bc7dd3f006..7b4fe3cb56 100644
--- a/modules/video_filter/wave.c
+++ b/modules/video_filter/wave.c
@@ -51,7 +51,7 @@ vlc_module_begin();
     set_shortname( N_( "Wave" ));
     set_capability( "video filter2", 0 );
     set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER2 );
+    set_subcategory( SUBCAT_VIDEO_VFILTER );
 
     add_shortcut( "wave" );
     set_callbacks( Create, Destroy );
-- 
2.39.2