X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc-module.c;h=46180f5cf7b01b5d883076fae2b5177227013f35;hb=dc130ca2b358ed5da3cb783f222eb28cad6aea9f;hp=182c7e13ea090846e20e658f617fcbd3e9907a5b;hpb=a8b1850adafa3f492dcf448dd9a97a29886c8da7;p=vlc diff --git a/src/libvlc-module.c b/src/libvlc-module.c index 182c7e13ea..46180f5cf7 100644 --- a/src/libvlc-module.c +++ b/src/libvlc-module.c @@ -85,10 +85,6 @@ static const char *const ppsz_snap_formats[] = "This is the verbosity level (0=only errors and " \ "standard messages, 1=warnings, 2=debug).") -#define QUIET_TEXT N_("Be quiet") -#define QUIET_LONGTEXT N_( \ - "Turn off all warning and information messages.") - #define OPEN_TEXT N_("Default stream") #define OPEN_LONGTEXT N_( \ "This stream will always be opened at VLC startup." ) @@ -777,8 +773,8 @@ static const char *const ppsz_prefres[] = { # define DVD_DEVICE "/dev/cd0c" # define CD_DEVICE "/dev/cd0c" # elif defined(__linux__) -# define DVD_DEVICE "/dev/dvd1" -# define CD_DEVICE "/dev/cdrom1" +# define DVD_DEVICE "/dev/sr0" +# define CD_DEVICE "/dev/sr0" # else # define DVD_DEVICE "/dev/dvd" # define CD_DEVICE "/dev/cdrom" @@ -829,22 +825,13 @@ static const char *const ppsz_prefres[] = { #define HTTP_CERT_TEXT N_("HTTP/TLS server certificate") #define CERT_LONGTEXT N_( \ - "This X.509 certicate file (PEM format) is used for server-side TLS." ) + "This X.509 certicate file (PEM format) is used for server-side TLS. " \ + "On OS X, the string is used as a label to search the certificate in the keychain." ) #define HTTP_KEY_TEXT N_("HTTP/TLS server private key") #define KEY_LONGTEXT N_( \ "This private key file (PEM format) is used for server-side TLS.") -#define HTTP_CA_TEXT N_("HTTP/TLS Certificate Authority") -#define CA_LONGTEXT N_( \ - "This X.509 certificate file (PEM format) can optionally be used " \ - "to authenticate remote clients in TLS sessions.") - -#define HTTP_CRL_TEXT N_("HTTP/TLS Certificate Revocation List") -#define CRL_LONGTEXT N_( \ - "This file contains an optional CRL to prevent remote clients " \ - "from using revoked certificates in TLS sessions.") - #define SOCKS_SERVER_TEXT N_("SOCKS server") #define SOCKS_SERVER_LONGTEXT N_( \ "SOCKS proxy server to use. This must be of the form " \ @@ -1029,10 +1016,6 @@ static const char *const ppsz_prefres[] = { "This option is useful if you want to lower the latency when " \ "reading a stream") -#define PLUGIN_PATH_LONGTEXT N_( \ - "Additional path for VLC to look for its modules. You can add " \ - "several paths by concatenating them using \" PATH_SEP \" as separator") - #define VLM_CONF_TEXT N_("VLM configuration file") #define VLM_CONF_LONGTEXT N_( \ "Read a VLM configuration file as soon as VLM is started." ) @@ -1053,14 +1036,6 @@ static const char *const ppsz_prefres[] = { #define PIDFILE_LONGTEXT N_( \ "Writes process id into specified file.") -#define FILE_LOG_TEXT N_( "Log to file" ) -#define FILE_LOG_LONGTEXT N_( \ - "Log all VLC messages to a text file." ) - -#define SYSLOG_TEXT N_( "Log to syslog" ) -#define SYSLOG_LONGTEXT N_( \ - "Log all VLC messages to syslog (UNIX systems)." ) - #define ONEINSTANCE_TEXT N_("Allow only one running instance") #if defined( _WIN32 ) || defined( __OS2__ ) #define ONEINSTANCE_LONGTEXT N_( \ @@ -1116,17 +1091,18 @@ static const char *const ppsz_prefres[] = { "Automatically preparse files added to the playlist " \ "(to retrieve some metadata)." ) -#define ALBUM_ART_TEXT N_( "Album art policy" ) -#define ALBUM_ART_LONGTEXT N_( \ - "Choose how album art will be downloaded." ) +#define RECURSIVE_TEXT N_("Subdirectory behavior") +#define RECURSIVE_LONGTEXT N_( \ + "Select whether subdirectories must be expanded.\n" \ + "none: subdirectories do not appear in the playlist.\n" \ + "collapse: subdirectories appear but are expanded on first play.\n" \ + "expand: all subdirectories are expanded.\n" ) -static const int pi_albumart_values[] = { ALBUM_ART_WHEN_ASKED, - ALBUM_ART_WHEN_PLAYED, - ALBUM_ART_ALL }; -static const char *const ppsz_albumart_descriptions[] = - { N_("Manual download only"), - N_("When track starts playing"), - N_("As soon as track is added") }; +static const char *const psz_recursive_list[] = { "none", "collapse", "expand" }; +static const char *const psz_recursive_list_text[] = { + N_("None"), N_("Collapse"), N_("Expand"), N_("Expand distant files") }; + +#define METADATA_NETWORK_TEXT N_( "Allow metadata network access" ) #define SD_TEXT N_( "Services discovery modules") #define SD_LONGTEXT N_( \ @@ -1157,6 +1133,10 @@ static const char *const ppsz_albumart_descriptions[] = #define PAP_LONGTEXT N_( \ "Pause each item in the playlist on the last frame." ) +#define SP_TEXT N_("Start paused") +#define SP_LONGTEXT N_( \ + "Pause each item in the playlist on the first frame." ) + #define AUTOSTART_TEXT N_( "Auto start" ) #define AUTOSTART_LONGTEXT N_( "Automatically start playing the playlist " \ "content once it's loaded." ) @@ -1171,10 +1151,6 @@ 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 " \ @@ -1189,20 +1165,20 @@ static const char *const ppsz_albumart_descriptions[] = #define HOTKEY_CAT_LONGTEXT N_( "These settings are the global VLC key " \ "bindings, known as \"hotkeys\"." ) -enum{ - MOUSEWHEEL_VOLUME, - MOUSEWHEEL_POSITION, - NO_MOUSEWHEEL, +static const int mouse_wheel_values[] = { -1, 0, 2, 3, }; +static const char *const mouse_wheel_texts[] = { + N_("Ignore"), N_("Volume control"), + N_("Position control"), N_("Position control reversed"), }; -static const int mouse_wheel_values[] = { 2, 0, 1 }; -static const char *const mouse_wheel_texts[] = - { N_("Ignore"), N_("Volume Control"), N_("Position Control") }; - -#define MOUSE_WHEEL_MODE_TEXT N_("MouseWheel up-down axis Control") -#define MOUSE_WHEEL_MODE_LONGTEXT N_( \ - "The MouseWheel up-down (vertical) axis can control volume, position or " \ - "mousewheel event can be ignored") +#define MOUSE_Y_WHEEL_MODE_TEXT N_("Mouse wheel vertical axis control") +#define MOUSE_Y_WHEEL_MODE_LONGTEXT N_( \ + "The mouse wheel vertical (up/down) axis can control volume, " \ + "position or be ignored.") +#define MOUSE_X_WHEEL_MODE_TEXT N_("Mouse wheel horizontal axis control") +#define MOUSE_X_WHEEL_MODE_LONGTEXT N_( \ + "The mouse wheel horizontal (left/right) axis can control volume, " \ + "position or be ignored.") #define TOGGLE_FULLSCREEN_KEY_TEXT N_("Fullscreen") #define TOGGLE_FULLSCREEN_KEY_LONGTEXT N_("Select the hotkey to use to swap fullscreen state.") #define LEAVE_FULLSCREEN_KEY_TEXT N_("Exit fullscreen") @@ -1366,6 +1342,8 @@ static const char *const mouse_wheel_texts[] = #define AUDIO_TRACK_KEY_LONGTEXT N_("Cycle through the available audio tracks(languages).") #define SUBTITLE_TRACK_KEY_TEXT N_("Cycle subtitle track") #define SUBTITLE_TRACK_KEY_LONGTEXT N_("Cycle through the available subtitle tracks.") +#define SUBTITLE_TOGGLE_KEY_TEXT N_("Toggle subtitles") +#define SUBTITLE_TOGGLE_KEY_LONGTEXT N_("Toggle subtitle track visibility.") #define PROGRAM_SID_NEXT_KEY_TEXT N_("Cycle next program Service ID") #define PROGRAM_SID_NEXT_KEY_LONGTEXT N_("Cycle through the available next program Service IDs (SIDs).") #define PROGRAM_SID_PREV_KEY_TEXT N_("Cycle previous program Service ID") @@ -1594,8 +1572,7 @@ vlc_module_begin () change_safe () add_bool( "autoscale", true, AUTOSCALE_TEXT, AUTOSCALE_LONGTEXT, false ) change_safe () - add_float( "scale", 1.0, SCALEFACTOR_TEXT, SCALEFACTOR_LONGTEXT, false ) - change_safe () + add_obsolete_float( "scale" ) /* since 3.0.0 */ add_string( "monitor-par", NULL, MASPECT_RATIO_TEXT, MASPECT_RATIO_LONGTEXT, true ) add_string( "custom-aspect-ratios", NULL, CUSTOM_ASPECT_RATIOS_TEXT, @@ -1608,7 +1585,8 @@ vlc_module_begin () add_integer( "align", 0, ALIGN_TEXT, ALIGN_LONGTEXT, true ) change_integer_list( pi_align_values, ppsz_align_descriptions ) add_float( "zoom", 1., ZOOM_TEXT, ZOOM_LONGTEXT, true ) - add_integer( "deinterlace", 0, + change_safe() + add_integer( "deinterlace", -1, DEINTERLACE_TEXT, DEINTERLACE_LONGTEXT, false ) change_integer_list( pi_deinterlace, ppsz_deinterlace_text ) change_safe() @@ -1636,7 +1614,7 @@ vlc_module_begin () set_section( N_("On Screen Display") , NULL ) add_category_hint( N_("Subpictures"), SUB_CAT_LONGTEXT , false ) - add_bool( "spu", 1, SPU_TEXT, SPU_LONGTEXT, true ) + add_bool( "spu", 1, SPU_TEXT, SPU_LONGTEXT, false ) change_safe () add_bool( "osd", 1, OSD_TEXT, OSD_LONGTEXT, false ) add_module( "text-renderer", "text renderer", NULL, TEXTRENDERER_TEXT, @@ -1762,9 +1740,9 @@ vlc_module_begin () add_obsolete_string( "sout-http-cert" ) /* since 2.0.0 */ add_loadfile( "http-key", NULL, HTTP_KEY_TEXT, KEY_LONGTEXT, true ) add_obsolete_string( "sout-http-key" ) /* since 2.0.0 */ - add_loadfile( "http-ca", NULL, HTTP_CA_TEXT, CA_LONGTEXT, true ) + add_obsolete_string( "http-ca" ) /* since 3.0.0 */ add_obsolete_string( "sout-http-ca" ) /* since 2.0.0 */ - add_loadfile( "http-crl", NULL, HTTP_CRL_TEXT, CRL_LONGTEXT, true ) + add_obsolete_string( "http-crl" ) /* since 3.0.0 */ add_obsolete_string( "sout-http-crl" ) /* since 2.0.0 */ set_section( N_( "Socks proxy") , NULL ) @@ -1862,12 +1840,12 @@ vlc_module_begin () add_bool( "network-synchronisation", false, NETSYNC_TEXT, NETSYNC_LONGTEXT, true ) - add_string( "input-record-path", NULL, INPUT_RECORD_PATH_TEXT, + add_directory( "input-record-path", NULL, INPUT_RECORD_PATH_TEXT, INPUT_RECORD_PATH_LONGTEXT, true ) add_bool( "input-record-native", true, INPUT_RECORD_NATIVE_TEXT, INPUT_RECORD_NATIVE_LONGTEXT, true ) - add_string( "input-timeshift-path", NULL, INPUT_TIMESHIFT_PATH_TEXT, + add_directory( "input-timeshift-path", NULL, INPUT_TIMESHIFT_PATH_TEXT, INPUT_TIMESHIFT_PATH_LONGTEXT, true ) add_integer( "input-timeshift-granularity", -1, INPUT_TIMESHIFT_GRANULARITY_TEXT, INPUT_TIMESHIFT_GRANULARITY_LONGTEXT, true ) @@ -1887,8 +1865,7 @@ vlc_module_begin () add_module( "access", "access", NULL, ACCESS_TEXT, ACCESS_LONGTEXT, true ) set_subcategory( SUBCAT_INPUT_DEMUX ) - add_module( "demux", "demux", NULL, DEMUX_TEXT, DEMUX_LONGTEXT, true ) - set_subcategory( SUBCAT_INPUT_VCODEC ) + add_module( "demux", "demux", "any", DEMUX_TEXT, DEMUX_LONGTEXT, true ) set_subcategory( SUBCAT_INPUT_ACODEC ) set_subcategory( SUBCAT_INPUT_SCODEC ) add_obsolete_bool( "prefer-system-codecs" ) @@ -1908,7 +1885,7 @@ vlc_module_begin () SOUT_DISPLAY_LONGTEXT, true ) add_bool( "sout-keep", false, SOUT_KEEP_TEXT, SOUT_KEEP_LONGTEXT, true ) - add_bool( "sout-all", 0, SOUT_ALL_TEXT, + add_bool( "sout-all", true, SOUT_ALL_TEXT, SOUT_ALL_LONGTEXT, true ) add_bool( "sout-audio", 1, SOUT_AUDIO_TEXT, SOUT_AUDIO_LONGTEXT, true ) @@ -2021,6 +1998,7 @@ vlc_module_begin () change_safe() add_bool( "play-and-pause", 0, PAP_TEXT, PAP_LONGTEXT, true ) change_safe() + add_bool( "start-paused", 0, SP_TEXT, SP_LONGTEXT, false ) add_bool( "playlist-autostart", true, AUTOSTART_TEXT, AUTOSTART_LONGTEXT, false ) add_bool( "playlist-cork", true, CORK_TEXT, CORK_LONGTEXT, false ) @@ -2044,10 +2022,13 @@ vlc_module_begin () add_bool( "auto-preparse", true, PREPARSE_TEXT, PREPARSE_LONGTEXT, false ) - add_integer( "album-art", ALBUM_ART_WHEN_ASKED, ALBUM_ART_TEXT, - ALBUM_ART_LONGTEXT, false ) - change_integer_list( pi_albumart_values, - ppsz_albumart_descriptions ) + add_string( "recursive", "collapse" , RECURSIVE_TEXT, + RECURSIVE_LONGTEXT, false ) + change_string_list( psz_recursive_list, psz_recursive_list_text ) + + add_obsolete_integer( "album-art" ) + add_bool( "metadata-network-access", false, METADATA_NETWORK_TEXT, + METADATA_NETWORK_TEXT, false ) set_subcategory( SUBCAT_PLAYLIST_SD ) add_string( "services-discovery", "", SD_TEXT, SD_LONGTEXT, true ) @@ -2061,10 +2042,6 @@ vlc_module_begin () change_short('v') change_volatile () add_obsolete_string( "verbose-objects" ) /* since 2.1.0 */ - add_bool( "quiet", 0, QUIET_TEXT, QUIET_LONGTEXT, false ) - change_short('q') - change_volatile () - #if !defined(_WIN32) && !defined(__OS2__) add_bool( "daemon", 0, DAEMON_TEXT, DAEMON_LONGTEXT, true ) change_short('d') @@ -2073,13 +2050,6 @@ vlc_module_begin () false ) #endif - add_bool( "file-logging", false, FILE_LOG_TEXT, FILE_LOG_LONGTEXT, - true ) -#ifdef HAVE_SYSLOG_H - add_bool ( "syslog", false, SYSLOG_TEXT, SYSLOG_LONGTEXT, - true ) -#endif - #if defined (_WIN32) || defined (__APPLE__) add_obsolete_string( "language" ) /* since 2.1.0 */ #endif @@ -2109,9 +2079,13 @@ vlc_module_begin () set_subcategory( SUBCAT_INTERFACE_HOTKEYS ) add_category_hint( N_("Hot keys"), HOTKEY_CAT_LONGTEXT , false ) - add_integer( "hotkeys-mousewheel-mode", 0, MOUSE_WHEEL_MODE_TEXT, - MOUSE_WHEEL_MODE_LONGTEXT, false ) + add_integer( "hotkeys-y-wheel-mode", 0, MOUSE_Y_WHEEL_MODE_TEXT, + MOUSE_Y_WHEEL_MODE_LONGTEXT, false ) + change_integer_list( mouse_wheel_values, mouse_wheel_texts ) + add_integer( "hotkeys-x-wheel-mode", 2, MOUSE_X_WHEEL_MODE_TEXT, + MOUSE_X_WHEEL_MODE_LONGTEXT, false ) change_integer_list( mouse_wheel_values, mouse_wheel_texts ) + add_obsolete_integer( "hotkeys-mousewheel-mode" ) /* since 3.0.0 */ #if defined(__APPLE__) /* Don't use the following combo's */ @@ -2190,6 +2164,7 @@ vlc_module_begin () # define KEY_AUDIODELAY_DOWN "f" # define KEY_AUDIO_TRACK "l" # define KEY_SUBTITLE_TRACK "s" +# define KEY_SUBTITLE_TOGGLE "Shift+s" # define KEY_PROGRAM_SID_NEXT "x" # define KEY_PROGRAM_SID_PREV "Shift+x" # define KEY_ASPECT_RATIO "a" @@ -2249,7 +2224,7 @@ vlc_module_begin () # define KEY_PLAY_BOOKMARK9 NULL # define KEY_PLAY_BOOKMARK10 NULL # define KEY_RECORD "Command+Shift+r" -# define KEY_WALLPAPER "w" +# define KEY_WALLPAPER NULL # define KEY_AUDIODEVICE_CYCLE "Shift+a" # define KEY_PLAY_CLEAR NULL @@ -2263,7 +2238,6 @@ vlc_module_begin () */ # define KEY_TOGGLE_FULLSCREEN "f" # define KEY_LEAVE_FULLSCREEN "Esc" -# define KEY_PLAY_PAUSE "Space\tMedia Play Pause" # define KEY_SIMPLE_PAUSE "Browser Stop" # define KEY_PLAY "Browser Refresh" # define KEY_FASTER "+" @@ -2271,9 +2245,17 @@ vlc_module_begin () # define KEY_RATE_NORMAL "=" # define KEY_RATE_FASTER_FINE "]" # define KEY_RATE_SLOWER_FINE "[" +#ifdef _WIN32 +# define KEY_PLAY_PAUSE "Space" +# define KEY_NEXT "n" +# define KEY_PREV "p" +# define KEY_STOP "s" +#else +# define KEY_PLAY_PAUSE "Space\tMedia Play Pause" # define KEY_NEXT "n\tMedia Next Track" # define KEY_PREV "p\tMedia Prev Track" # define KEY_STOP "s\tMedia Stop" +#endif # define KEY_POSITION "t" # define KEY_JUMP_MEXTRASHORT "Shift+Left" # define KEY_JUMP_PEXTRASHORT "Shift+Right" @@ -2283,7 +2265,6 @@ vlc_module_begin () # define KEY_JUMP_PMEDIUM "Ctrl+Right" # define KEY_JUMP_MLONG "Ctrl+Alt+Left" # define KEY_JUMP_PLONG "Ctrl+Alt+Right" -# define KEY_FRAME_NEXT "e\tBrowser Next" # define KEY_NAV_ACTIVATE "Enter" # define KEY_NAV_UP "Up" # define KEY_NAV_DOWN "Down" @@ -2294,12 +2275,15 @@ vlc_module_begin () #ifdef _WIN32 /* On Windows, people expect volume keys to control the master */ # define KEY_VOL_UP "Ctrl+Up" # define KEY_VOL_DOWN "Ctrl+Down" +# define KEY_VOL_MUTE "m" +# define KEY_FRAME_NEXT "e" #else # define KEY_VOL_UP "Ctrl+Up\tVolume Up" # define KEY_VOL_DOWN "Ctrl+Down\tVolume Down" +# define KEY_VOL_MUTE "m\tVolume Mute" +# define KEY_FRAME_NEXT "e\tBrowser Next" #endif -# define KEY_VOL_MUTE "m\tVolume Mute" # define KEY_SUBDELAY_UP "h" # define KEY_SUBDELAY_DOWN "g" # define KEY_SUBPOS_DOWN NULL @@ -2315,6 +2299,7 @@ vlc_module_begin () # define KEY_AUDIO_TRACK "b" # define KEY_SUBTITLE_TRACK "v" +# define KEY_SUBTITLE_TOGGLE "Shift+v" # define KEY_PROGRAM_SID_NEXT "x" # define KEY_PROGRAM_SID_PREV "Shift+x" # define KEY_ASPECT_RATIO "a" @@ -2485,6 +2470,8 @@ vlc_module_begin () AUDI_DEVICE_CYCLE_KEY_LONGTEXT, false ) add_key( "key-subtitle-track", KEY_SUBTITLE_TRACK, SUBTITLE_TRACK_KEY_TEXT, SUBTITLE_TRACK_KEY_LONGTEXT, false ) + add_key( "key-subtitle-toggle", KEY_SUBTITLE_TOGGLE, + SUBTITLE_TOGGLE_KEY_TEXT, SUBTITLE_TOGGLE_KEY_LONGTEXT, false ) add_key( "key-program-sid-next", KEY_PROGRAM_SID_NEXT, PROGRAM_SID_NEXT_KEY_TEXT, PROGRAM_SID_NEXT_KEY_LONGTEXT, false ) add_key( "key-program-sid-prev", KEY_PROGRAM_SID_PREV,