From 2e3847698a715d877bf4506f4d100ba927ca0696 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Cl=C3=A9ment=20Stenac?= Date: Thu, 10 Mar 2005 13:05:43 +0000 Subject: [PATCH] More prefs fixes - String fixes - Sort some large panels - Change some advanced flags - Fix & move audio-channel-mixer - hide picture vout - Remove saved-volume, replaced by a variable --- include/vlc_config_cat.h | 2 +- modules/audio_filter/equalizer.c | 2 +- modules/video_output/directx/glwin32.c | 3 +- modules/video_output/image.c | 2 +- modules/video_output/picture.c | 2 - modules/video_output/x11/glx.c | 2 +- modules/visualization/visual/visual.c | 10 +-- src/audio_output/intf.c | 13 ++-- src/libvlc.h | 93 ++++++++++++++------------ 9 files changed, 70 insertions(+), 59 deletions(-) diff --git a/include/vlc_config_cat.h b/include/vlc_config_cat.h index fbd9654969..2fd0a3ec64 100644 --- a/include/vlc_config_cat.h +++ b/include/vlc_config_cat.h @@ -175,7 +175,7 @@ #define AADVANCED_HELP N_( "Advanced settings. Use with care.") #define CPU_TITLE N_( "CPU features" ) -#define CPU_HELP N_( "From here you can choose to disable some CPU accelearations. You should probably not touch that." ) +#define CPU_HELP N_( "From here you can choose to disable some CPU accelerations. You should probably not touch that." ) #define MISC_TITLE N_( "Other" ) #define MISC_HELP N_( "Other advanced settings") diff --git a/modules/audio_filter/equalizer.c b/modules/audio_filter/equalizer.c index 2433b708d5..f59ef14a97 100644 --- a/modules/audio_filter/equalizer.c +++ b/modules/audio_filter/equalizer.c @@ -69,7 +69,7 @@ vlc_module_begin(); set_subcategory( SUBCAT_AUDIO_AFILTER ); add_string( "equalizer-preset", "flat", NULL, PRESET_TEXT, - PRESET_LONGTEXT, VLC_TRUE ); + PRESET_LONGTEXT, VLC_FALSE ); change_string_list( preset_list, preset_list_text, 0 ); add_string( "equalizer-bands", NULL, NULL, BANDS_TEXT, BANDS_LONGTEXT, VLC_TRUE ); diff --git a/modules/video_output/directx/glwin32.c b/modules/video_output/directx/glwin32.c index c3b83694c5..41cbbddc82 100644 --- a/modules/video_output/directx/glwin32.c +++ b/modules/video_output/directx/glwin32.c @@ -61,7 +61,8 @@ static void GLSwapBuffers( vout_thread_t * ); vlc_module_begin(); set_category( CAT_VIDEO ); set_subcategory( SUBCAT_VIDEO_VOUT ); - set_description( _("Win32 OpenGL provider") ); + set_shortname( _("OpenGL" ) ); + set_description( _("OpenGL video output") ); set_capability( "opengl provider", 100 ); add_shortcut( "glwin32" ); set_callbacks( OpenVideo, CloseVideo ); diff --git a/modules/video_output/image.c b/modules/video_output/image.c index 5350f68941..b5ae3bab3e 100644 --- a/modules/video_output/image.c +++ b/modules/video_output/image.c @@ -60,7 +60,7 @@ static char *psz_format_list[] = { "png" }; static char *psz_format_list_text[] = { N_("PNG") }; vlc_module_begin( ); - set_shortname( _( "Image" ) ); + set_shortname( _( "Image file" ) ); set_description( _( "Image video output" ) ); set_category( CAT_VIDEO ); set_subcategory( SUBCAT_VIDEO_VOUT ); diff --git a/modules/video_output/picture.c b/modules/video_output/picture.c index f36ab2157b..f09cb15637 100644 --- a/modules/video_output/picture.c +++ b/modules/video_output/picture.c @@ -105,8 +105,6 @@ static void Display ( vout_thread_t *, picture_t * ); vlc_module_begin(); set_shortname( _( "Picture" ) ); set_description(_("VLC internal picture video output") ); - set_category( CAT_VIDEO ); - set_subcategory( SUBCAT_VIDEO_VOUT ); set_capability( "video output", 0 ); add_string( "picture-id", "Id", NULL, ID_TEXT, ID_LONGTEXT, VLC_FALSE ); diff --git a/modules/video_output/x11/glx.c b/modules/video_output/x11/glx.c index f4a84cec88..591ab405d5 100644 --- a/modules/video_output/x11/glx.c +++ b/modules/video_output/x11/glx.c @@ -112,7 +112,7 @@ vlc_module_begin(); set_shortname( N_("OpenGL") ); set_category( CAT_VIDEO ); set_subcategory( SUBCAT_VIDEO_VOUT ); - set_description( _("X11 OpenGL provider") ); + set_description( _("OpenGL video output") ); set_capability( "opengl provider", 50 ); set_callbacks( CreateOpenGL, DestroyOpenGL ); diff --git a/modules/visualization/visual/visual.c b/modules/visualization/visual/visual.c index 1c0c022332..c7fc631360 100644 --- a/modules/visualization/visual/visual.c +++ b/modules/visualization/visual/visual.c @@ -85,16 +85,16 @@ vlc_module_begin(); HEIGHT_TEXT, HEIGHT_LONGTEXT, VLC_FALSE ); set_section( N_("Spectrum analyser") , NULL ); add_integer("visual-nbbands", 80, NULL, - NBBANDS_TEXT, NBBANDS_LONGTEXT, VLC_FALSE ); + NBBANDS_TEXT, NBBANDS_LONGTEXT, VLC_TRUE ); add_integer("visual-separ", 1, NULL, - SEPAR_TEXT, SEPAR_LONGTEXT, VLC_FALSE ); + SEPAR_TEXT, SEPAR_LONGTEXT, VLC_TRUE ); add_integer("visual-amp", 3, NULL, - AMP_TEXT, AMP_LONGTEXT, VLC_FALSE ); + AMP_TEXT, AMP_LONGTEXT, VLC_TRUE ); add_bool("visual-peaks", VLC_TRUE, NULL, - PEAKS_TEXT, PEAKS_LONGTEXT, VLC_FALSE ); + PEAKS_TEXT, PEAKS_LONGTEXT, VLC_TRUE ); set_section( N_( "Random effect") , NULL ); add_integer("visual-stars", 200, NULL, - STARS_TEXT, STARS_LONGTEXT, VLC_FALSE ); + STARS_TEXT, STARS_LONGTEXT, VLC_TRUE ); set_capability( "visualization", 0 ); set_callbacks( Open, Close ); add_shortcut( "visualizer"); diff --git a/src/audio_output/intf.c b/src/audio_output/intf.c index 3edbc35fdb..5aeccfef6b 100644 --- a/src/audio_output/intf.c +++ b/src/audio_output/intf.c @@ -144,7 +144,8 @@ int __aout_VolumeUp( vlc_object_t * p_object, int i_nb_steps, i = AOUT_VOLUME_MAX; } config_PutInt( p_object, "volume", i ); - config_PutInt( p_object, "saved-volume", i ); + var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER ); + var_SetInteger( p_object->p_libvlc, "saved-volume" , i ); if ( pi_volume != NULL ) *pi_volume = (audio_volume_t)i; if ( p_aout == NULL ) return 0; @@ -180,7 +181,8 @@ int __aout_VolumeDown( vlc_object_t * p_object, int i_nb_steps, i = AOUT_VOLUME_MIN; } config_PutInt( p_object, "volume", i ); - config_PutInt( p_object, "saved-volume", i ); + var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER ); + var_SetInteger( p_object->p_libvlc, "saved-volume", i ); if ( pi_volume != NULL ) *pi_volume = (audio_volume_t)i; if ( p_aout == NULL ) return 0; @@ -212,13 +214,16 @@ int __aout_VolumeMute( vlc_object_t * p_object, audio_volume_t * pi_volume ) { /* Mute */ i_result = aout_VolumeSet( p_object, AOUT_VOLUME_MIN ); - config_PutInt( p_object, "saved-volume", (int)i_volume ); + var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER ); + var_SetInteger( p_object->p_libvlc, "saved-volume", (int)i_volume ); if ( pi_volume != NULL ) *pi_volume = AOUT_VOLUME_MIN; } else { /* Un-mute */ - i_volume = (audio_volume_t)config_GetInt( p_object, "saved-volume" ); + var_Create( p_object->p_libvlc, "saved-volume", VLC_VAR_INTEGER ); + i_volume = (audio_volume_t)var_GetInteger( p_object->p_libvlc, + "saved-volume" ); i_result = aout_VolumeSet( p_object, i_volume ); if ( pi_volume != NULL ) *pi_volume = i_volume; } diff --git a/src/libvlc.h b/src/libvlc.h index aab81c2c10..6dd0ccb80d 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -526,9 +526,11 @@ static char *ppsz_clock_descriptions[] = "These options allow you to set default global options for the " \ "stream output subsystem." ) -#define SOUT_TEXT N_("Choose a stream output") +#define SOUT_TEXT N_("Default stream output chain") #define SOUT_LONGTEXT N_( \ - "Empty if no stream output.") + "You can enter here a default stream output chain. Refer to "\ + "the documentation to learn how to build such chains." \ + "Warning: this chain will be enabled for all streams." ) #define SOUT_ALL_TEXT N_("Enable streaming of all ES") #define SOUT_ALL_LONGTEXT N_( \ @@ -624,20 +626,19 @@ static char *ppsz_clock_descriptions[] = "When selected, VLC will randomly play files in the playlist until " \ "interrupted.") -#define LOOP_TEXT N_("Loop playlist on end") +#define LOOP_TEXT N_("Repeat all") #define LOOP_LONGTEXT N_( \ "If you want VLC to keep playing the playlist indefinitely then enable " \ "this option.") -#define REPEAT_TEXT N_("Repeat the current item") +#define REPEAT_TEXT N_("Repeat current item") #define REPEAT_LONGTEXT N_( \ "When this is active, VLC will keep playing the current playlist item " \ "over and over again.") #define PAS_TEXT N_("Play and stop") #define PAS_LONGTEXT N_( \ - "Stop the playlist after each played playlist item. " \ - "Does advance the playlist index.") + "Stop the playlist after each played playlist item. " ) #define MISC_CAT_LONGTEXT N_( \ "These options allow you to select default modules. Leave these " \ @@ -875,9 +876,6 @@ vlc_module_begin(); add_integer_with_range( "volume", AOUT_VOLUME_DEFAULT, AOUT_VOLUME_MIN, AOUT_VOLUME_MAX, NULL, VOLUME_TEXT, VOLUME_LONGTEXT, VLC_FALSE ); - add_integer_with_range( "saved-volume", AOUT_VOLUME_DEFAULT, - AOUT_VOLUME_MIN, AOUT_VOLUME_MAX, NULL, - VOLUME_SAVE_TEXT, VOLUME_SAVE_LONGTEXT, VLC_TRUE ); add_integer( "aout-rate", -1, NULL, AOUT_RATE_TEXT, AOUT_RATE_LONGTEXT, VLC_TRUE ); #if !defined( SYS_DARWIN ) @@ -897,46 +895,47 @@ vlc_module_begin(); set_subcategory( SUBCAT_AUDIO_VISUAL ); add_module( "audio-visual", "visualization",NULL, NULL,AUDIO_VISUAL_TEXT, AUDIO_VISUAL_LONGTEXT, VLC_FALSE ); - set_subcategory( SUBCAT_AUDIO_MISC ); - add_module_cat( "audio-channel-mixer", SUBCAT_AUDIO_MISC, NULL, NULL, - AUDIO_CHANNEL_MIXER, AUDIO_CHANNEL_MIXER_LONGTEXT, VLC_FALSE ); - change_short('A'); /* Video options */ set_category( CAT_VIDEO ); set_subcategory( SUBCAT_VIDEO_GENERAL ); add_bool( "video", 1, NULL, VIDEO_TEXT, VIDEO_LONGTEXT, VLC_TRUE ); - add_integer( "width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, VLC_TRUE ); - add_integer( "height", -1, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, VLC_TRUE ); - add_integer( "video-x", -1, NULL, VIDEOX_TEXT, VIDEOX_LONGTEXT, VLC_TRUE ); - add_integer( "video-y", -1, NULL, VIDEOY_TEXT, VIDEOY_LONGTEXT, VLC_TRUE ); - add_bool( "video-deco", 1, NULL, VIDEO_DECO_TEXT, - VIDEO_DECO_LONGTEXT, VLC_TRUE ); - add_string( "video-title", NULL, NULL, VIDEO_TITLE_TEXT, - VIDEO_TITLE_LONGTEXT, VLC_TRUE ); - add_integer( "align", 0, NULL, ALIGN_TEXT, ALIGN_LONGTEXT, VLC_TRUE ); - change_integer_list( pi_align_values, ppsz_align_descriptions, 0 ); - add_float( "zoom", 1, NULL, ZOOM_TEXT, ZOOM_LONGTEXT, VLC_TRUE ); add_bool( "grayscale", 0, NULL, GRAYSCALE_TEXT, - GRAYSCALE_LONGTEXT, VLC_TRUE ); + GRAYSCALE_LONGTEXT, VLC_FALSE ); add_bool( "fullscreen", 0, NULL, FULLSCREEN_TEXT, FULLSCREEN_LONGTEXT, VLC_FALSE ); change_short('f'); add_bool( "skip-frames", 1, NULL, SKIP_FRAMES_TEXT, - SKIP_FRAMES_LONGTEXT, VLC_FALSE ); + SKIP_FRAMES_LONGTEXT, VLC_TRUE ); #ifndef SYS_DARWIN add_bool( "overlay", 1, NULL, OVERLAY_TEXT, OVERLAY_LONGTEXT, VLC_TRUE ); #endif add_bool( "video-on-top", 0, NULL, VIDEO_ON_TOP_TEXT, VIDEO_ON_TOP_LONGTEXT, VLC_FALSE ); - add_string( "aspect-ratio", "", NULL, - ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_TRUE ); + + set_section( N_("Snapshot") , NULL ); add_directory( "snapshot-path", NULL, NULL, SNAP_PATH_TEXT, SNAP_PATH_LONGTEXT, VLC_FALSE ); add_string( "snapshot-format", "png", NULL, SNAP_FORMAT_TEXT, - SNAP_FORMAT_LONGTEXT, VLC_FALSE ); + SNAP_FORMAT_LONGTEXT, VLC_TRUE ); change_string_list( ppsz_snap_formats, NULL, 0 ); + set_section( N_("Window properties" ), NULL ); + add_integer( "width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, VLC_TRUE ); + add_integer( "height", -1, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, VLC_TRUE ); + add_integer( "video-x", -1, NULL, VIDEOX_TEXT, VIDEOX_LONGTEXT, VLC_TRUE ); + add_integer( "video-y", -1, NULL, VIDEOY_TEXT, VIDEOY_LONGTEXT, VLC_TRUE ); + add_string( "aspect-ratio", "", NULL, + ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_TRUE ); + add_bool( "video-deco", 1, NULL, VIDEO_DECO_TEXT, + VIDEO_DECO_LONGTEXT, VLC_TRUE ); + add_string( "video-title", NULL, NULL, VIDEO_TITLE_TEXT, + VIDEO_TITLE_LONGTEXT, VLC_TRUE ); + add_integer( "align", 0, NULL, ALIGN_TEXT, ALIGN_LONGTEXT, VLC_TRUE ); + change_integer_list( pi_align_values, ppsz_align_descriptions, 0 ); + add_float( "zoom", 1, NULL, ZOOM_TEXT, ZOOM_LONGTEXT, VLC_TRUE ); + + set_subcategory( SUBCAT_VIDEO_VOUT ); add_module( "vout", "video output", NULL, NULL, VOUT_TEXT, VOUT_LONGTEXT, VLC_TRUE ); @@ -956,6 +955,8 @@ vlc_module_begin(); add_bool( "osd", 1, NULL, OSD_TEXT, OSD_LONGTEXT, VLC_FALSE ); set_section( N_("Subtitles") , NULL ); + add_file( "sub-file", NULL, NULL, SUB_FILE_TEXT, + SUB_FILE_LONGTEXT, VLC_FALSE ); add_bool( "sub-autodetect-file", VLC_TRUE, NULL, SUB_AUTO_TEXT, SUB_AUTO_LONGTEXT, VLC_FALSE ); add_integer( "sub-autodetect-fuzzy", 3, NULL, @@ -967,8 +968,6 @@ vlc_module_begin(); #endif add_string( "sub-autodetect-path", SUB_PATH, NULL, SUB_PATH_TEXT, SUB_PATH_LONGTEXT, VLC_TRUE ); - add_file( "sub-file", NULL, NULL, SUB_FILE_TEXT, - SUB_FILE_LONGTEXT, VLC_TRUE ); add_integer( "sub-margin", -1, NULL, SUB_MARGIN_TEXT, SUB_MARGIN_LONGTEXT, VLC_TRUE ); @@ -976,8 +975,6 @@ vlc_module_begin(); add_module_list_cat( "sub-filter", SUBCAT_VIDEO_SUBPIC, NULL, NULL, SUB_FILTER_TEXT, SUB_FILTER_LONGTEXT, VLC_TRUE ); -// set_subcategory( SUBCAT_VIDEO_TEXT ); - /* Input options */ set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_ACCESS ); @@ -1136,21 +1133,22 @@ vlc_module_begin(); #endif /* Misc options */ set_subcategory( SUBCAT_ADVANCED_MISC ); + set_section( N_("Special modules"), NULL ); add_module( "memcpy", "memcpy", NULL, NULL, MEMCPY_TEXT, MEMCPY_LONGTEXT, VLC_TRUE ); - add_bool( "minimize-threads", 0, NULL, MINIMIZE_THREADS_TEXT, - MINIMIZE_THREADS_LONGTEXT, VLC_TRUE ); + add_module( "audio-channel-mixer", "audio mixer", NULL, NULL, + AUDIO_CHANNEL_MIXER, AUDIO_CHANNEL_MIXER_LONGTEXT, VLC_TRUE ); + change_short('A'); + + set_section( N_("Plugins" ), NULL ); add_bool( "plugins-cache", VLC_TRUE, NULL, PLUGINS_CACHE_TEXT, PLUGINS_CACHE_LONGTEXT, VLC_TRUE ); add_directory( "plugin-path", NULL, NULL, PLUGIN_PATH_TEXT, PLUGIN_PATH_LONGTEXT, VLC_TRUE ); - add_string( "vlm-conf", NULL, NULL, VLM_CONF_TEXT, - VLM_CONF_LONGTEXT, VLC_TRUE ); -#if !defined(WIN32) - add_bool( "daemon", 0, NULL, DAEMON_TEXT, DAEMON_LONGTEXT, VLC_TRUE ); - change_short('d'); -#endif + set_section( N_("Performance options"), NULL ); + add_bool( "minimize-threads", 0, NULL, MINIMIZE_THREADS_TEXT, + MINIMIZE_THREADS_LONGTEXT, VLC_TRUE ); #if !defined(SYS_DARWIN) && !defined(SYS_BEOS) && defined(PTHREAD_COND_T_IN_PTHREAD_H) add_bool( "rt-priority", 0, NULL, RT_PRIORITY_TEXT, @@ -1173,6 +1171,15 @@ vlc_module_begin(); WIN9X_CV_LONGTEXT, VLC_TRUE ); #endif + set_section( N_("Miscellaneous" ), NULL ); + add_string( "vlm-conf", NULL, NULL, VLM_CONF_TEXT, + VLM_CONF_LONGTEXT, VLC_TRUE ); + +#if !defined(WIN32) + add_bool( "daemon", 0, NULL, DAEMON_TEXT, DAEMON_LONGTEXT, VLC_TRUE ); + change_short('d'); +#endif + /* Playlist options */ set_category( CAT_PLAYLIST ); set_subcategory( SUBCAT_PLAYLIST_GENERAL ); @@ -1181,9 +1188,9 @@ vlc_module_begin(); change_short('Z'); add_bool( "loop", 0, NULL, LOOP_TEXT, LOOP_LONGTEXT, VLC_FALSE ); change_short('L'); - add_bool( "repeat", 0, NULL, REPEAT_TEXT, REPEAT_LONGTEXT, VLC_TRUE ); + add_bool( "repeat", 0, NULL, REPEAT_TEXT, REPEAT_LONGTEXT, VLC_FALSE ); change_short('R'); - add_bool( "play-and-stop", 0, NULL, PAS_TEXT, PAS_LONGTEXT, VLC_TRUE ); + add_bool( "play-and-stop", 0, NULL, PAS_TEXT, PAS_LONGTEXT, VLC_FALSE ); set_subcategory( SUBCAT_PLAYLIST_SD ); add_module_list_cat( "services-discovery", SUBCAT_PLAYLIST_SD, NULL, -- 2.39.2