[vlc-devel] [PATCH 2/8] purge useless audio-misc subcat
Lyndon Brown
jnqnfe at gmail.com
Sat Sep 26 00:30:51 CEST 2020
From: Lyndon Brown <jnqnfe at gmail.com>
Date: Sat, 6 Apr 2019 19:53:37 +0100
Subject: purge useless audio-misc subcat
there are no in-tree modules using this subcat that actually have any
options; this moves the few that do reference it (filter/mixer modules)
to audio-filter (making no difference since no options) and removes the
unneeded subcat.
note that in the previous commit I restored an add_subcategory() call for
it to the core option set, missing since 2005, to fix organisation of
any options that may be associated with it, but since no in-tree modules
actually place any options under it, it means that there's an empty page
for it in the preferences which isn't ideal, so here we just ditch it.
diff --git a/include/vlc_config_cat.h b/include/vlc_config_cat.h
index cd99bfaaa5..1711426203 100644
--- a/include/vlc_config_cat.h
+++ b/include/vlc_config_cat.h
@@ -65,9 +65,6 @@
#define AOUT_TITLE N_( "Output modules" )
#define AOUT_HELP N_("General settings for audio output modules.")
-#define AMISC_TITLE N_("Miscellaneous")
-#define AMISC_HELP N_( "Miscellaneous audio settings and modules." )
-
/* Video */
#define VIDEO_TITLE N_("Video")
#define VIDEO_HELP N_("Video settings")
@@ -210,7 +207,6 @@ static const struct config_category_t categories_array[] =
{ SUBCAT_AUDIO_AFILTER, AFILTER_TITLE, AFILTER_HELP },
{ SUBCAT_AUDIO_RESAMPLER, ARESAMPLER_TITLE, AFILTER_HELP },
{ SUBCAT_AUDIO_VISUAL, AVISUAL_TITLE, AVISUAL_HELP },
- { SUBCAT_AUDIO_MISC, AMISC_TITLE, AMISC_HELP },
{ CAT_VIDEO, VIDEO_TITLE, VIDEO_HELP },
{ SUBCAT_VIDEO_GENERAL, VIDEO_TITLE, VIDEO_GENERAL_HELP },
diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h
index 2ddc6cb0b1..63f0b3ac08 100644
--- a/include/vlc_plugin.h
+++ b/include/vlc_plugin.h
@@ -146,7 +146,6 @@ enum vlc_module_properties
#define SUBCAT_AUDIO_AOUT 202
#define SUBCAT_AUDIO_AFILTER 203
#define SUBCAT_AUDIO_VISUAL 204
-#define SUBCAT_AUDIO_MISC 205
#define SUBCAT_AUDIO_RESAMPLER 206
#define CAT_VIDEO 3
diff --git a/modules/arm_neon/volume.c b/modules/arm_neon/volume.c
index 314df7ad42..0ed1d2ed23 100644
--- a/modules/arm_neon/volume.c
+++ b/modules/arm_neon/volume.c
@@ -34,7 +34,7 @@ static int Probe(vlc_object_t *);
vlc_module_begin()
set_category(CAT_AUDIO)
- set_subcategory(SUBCAT_AUDIO_MISC)
+ set_subcategory(SUBCAT_AUDIO_AFILTER)
set_description(N_("ARM NEON audio volume"))
set_capability("audio volume", 10)
set_callback(Probe)
diff --git a/modules/audio_filter/channel_mixer/simple.c b/modules/audio_filter/channel_mixer/simple.c
index d58fd59450..567269a6bf 100644
--- a/modules/audio_filter/channel_mixer/simple.c
+++ b/modules/audio_filter/channel_mixer/simple.c
@@ -41,7 +41,7 @@ static int OpenFilter( vlc_object_t * );
vlc_module_begin ()
set_description( N_("Audio filter for simple channel mixing") )
set_category( CAT_AUDIO )
- set_subcategory( SUBCAT_AUDIO_MISC )
+ set_subcategory( SUBCAT_AUDIO_AFILTER )
set_capability( "audio converter", 10 )
set_callback( OpenFilter );
vlc_module_end ()
diff --git a/modules/audio_filter/channel_mixer/trivial.c b/modules/audio_filter/channel_mixer/trivial.c
index 6b5b843c87..6bb58e34da 100644
--- a/modules/audio_filter/channel_mixer/trivial.c
+++ b/modules/audio_filter/channel_mixer/trivial.c
@@ -42,7 +42,7 @@ vlc_module_begin ()
set_description( N_("Audio filter for trivial channel mixing") )
set_capability( "audio converter", 1 )
set_category( CAT_AUDIO )
- set_subcategory( SUBCAT_AUDIO_MISC )
+ set_subcategory( SUBCAT_AUDIO_AFILTER )
set_callbacks( Create, Destroy )
vlc_module_end ()
diff --git a/modules/audio_filter/converter/format.c b/modules/audio_filter/converter/format.c
index d50d095a37..b7801998d9 100644
--- a/modules/audio_filter/converter/format.c
+++ b/modules/audio_filter/converter/format.c
@@ -47,7 +47,7 @@ static int Open(vlc_object_t *);
vlc_module_begin()
set_description(N_("Audio filter for PCM format conversion"))
set_category(CAT_AUDIO)
- set_subcategory(SUBCAT_AUDIO_MISC)
+ set_subcategory(SUBCAT_AUDIO_AFILTER)
set_capability("audio converter", 1)
set_callback(Open)
vlc_module_end()
diff --git a/modules/audio_filter/converter/tospdif.c b/modules/audio_filter/converter/tospdif.c
index 1029e911a8..c9d7e08adc 100644
--- a/modules/audio_filter/converter/tospdif.c
+++ b/modules/audio_filter/converter/tospdif.c
@@ -44,7 +44,7 @@ static void Close( vlc_object_t * );
vlc_module_begin ()
set_category( CAT_AUDIO )
- set_subcategory( SUBCAT_AUDIO_MISC )
+ set_subcategory( SUBCAT_AUDIO_AFILTER )
set_description( N_("Audio filter for A/52/DTS->S/PDIF encapsulation") )
set_capability( "audio converter", 10 )
set_callbacks( Open, Close )
diff --git a/modules/audio_mixer/float.c b/modules/audio_mixer/float.c
index 7995726ca6..d0d3b70008 100644
--- a/modules/audio_mixer/float.c
+++ b/modules/audio_mixer/float.c
@@ -44,7 +44,7 @@ static int Create( vlc_object_t * );
*****************************************************************************/
vlc_module_begin ()
set_category( CAT_AUDIO )
- set_subcategory( SUBCAT_AUDIO_MISC )
+ set_subcategory( SUBCAT_AUDIO_AFILTER )
set_description( N_("Single precision audio volume") )
set_capability( "audio volume", 10 )
set_callback( Create )
diff --git a/modules/audio_mixer/integer.c b/modules/audio_mixer/integer.c
index 4388062bc2..aec6deb026 100644
--- a/modules/audio_mixer/integer.c
+++ b/modules/audio_mixer/integer.c
@@ -34,7 +34,7 @@ static int Activate (vlc_object_t *);
vlc_module_begin ()
set_category (CAT_AUDIO)
- set_subcategory (SUBCAT_AUDIO_MISC)
+ set_subcategory (SUBCAT_AUDIO_AFILTER)
set_description (N_("Integer audio volume"))
set_capability ("audio volume", 9)
set_callback(Activate)
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 6f2e48778f..1cb548ff5f 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1603,8 +1603,6 @@ vlc_module_begin ()
add_module("audio-resampler", "audio resampler", NULL,
AUDIO_RESAMPLER_TEXT, AUDIO_RESAMPLER_LONGTEXT)
- set_subcategory( SUBCAT_AUDIO_MISC )
-
/* Video options */
set_category( CAT_VIDEO )
set_subcategory( SUBCAT_VIDEO_GENERAL )
More information about the vlc-devel
mailing list