X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc-module.c;h=31037b4c2fe949cafd8c48589bb0d973d00bf7b6;hb=a308b7a17466bb91908a518c93b36dacb49212e7;hp=b304a08484183bec2a779de9103b85885d599210;hpb=69d6f2ab18e6956f22923044044b13419a713724;p=vlc diff --git a/src/libvlc-module.c b/src/libvlc-module.c index b304a08484..31037b4c2f 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." ) @@ -836,16 +832,6 @@ static const char *const ppsz_prefres[] = { #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 " \ @@ -1050,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_( \ @@ -1172,20 +1150,20 @@ static const char *const ppsz_prefres[] = { #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") @@ -1579,8 +1557,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, @@ -1593,7 +1570,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() @@ -1747,9 +1725,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 ) @@ -1847,12 +1825,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 ) @@ -1873,7 +1851,6 @@ vlc_module_begin () set_subcategory( SUBCAT_INPUT_DEMUX ) add_module( "demux", "demux", "any", DEMUX_TEXT, DEMUX_LONGTEXT, true ) - set_subcategory( SUBCAT_INPUT_VCODEC ) set_subcategory( SUBCAT_INPUT_ACODEC ) set_subcategory( SUBCAT_INPUT_SCODEC ) add_obsolete_bool( "prefer-system-codecs" ) @@ -2045,10 +2022,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') @@ -2057,13 +2030,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 @@ -2075,7 +2041,7 @@ vlc_module_begin () add_bool( "interact", true, INTERACTION_TEXT, INTERACTION_LONGTEXT, false ) - add_bool ( "stats", false, STATS_TEXT, STATS_LONGTEXT, true ) + add_bool ( "stats", true, STATS_TEXT, STATS_LONGTEXT, true ) set_subcategory( SUBCAT_INTERFACE_MAIN ) add_module_cat( "intf", SUBCAT_INTERFACE_MAIN, NULL, INTF_TEXT, @@ -2093,9 +2059,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 */ @@ -2174,6 +2144,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"