X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc-module.c;h=bc34f8741e5641e43d7ec7a4a846cb343f765e59;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=5c696f2b5db7b307aa3b8e0f6a32d82d130795d3;hpb=e4de986a143b0fdf4ef04b2b5e5286192b3ae4c1;p=vlc diff --git a/src/libvlc-module.c b/src/libvlc-module.c index 5c696f2b5d..bc34f8741e 100644 --- a/src/libvlc-module.c +++ b/src/libvlc-module.c @@ -66,6 +66,7 @@ static const char *const ppsz_language[] = "he", "hr", "hu", + "hy", "id", "it", "ja", @@ -119,6 +120,7 @@ static const char *const ppsz_language_text[] = "עברית", "hrvatski", "Magyar", + "հայերեն", "Bahasa Indonesia", "Italiano", "日本語", @@ -346,7 +348,7 @@ static const char *const ppsz_force_dolby_descriptions[] = { "Protect against sound clipping" ) #define AUDIO_TIME_STRETCH_TEXT N_( \ - "Enable time streching audio" ) + "Enable time stretching audio" ) #define AUDIO_TIME_STRETCH_LONGTEXT N_( \ "This allows to play audio at lower or higher speed without " \ "affecting the audio pitch" ) @@ -642,8 +644,8 @@ static const char *const ppsz_pos_descriptions[] = #define CLOCK_JITTER_TEXT N_("Clock jitter") #define CLOCK_JITTER_LONGTEXT N_( \ - "It tells the clock algorithms what is the maximal input jitter that " \ - "is considered valid and can be compensated (in milliseconds)" ) + "This defines the maximum input delay jitter that the synchronization " \ + "algorithms should try to compensate (in milliseconds)." ) #define NETSYNC_TEXT N_("Network synchronisation" ) #define NETSYNC_LONGTEXT N_( "This allows you to remotely " \ @@ -843,24 +845,44 @@ static const char *const ppsz_clock_descriptions[] = "Load this subtitle file. To be used when autodetect cannot detect " \ "your subtitle file.") +/* DVD and VCD devices */ #define DVD_DEV_TEXT N_("DVD device") +#define VCD_DEV_TEXT N_("VCD device") +#define CDAUDIO_DEV_TEXT N_("Audio CD device") + #ifdef WIN32 -#define DVD_DEV_LONGTEXT N_( \ +# define DVD_DEV_LONGTEXT N_( \ "This is the default DVD drive (or file) to use. Don't forget the colon " \ - "after the drive letter (eg. D:)") + "after the drive letter (e.g. D:)") +# define VCD_DEV_LONGTEXT N_( \ + "This is the default VCD drive (or file) to use. Don't forget the colon " \ + "after the drive letter (e.g. D:)") +# define CDAUDIO_DEV_LONGTEXT N_( \ + "This is the default Audio CD drive (or file) to use. Don't forget the " \ + "colon after the drive letter (e.g. D:)") +# define DVD_DEVICE NULL +# define CD_DEVICE "D:" + #else -#define DVD_DEV_LONGTEXT N_( \ +# define DVD_DEV_LONGTEXT N_( \ "This is the default DVD device to use.") -#endif - -#define VCD_DEV_TEXT N_("VCD device") -#define VCD_DEV_LONGTEXT N_( \ +# define VCD_DEV_LONGTEXT N_( \ "This is the default VCD device to use." ) - -#define CDAUDIO_DEV_TEXT N_("Audio CD device") -#define CDAUDIO_DEV_LONGTEXT N_( \ +# define CDAUDIO_DEV_LONGTEXT N_( \ "This is the default Audio CD device to use." ) +# if defined(__OpenBSD__) +# define DVD_DEVICE "/dev/cd0c" +# define CD_DEVICE "/dev/cd0c" +# else +# define DVD_DEVICE "/dev/dvd" +# define CD_DEVICE "/dev/cdrom" +# endif +#endif + +#define VCD_DEVICE CD_DEVICE +#define CDAUDIO_DEVICE CD_DEVICE + #define IPV6_TEXT N_("Force IPv6") #define IPV6_LONGTEXT N_( \ "IPv6 will be used by default for all connections.") @@ -1259,6 +1281,10 @@ static const char *const ppsz_albumart_descriptions[] = "The media library is automatically saved and reloaded each time you " \ "start VLC." ) +#define LOAD_ML_TEXT N_( "Load Media Library" ) +#define LOAD_ML_LONGTEXT N_( \ + "Enable this option to load the SQL-based Media Library at VLC startup" ) + #define PLTREE_TEXT N_("Display playlist tree") #define PLTREE_LONGTEXT N_( \ "The playlist can use a tree to categorize some items, like the " \ @@ -1613,7 +1639,7 @@ vlc_module_begin () NULL, AUDIO_FILTER_TEXT, AUDIO_FILTER_LONGTEXT, false ) set_subcategory( SUBCAT_AUDIO_VISUAL ) - add_module( "audio-visual", "visualization",NULL, NULL,AUDIO_VISUAL_TEXT, + add_module( "audio-visual", "visualization2",NULL, NULL,AUDIO_VISUAL_TEXT, AUDIO_VISUAL_LONGTEXT, false ) /* Video options */ @@ -1751,7 +1777,6 @@ vlc_module_begin () set_subcategory( SUBCAT_VIDEO_VFILTER ) add_module_list_cat( "video-filter", SUBCAT_VIDEO_VFILTER, NULL, NULL, VIDEO_FILTER_TEXT, VIDEO_FILTER_LONGTEXT, false ) - add_deprecated_alias( "filter" ) /*deprecated since 0.8.2 */ add_module_list_cat( "vout-filter", SUBCAT_VIDEO_VFILTER, NULL, NULL, VOUT_FILTER_TEXT, VOUT_FILTER_LONGTEXT, false ) #if 0 @@ -1786,7 +1811,6 @@ vlc_module_begin () SUB_PATH_TEXT, SUB_PATH_LONGTEXT, true ) add_integer( "sub-margin", 0, NULL, SUB_MARGIN_TEXT, SUB_MARGIN_LONGTEXT, true ) - add_deprecated_alias( "spu-margin" ) /*Deprecated since 0.8.2 */ set_section( N_( "Overlays" ) , NULL ) add_module_list_cat( "sub-filter", SUBCAT_VIDEO_SUBPIC, NULL, NULL, SUB_FILTER_TEXT, SUB_FILTER_LONGTEXT, false ) @@ -1805,11 +1829,9 @@ vlc_module_begin () add_integer( "audio-track", -1, NULL, INPUT_AUDIOTRACK_TEXT, INPUT_AUDIOTRACK_LONGTEXT, true ) change_safe () - add_deprecated_alias( "audio-channel" ) /*deprecated since 0.8.2 */ add_integer( "sub-track", -1, NULL, INPUT_SUBTRACK_TEXT, INPUT_SUBTRACK_LONGTEXT, true ) change_safe () - add_deprecated_alias("spu-channel" ) /*deprecated since 0.8.2*/ add_string( "audio-language", "", NULL, INPUT_AUDIOTRACK_LANG_TEXT, INPUT_AUDIOTRACK_LANG_LONGTEXT, false ) @@ -1851,6 +1873,7 @@ vlc_module_begin () add_string( "bookmarks", NULL, NULL, BOOKMARKS_TEXT, BOOKMARKS_LONGTEXT, true ) + change_safe () set_section( N_( "Default devices") , NULL ) @@ -2057,10 +2080,6 @@ vlc_module_begin () DATA_PATH_LONGTEXT, true ) change_need_restart () - add_string( "user-agent", "(LibVLC "VERSION")", NULL, NULL, NULL, true ) - change_safe () - change_private () - set_section( N_("Performance options"), NULL ) add_obsolete_bool( "minimize-threads" ) @@ -2123,6 +2142,10 @@ vlc_module_begin () add_bool( "play-and-pause", 0, NULL, PAP_TEXT, PAP_LONGTEXT, true ) change_safe() add_bool( "media-library", 1, NULL, ML_TEXT, ML_LONGTEXT, false ) +#if defined( MEDIA_LIBRARY ) + add_bool( "load-media-library-on-startup", 1, NULL, LOAD_ML_TEXT, + LOAD_ML_LONGTEXT, false ) +#endif add_bool( "playlist-tree", 0, NULL, PLTREE_TEXT, PLTREE_LONGTEXT, false ) add_string( "open", "", NULL, OPEN_TEXT, OPEN_LONGTEXT, false )