videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

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.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
This commit is contained in:
Lyndon Brown 2019-04-06 19:53:37 +01:00 committed by Jean-Baptiste Kempf
parent 1ca5bfaa19
commit bc9567ccf1
10 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/vlc_config_cat.h
View File

@ -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 },

1
include/vlc_plugin.h
View File

@ -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

2
modules/arm_neon/volume.c
View File

@ -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)

2
modules/audio_filter/channel_mixer/simple.c
View File

@ -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 ()

2
modules/audio_filter/channel_mixer/trivial.c
View File

@ -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 ()

2
modules/audio_filter/converter/format.c
View File

@ -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()

2
modules/audio_filter/converter/tospdif.c
View File

@ -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 )

2
modules/audio_mixer/float.c
View File

@ -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 )

2
modules/audio_mixer/integer.c
View File

@ -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)

2
src/libvlc-module.c
View File

@ -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 )