X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc-module.c;h=bc34f8741e5641e43d7ec7a4a846cb343f765e59;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=29a3b17af4e39c71bd2a9a9db8edea197b7dc3c3;hpb=913b14ba9013ad272808cba3058113f01eb287d1;p=vlc diff --git a/src/libvlc-module.c b/src/libvlc-module.c index 29a3b17af4..bc34f8741e 100644 --- a/src/libvlc-module.c +++ b/src/libvlc-module.c @@ -1,7 +1,7 @@ /***************************************************************************** - * libvlc.h: Options for the main (libvlc itself) module + * libvlc-module.c: Options for the main (libvlc itself) module ***************************************************************************** - * Copyright (C) 1998-2006 the VideoLAN team + * Copyright (C) 1998-2009 the VideoLAN team * $Id$ * * Authors: Vincent Seguin @@ -36,6 +36,7 @@ #include #include +#include #include "libvlc.h" //#define Nothing here, this is just to prevent update-po from being stupid @@ -48,6 +49,7 @@ static const char *const ppsz_language[] = "auto", "en", "ar", + "bn", "pt_BR", "en_GB", "bg", @@ -62,11 +64,19 @@ static const char *const ppsz_language[] = "ka", "de", "he", + "hr", "hu", + "hy", + "id", "it", "ja", "ko", + "lt", + "mn", "ms", + "nn", + "kk", + "km", "oc", "fa", "pl", @@ -75,12 +85,17 @@ static const char *const ppsz_language[] = "ro", "ru", "zh_CN", + "si", "sr", "sk", "sl", + "ckb", "es", "sv", "tr", + "uk", + "vi", + "wa", }; static const char *const ppsz_language_text[] = @@ -88,6 +103,7 @@ static const char *const ppsz_language_text[] = N_("Auto"), "American English", "ﻉﺮﺒﻳ", + "বাংলা", "Português Brasileiro", "British English", "български език", @@ -102,11 +118,19 @@ static const char *const ppsz_language_text[] = "ქართული", "Deutsch", "עברית", + "hrvatski", "Magyar", + "հայերեն", + "Bahasa Indonesia", "Italiano", "日本語", "한국어", + "lietuvių", + "Монгол хэл", "Melayu", + "Nynorsk", + "Қазақ тілі", + "ភាសាខ្មែរ", "Occitan", "ﻑﺍﺮﺳی", "Polski", @@ -115,12 +139,17 @@ static const char *const ppsz_language_text[] = "Română", "Русский", "简体中文", + "සිංහල", "српски", "Slovensky", "slovenščina", + "کوردیی سۆرانی", "Español", "Svenska", "Türkçe", + "украї́нська мо́ва", + "tiếng Việt", + "Walon", }; #endif @@ -154,7 +183,7 @@ static const char *const ppsz_snap_formats[] = #define EXTRAINTF_LONGTEXT N_( \ "You can select \"additional interfaces\" for VLC. " \ "They will be launched in the background in addition to the default " \ - "interface. Use a comma separated list of interface modules. (common " \ + "interface. Use a colon separated list of interface modules. (common " \ "values are \"rc\" (remote control), \"http\", \"gestures\" ...)") #define CONTROL_TEXT N_("Control interfaces") @@ -172,7 +201,7 @@ static const char *const ppsz_snap_formats[] = "This is a ',' separated string, each objects should be prefixed by " \ "a '+' or a '-' to respectively enable or disable it. The keyword " \ "'all' refers to all objects. Objects can be refered to by their " \ - "type or module name. Rules applying to named objects take precendence " \ + "type or module name. Rules applying to named objects take precedence " \ "over rules applying to object types. Note that you still need to " \ "use -vvv to actually display debug message.") @@ -200,11 +229,6 @@ static const char *const ppsz_snap_formats[] = "show all available options, including those that most users should " \ "never touch.") -#define SHOWINTF_TEXT N_("Show interface with mouse") -#define SHOWINTF_LONGTEXT N_( \ - "When this is enabled, the interface is shown when you move the mouse to "\ - "the edge of the screen in fullscreen mode." ) - #define INTERACTION_TEXT N_("Interface interaction") #define INTERACTION_LONGTEXT N_( \ "When this is enabled, the interface will show a dialog box each time " \ @@ -262,14 +286,14 @@ static const char *const ppsz_snap_formats[] = #if !defined( __APPLE__ ) #define AOUT_RESAMP_TEXT N_("High quality audio resampling") #define AOUT_RESAMP_LONGTEXT N_( \ - "This uses a high quality audio resampling algorithm. High quality "\ + "This uses a high quality audio resampling algorithm. High quality " \ "audio resampling can be processor intensive so you can " \ "disable it and a cheaper resampling algorithm will be used instead.") #endif #define DESYNC_TEXT N_("Audio desynchronization compensation") #define DESYNC_LONGTEXT N_( \ - "This delays the audio output. The delay must be given in milliseconds." \ + "This delays the audio output. The delay must be given in milliseconds. " \ "This can be handy if you notice a lag between the video and the audio.") #define MULTICHA_TEXT N_("Audio output channels mode") @@ -324,9 +348,9 @@ 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" \ + "This allows to play audio at lower or higher speed without " \ "affecting the audio pitch" ) @@ -405,6 +429,11 @@ static const char *const ppsz_align_descriptions[] = #define EMBEDDED_LONGTEXT N_( \ "Embed the video output in the main interface." ) +#define DISPLAY_TEXT N_("X11 display") +#define DISPLAY_LONGTEXT N_( \ + "X11 hardware display to use. By default VLC will " \ + "use the value of the DISPLAY environment variable.") + #define FULLSCREEN_TEXT N_("Fullscreen video output") #define FULLSCREEN_LONGTEXT N_( \ "Start video in fullscreen mode" ) @@ -418,6 +447,11 @@ static const char *const ppsz_align_descriptions[] = #define VIDEO_ON_TOP_LONGTEXT N_( \ "Always place the video window on top of other windows." ) +#define WALLPAPER_TEXT N_("Enable wallpaper mode ") +#define WALLPAPER_LONGTEXT N_( \ + "The wallpaper mode allows you to display the video as the desktop " \ + "background." ) + #define VIDEO_TITLE_SHOW_TEXT N_("Show media title on video") #define VIDEO_TITLE_SHOW_LONGTEXT N_( \ "Display the title of the video on top of the movie.") @@ -436,6 +470,28 @@ static const char *const ppsz_align_descriptions[] = "Hide mouse cursor and fullscreen controller after " \ "n milliseconds, default is 3000 ms (3 sec.)") +#define DEINTERLACE_TEXT N_("Deinterlace") +#define DEINTERLACE_LONGTEXT N_(\ + "Deinterlace") +static const int pi_deinterlace[] = { + 0, -1, 1 +}; +static const char * const ppsz_deinterlace_text[] = { + "Off", "Automatic", "On" +}; + +#define DEINTERLACE_MODE_TEXT N_("Deinterlace mode") +#define DEINTERLACE_MODE_LONGTEXT N_( \ + "Deinterlace method to use for video processing.") +static const char * const ppsz_deinterlace_mode[] = { + "discard", "blend", "mean", "bob", + "linear", "x", "yadif", "yadif2x" +}; +static const char * const ppsz_deinterlace_mode_text[] = { + N_("Discard"), N_("Blend"), N_("Mean"), N_("Bob"), + N_("Linear"), "X", "Yadif", "Yadif (2x)" +}; + static const int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 }; static const char *const ppsz_pos_descriptions[] = { N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"), @@ -460,7 +516,7 @@ static const char *const ppsz_pos_descriptions[] = #define VIDEO_FILTER_TEXT N_("Video filter module") #define VIDEO_FILTER_LONGTEXT N_( \ "This adds post-processing filters to enhance the " \ - "picture quality, for instance deinterlacing, or distort" \ + "picture quality, for instance deinterlacing, or distort " \ "the video.") #define SNAP_PATH_TEXT N_("Video snapshot directory (or filename)") @@ -510,18 +566,23 @@ static const char *const ppsz_pos_descriptions[] = "aspect, or a float value (1.25, 1.3333, etc.) expressing pixel " \ "squareness.") -#define SCALING_TEXT N_("Video scaling") -#define SCALING_LONGTEXT N_( \ - "This enables upscaling a video in a given window.") +#define AUTOSCALE_TEXT N_("Video Auto Scaling") +#define AUTOSCALE_LONGTEXT N_( \ + "Let the video scale to fit a given window or fullscreen.") + +#define SCALEFACTOR_TEXT N_("Video scaling factor") +#define SCALEFACTOR_LONGTEXT N_( \ + "Scaling factor used when Auto Scaling is disabled.\n" \ + "Default value is 1.0 (original video size).") #define CUSTOM_CROP_RATIOS_TEXT N_("Custom crop ratios list") #define CUSTOM_CROP_RATIOS_LONGTEXT N_( \ - "Comma seperated list of crop ratios which will be added in the " \ + "Comma separated list of crop ratios which will be added in the " \ "interface's crop ratios list.") #define CUSTOM_ASPECT_RATIOS_TEXT N_("Custom aspect ratios list") #define CUSTOM_ASPECT_RATIOS_LONGTEXT N_( \ - "Comma seperated list of aspect ratios which will be added in the " \ + "Comma separated list of aspect ratios which will be added in the " \ "interface's aspect ratio list.") #define HDTV_FIX_TEXT N_("Fix HDTV height") @@ -552,15 +613,13 @@ static const char *const ppsz_pos_descriptions[] = "This avoids flooding the message log with debug output from the " \ "video output synchronization mechanism.") -#define VOUT_EVENT_TEXT N_("key and mouse event handling at vout level.") -#define VOUT_EVENT_LONGTEXT N_( \ - "This parameter accepts values : 1 (full event handling support), " \ - "2 (event handling only for fullscreen) or 3 (No event handling). " \ - "Full event handling support is the default value.") +#define KEYBOARD_EVENTS_TEXT N_("Key press events") +#define KEYBOARD_EVENTS_LONGTEXT N_( \ + "This enables VLC hotkeys from the (non-embedded) video window." ) -static const int pi_vout_event_values[] = { 1, 2, 3 }; -static const char *const ppsz_vout_event_descriptions[] = - { N_("FullSupport"), N_("Fullscreen-Only"), N_("None") }; +#define MOUSE_EVENTS_TEXT N_("Mouse events") +#define MOUSE_EVENTS_LONGTEXT N_( \ + "This enables handling of mouse clicks on the video." ) /***************************************************************************** * Input @@ -583,6 +642,11 @@ static const char *const ppsz_vout_event_descriptions[] = "real-time sources. Use this if you experience jerky playback of " \ "network streams.") +#define CLOCK_JITTER_TEXT N_("Clock jitter") +#define CLOCK_JITTER_LONGTEXT N_( \ + "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 " \ "synchronise clocks for server and client. The detailed settings " \ @@ -615,7 +679,7 @@ static const char *const ppsz_clock_descriptions[] = #define MIFACE_ADDR_TEXT N_("IPv4 multicast output interface address") #define MIFACE_ADDR_LONGTEXT N_( \ - "IPv4 adress for the default multicast interface. This overrides " \ + "IPv4 address for the default multicast interface. This overrides " \ "the routing table.") #define DSCP_TEXT N_("DiffServ Code Point") @@ -650,12 +714,12 @@ static const char *const ppsz_clock_descriptions[] = #define INPUT_AUDIOTRACK_LANG_TEXT N_("Audio language") #define INPUT_AUDIOTRACK_LANG_LONGTEXT N_( \ "Language of the audio track you want to use " \ - "(comma separated, two or three letter country code).") + "(comma separated, two or three letter country code, you may use 'none' to avoid a fallback to another language).") #define INPUT_SUBTRACK_LANG_TEXT N_("Subtitle language") #define INPUT_SUBTRACK_LANG_LONGTEXT N_( \ "Language of the subtitle track you want to use " \ - "(comma separated, two or three letters country code).") + "(comma separated, two or three letters country code, you may use 'any' as a fallback).") /// \todo Document how to find it #define INPUT_AUDIOTRACK_ID_TEXT N_("Audio track ID") @@ -686,6 +750,10 @@ static const char *const ppsz_clock_descriptions[] = #define INPUT_FAST_SEEK_LONGTEXT N_( \ "Favor speed over precision while seeking" ) +#define INPUT_RATE_TEXT N_("Playback speed") +#define INPUT_RATE_LONGTEXT N_( \ + "This defines the playback speed (nominal speed is 1.0)." ) + #define INPUT_LIST_TEXT N_("Input list") #define INPUT_LIST_LONGTEXT N_( \ "You can give a comma-separated list " \ @@ -709,7 +777,7 @@ static const char *const ppsz_clock_descriptions[] = #define INPUT_RECORD_NATIVE_TEXT N_("Prefer native stream recording") #define INPUT_RECORD_NATIVE_LONGTEXT N_( \ - "When possible, the input stream will be recorded instead of using" \ + "When possible, the input stream will be recorded instead of using " \ "the stream output module" ) #define INPUT_TIMESHIFT_PATH_TEXT N_("Timeshift directory") @@ -777,36 +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:)") -#else -#define DVD_DEV_LONGTEXT N_( \ - "This is the default DVD device to use.") -#endif + "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:" -#define VCD_DEV_TEXT N_("VCD device") -#ifdef HAVE_VCDX -#define VCD_DEV_LONGTEXT N_( \ - "This is the default VCD device to use. " \ - "If you don't specify anything, we'll scan for a suitable CD-ROM device." ) #else -#define VCD_DEV_LONGTEXT N_( \ +# define DVD_DEV_LONGTEXT N_( \ + "This is the default DVD device to use.") +# define VCD_DEV_LONGTEXT N_( \ "This is the default VCD device to use." ) -#endif - -#define CDAUDIO_DEV_TEXT N_("Audio CD device") -#ifdef HAVE_CDDAX -#define CDAUDIO_DEV_LONGTEXT N_( \ - "This is the default Audio CD device to use. " \ - "If you don't specify anything, we'll scan for a suitable CD-ROM device." ) -#else -#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.") @@ -899,7 +975,7 @@ static const char *const ppsz_clock_descriptions[] = #define SOUT_TEXT N_("Default stream output chain") #define SOUT_LONGTEXT N_( \ "You can enter here a default stream output chain. Refer to "\ - "the documentation to learn how to build such chains." \ + "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") @@ -969,11 +1045,6 @@ static const char *const ppsz_clock_descriptions[] = "These options allow you to enable special CPU optimizations. " \ "You should always leave all these enabled." ) -#define FPU_TEXT N_("Enable FPU support") -#define FPU_LONGTEXT N_( \ - "If your processor has a floating point calculation unit, VLC can take " \ - "advantage of it.") - #define MMX_TEXT N_("Enable CPU MMX support") #define MMX_LONGTEXT N_( \ "If your processor supports the MMX instructions set, VLC can take " \ @@ -999,6 +1070,26 @@ static const char *const ppsz_clock_descriptions[] = "If your processor supports the SSE2 instructions set, VLC can take " \ "advantage of them.") +#define SSE3_TEXT N_("Enable CPU SSE3 support") +#define SSE3_LONGTEXT N_( \ + "If your processor supports the SSE3 instructions set, VLC can take " \ + "advantage of them.") + +#define SSSE3_TEXT N_("Enable CPU SSSE3 support") +#define SSSE3_LONGTEXT N_( \ + "If your processor supports the SSSE3 instructions set, VLC can take " \ + "advantage of them.") + +#define SSE4_1_TEXT N_("Enable CPU SSE4.1 support") +#define SSE4_1_LONGTEXT N_( \ + "If your processor supports the SSE4.1 instructions set, VLC can take " \ + "advantage of them.") + +#define SSE4_2_TEXT N_("Enable CPU SSE4.2 support") +#define SSE4_2_LONGTEXT N_( \ + "If your processor supports the SSE4.2 instructions set, VLC can take " \ + "advantage of them.") + #define ALTIVEC_TEXT N_("Enable CPU AltiVec support") #define ALTIVEC_LONGTEXT N_( \ "If your processor supports the AltiVec instructions set, VLC can take " \ @@ -1055,6 +1146,10 @@ static const char *const ppsz_clock_descriptions[] = "Additional path for VLC to look for its modules. You can add " \ "several paths by concatenating them using \" PATH_SEP \" as separator") +#define DATA_PATH_TEXT N_("Data search path") +#define DATA_PATH_LONGTEXT N_( \ + "Override the default data/share search path.") + #define VLM_CONF_TEXT N_("VLM configuration file") #define VLM_CONF_LONGTEXT N_( \ "Read a VLM configuration file as soon as VLM is started." ) @@ -1063,9 +1158,9 @@ static const char *const ppsz_clock_descriptions[] = #define PLUGINS_CACHE_LONGTEXT N_( \ "Use a plugins cache which will greatly improve the startup time of VLC.") -#define STATS_TEXT N_("Collect statistics") +#define STATS_TEXT N_("Locally collect statistics") #define STATS_LONGTEXT N_( \ - "Collect miscellaneous statistics.") + "Collect miscellaneous local statistics about the playing media.") #define DAEMON_TEXT N_("Run as daemon process") #define DAEMON_LONGTEXT N_( \ @@ -1155,7 +1250,7 @@ static const char *const ppsz_albumart_descriptions[] = #define SD_TEXT N_( "Services discovery modules") #define SD_LONGTEXT N_( \ "Specifies the services discovery modules to load, separated by " \ - "semi-colons. Typical values are sap, hal, ..." ) + "colons. Typical values are sap, hal, ..." ) #define RANDOM_TEXT N_("Play files randomly forever") #define RANDOM_LONGTEXT N_( \ @@ -1175,13 +1270,21 @@ static const char *const ppsz_albumart_descriptions[] = #define PAE_TEXT N_("Play and exit") #define PAE_LONGTEXT N_( \ - "Exit if there are no more items in the playlist." ) + "Exit if there are no more items in the playlist." ) + +#define PAP_TEXT N_("Play and pause") +#define PAP_LONGTEXT N_( \ + "Pause each item in the playlist on the last frame." ) #define ML_TEXT N_("Use media library") #define ML_LONGTEXT N_( \ "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 " \ @@ -1210,6 +1313,12 @@ static const char *const ppsz_albumart_descriptions[] = #define FASTER_KEY_LONGTEXT N_("Select the hotkey to use for fast forward playback.") #define SLOWER_KEY_TEXT N_("Slower") #define SLOWER_KEY_LONGTEXT N_("Select the hotkey to use for slow motion playback.") +#define RATE_NORMAL_KEY_TEXT N_("Normal rate") +#define RATE_NORMAL_KEY_LONGTEXT N_("Select the hotkey to set the playback rate back to normal.") +#define RATE_FASTER_FINE_KEY_TEXT N_("Faster (fine)") +#define RATE_FASTER_FINE_KEY_LONGTEXT N_("Select the hotkey to use for fast forward playback.") +#define RATE_SLOWER_FINE_KEY_TEXT N_("Slower (fine)") +#define RATE_SLOWER_FINE_KEY_LONGTEXT N_("Select the hotkey to use for slow motion playback.") #define NEXT_KEY_TEXT N_("Next") #define NEXT_KEY_LONGTEXT N_("Select the hotkey to use to skip to the next item in the playlist.") #define PREV_KEY_TEXT N_("Previous") @@ -1289,6 +1398,10 @@ static const char *const ppsz_albumart_descriptions[] = #define SUBDELAY_UP_KEY_LONGTEXT N_("Select the key to increase the subtitle delay.") #define SUBDELAY_DOWN_KEY_TEXT N_("Subtitle delay down") #define SUBDELAY_DOWN_KEY_LONGTEXT N_("Select the key to decrease the subtitle delay.") +#define SUBPOS_UP_KEY_TEXT N_("Subtitle position up") +#define SUBPOS_UP_KEY_LONGTEXT N_("Select the key to move subtitles higher.") +#define SUBPOS_DOWN_KEY_TEXT N_("Subtitle position down") +#define SUBPOS_DOWN_KEY_LONGTEXT N_("Select the key to move subtitles lower.") #define AUDIODELAY_UP_KEY_TEXT N_("Audio delay up") #define AUDIODELAY_UP_KEY_LONGTEXT N_("Select the key to increase the audio delay.") #define AUDIODELAY_DOWN_KEY_TEXT N_("Audio delay down") @@ -1348,8 +1461,12 @@ static const char *const ppsz_albumart_descriptions[] = #define ASPECT_RATIO_KEY_LONGTEXT N_("Cycle through a predefined list of source aspect ratios.") #define CROP_KEY_TEXT N_("Cycle video crop") #define CROP_KEY_LONGTEXT N_("Cycle through a predefined list of crop formats.") -#define TOGGLE_SCALING_KEY_TEXT N_("Toggle upscaling") -#define TOGGLE_SCALING_KEY_LONGTEXT N_("Activate or deactivate upscaling.") +#define TOGGLE_AUTOSCALE_KEY_TEXT N_("Toggle autoscaling") +#define TOGGLE_AUTOSCALE_KEY_LONGTEXT N_("Activate or deactivate autoscaling.") +#define SCALE_UP_KEY_TEXT N_("Increase scale factor") +#define SCALE_UP_KEY_LONGTEXT N_("Increase scale factor.") +#define SCALE_DOWN_KEY_TEXT N_("Decrease scale factor") +#define SCALE_DOWN_KEY_LONGTEXT N_("Decrease scale factor.") #define DEINTERLACE_KEY_TEXT N_("Cycle deinterlace modes") #define DEINTERLACE_KEY_LONGTEXT N_("Cycle through deinterlace modes.") #define INTF_SHOW_KEY_TEXT N_("Show interface") @@ -1398,8 +1515,7 @@ static const char *const ppsz_albumart_descriptions[] = #define WALLPAPER_KEY_TEXT N_("Toggle wallpaper mode in video output") #define WALLPAPER_KEY_LONGTEXT N_( \ - "Toggle wallpaper mode in video output. Only works with the directx " \ - "video output for the time being." ) + "Toggle wallpaper mode in video output." ) #define MENU_ON_KEY_TEXT N_("Display OSD menu on top of video output") #define MENU_ON_KEY_LONGTEXT N_("Display OSD menu on top of video output") @@ -1488,7 +1604,7 @@ vlc_module_begin () VOLUME_STEP_LONGTEXT, true ) add_integer( "aout-rate", -1, NULL, AOUT_RATE_TEXT, AOUT_RATE_LONGTEXT, true ) -#if !defined( __APPLE__ ) +#if HAVE_FPU && !defined( __APPLE__ ) add_bool( "hq-resampling", 1, NULL, AOUT_RESAMP_TEXT, AOUT_RESAMP_LONGTEXT, true ) #endif @@ -1511,7 +1627,7 @@ vlc_module_begin () add_bool( "audio-replay-gain-peak-protection", true, NULL, AUDIO_REPLAY_GAIN_PEAK_PROTECTION_TEXT, AUDIO_REPLAY_GAIN_PEAK_PROTECTION_LONGTEXT, true ) - add_bool( "audio-time-stretch", true, NULL, + add_bool( "audio-time-stretch", HAVE_FPU, NULL, AUDIO_TIME_STRETCH_TEXT, AUDIO_TIME_STRETCH_LONGTEXT, false ) set_subcategory( SUBCAT_AUDIO_AOUT ) @@ -1523,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 */ @@ -1535,7 +1651,12 @@ vlc_module_begin () change_safe () add_bool( "grayscale", 0, NULL, GRAYSCALE_TEXT, GRAYSCALE_LONGTEXT, true ) - add_bool( "fullscreen", 0, NULL, FULLSCREEN_TEXT, +#if defined (HAVE_MAEMO) +# define FULLSCREEN_DEFAULT true +#else +# define FULLSCREEN_DEFAULT false +#endif + add_bool( "fullscreen", FULLSCREEN_DEFAULT, NULL, FULLSCREEN_TEXT, FULLSCREEN_LONGTEXT, false ) change_short('f') change_safe () @@ -1544,6 +1665,12 @@ vlc_module_begin () #ifdef __APPLE__ add_deprecated_alias( "macosx-embedded" ) /*deprecated since 0.9.0 */ #endif + add_string( "x11-display", NULL, NULL, + DISPLAY_TEXT, DISPLAY_LONGTEXT, true ) + add_deprecated_alias( "xvideo-display" ) /* deprecated since 1.1.0 */ + add_deprecated_alias( "glx-display" ) + add_bool( "xlib", true, NULL, "", "", true ) + change_private () add_bool( "drop-late-frames", 1, NULL, DROP_LATE_FRAMES_TEXT, DROP_LATE_FRAMES_LONGTEXT, true ) /* Used in vout_synchro */ @@ -1551,22 +1678,35 @@ vlc_module_begin () SKIP_FRAMES_LONGTEXT, true ) add_bool( "quiet-synchro", 0, NULL, QUIET_SYNCHRO_TEXT, QUIET_SYNCHRO_LONGTEXT, true ) - add_integer( "vout-event", 1, NULL, VOUT_EVENT_TEXT, VOUT_EVENT_LONGTEXT, true ) - change_integer_list( pi_vout_event_values, ppsz_vout_event_descriptions, NULL ) + add_bool( "keyboard-events", true, NULL, KEYBOARD_EVENTS_TEXT, + KEYBOARD_EVENTS_LONGTEXT, true ) + add_bool( "mouse-events", true, NULL, MOUSE_EVENTS_TEXT, + MOUSE_EVENTS_LONGTEXT, true ) + add_obsolete_integer( "vout-event" ) /* deprecated since 1.1.0 */ + add_obsolete_integer( "x11-event" ) /* renamed since 1.0.0 */ #ifndef __APPLE__ add_bool( "overlay", 1, NULL, OVERLAY_TEXT, OVERLAY_LONGTEXT, false ) + change_safe() #endif add_bool( "video-on-top", 0, NULL, VIDEO_ON_TOP_TEXT, VIDEO_ON_TOP_LONGTEXT, false ) + add_bool( "video-wallpaper", false, NULL, WALLPAPER_TEXT, + WALLPAPER_LONGTEXT, false ) +#ifdef WIN32 + add_deprecated_alias( "directx-wallpaper" ) +#endif add_bool( "disable-screensaver", true, NULL, SS_TEXT, SS_LONGTEXT, true ) add_bool( "video-title-show", 1, NULL, VIDEO_TITLE_SHOW_TEXT, VIDEO_TITLE_SHOW_LONGTEXT, false ) + change_safe() add_integer( "video-title-timeout", 5000, NULL, VIDEO_TITLE_TIMEOUT_TEXT, VIDEO_TITLE_TIMEOUT_LONGTEXT, false ) + change_safe() add_integer( "video-title-position", 8, NULL, VIDEO_TITLE_POSITION_TEXT, VIDEO_TITLE_POSITION_LONGTEXT, false ) + change_safe() change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL ) // autohide after 1.5s add_integer( "mouse-hide-timeout", 1500, NULL, MOUSE_HIDE_TIMEOUT_TEXT, @@ -1593,9 +1733,9 @@ vlc_module_begin () change_safe () add_integer( "height", -1, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, true ) change_safe () - add_integer( "video-x", -1, NULL, VIDEOX_TEXT, VIDEOX_LONGTEXT, true ) + add_integer( "video-x", 0, NULL, VIDEOX_TEXT, VIDEOX_LONGTEXT, true ) change_safe () - add_integer( "video-y", -1, NULL, VIDEOY_TEXT, VIDEOY_LONGTEXT, true ) + add_integer( "video-y", 0, NULL, VIDEOY_TEXT, VIDEOY_LONGTEXT, true ) change_safe () add_string( "crop", NULL, NULL, CROP_TEXT, CROP_LONGTEXT, false ) change_safe () @@ -1604,7 +1744,9 @@ vlc_module_begin () add_string( "aspect-ratio", NULL, NULL, ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, false ) change_safe () - add_bool( "scaling", true, NULL, SCALING_TEXT, SCALING_LONGTEXT, false ) + add_bool( "autoscale", true, NULL, AUTOSCALE_TEXT, AUTOSCALE_LONGTEXT, false ) + change_safe () + add_float( "scale", 1.0, NULL, SCALEFACTOR_TEXT, SCALEFACTOR_LONGTEXT, false ) change_safe () add_string( "monitor-par", NULL, NULL, MASPECT_RATIO_TEXT, MASPECT_RATIO_LONGTEXT, true ) @@ -1618,17 +1760,23 @@ vlc_module_begin () add_integer( "align", 0, NULL, ALIGN_TEXT, ALIGN_LONGTEXT, true ) change_integer_list( pi_align_values, ppsz_align_descriptions, NULL ) add_float( "zoom", 1, NULL, ZOOM_TEXT, ZOOM_LONGTEXT, true ) - + add_integer( "deinterlace", 0, NULL, + DEINTERLACE_TEXT, DEINTERLACE_LONGTEXT, false ) + change_integer_list( pi_deinterlace, ppsz_deinterlace_text, 0 ) + change_safe() + add_string( "deinterlace-mode", "blend", NULL, + DEINTERLACE_MODE_TEXT, DEINTERLACE_MODE_LONGTEXT, false ) + change_string_list( ppsz_deinterlace_mode, ppsz_deinterlace_mode_text, 0 ) + change_safe() set_subcategory( SUBCAT_VIDEO_VOUT ) - add_module( "vout", "video output", NULL, NULL, VOUT_TEXT, VOUT_LONGTEXT, + add_module( "vout", "vout display", NULL, NULL, VOUT_TEXT, VOUT_LONGTEXT, true ) change_short('V') 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 @@ -1649,6 +1797,7 @@ vlc_module_begin () set_section( N_("Subtitles") , NULL ) add_file( "sub-file", NULL, NULL, SUB_FILE_TEXT, SUB_FILE_LONGTEXT, false ) + change_safe() add_bool( "sub-autodetect-file", true, NULL, SUB_AUTO_TEXT, SUB_AUTO_LONGTEXT, false ) add_integer( "sub-autodetect-fuzzy", 3, NULL, @@ -1662,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 ) @@ -1681,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 ) @@ -1705,18 +1851,20 @@ vlc_module_begin () add_integer( "input-repeat", 0, NULL, INPUT_REPEAT_TEXT, INPUT_REPEAT_LONGTEXT, false ) change_safe () - add_integer( "start-time", 0, NULL, - START_TIME_TEXT, START_TIME_LONGTEXT, true ) + add_float( "start-time", 0, NULL, + START_TIME_TEXT, START_TIME_LONGTEXT, true ) change_safe () - add_integer( "stop-time", 0, NULL, - STOP_TIME_TEXT, STOP_TIME_LONGTEXT, true ) + add_float( "stop-time", 0, NULL, + STOP_TIME_TEXT, STOP_TIME_LONGTEXT, true ) change_safe () - add_integer( "run-time", 0, NULL, - RUN_TIME_TEXT, RUN_TIME_LONGTEXT, true ) + add_float( "run-time", 0, NULL, + RUN_TIME_TEXT, RUN_TIME_LONGTEXT, true ) change_safe () add_bool( "input-fast-seek", false, NULL, INPUT_FAST_SEEK_TEXT, INPUT_FAST_SEEK_LONGTEXT, false ) change_safe () + add_float( "rate", 1., NULL, + INPUT_RATE_TEXT, INPUT_RATE_LONGTEXT, false ) add_string( "input-list", NULL, NULL, INPUT_LIST_TEXT, INPUT_LIST_LONGTEXT, true ) @@ -1725,6 +1873,7 @@ vlc_module_begin () add_string( "bookmarks", NULL, NULL, BOOKMARKS_TEXT, BOOKMARKS_LONGTEXT, true ) + change_safe () set_section( N_( "Default devices") , NULL ) @@ -1759,20 +1908,28 @@ vlc_module_begin () set_section( N_("Metadata" ) , NULL ) add_string( "meta-title", NULL, NULL, META_TITLE_TEXT, META_TITLE_LONGTEXT, true ) + change_safe() add_string( "meta-author", NULL, NULL, META_AUTHOR_TEXT, META_AUTHOR_LONGTEXT, true ) + change_safe() add_string( "meta-artist", NULL, NULL, META_ARTIST_TEXT, META_ARTIST_LONGTEXT, true ) + change_safe() add_string( "meta-genre", NULL, NULL, META_GENRE_TEXT, META_GENRE_LONGTEXT, true ) + change_safe() add_string( "meta-copyright", NULL, NULL, META_CPYR_TEXT, META_CPYR_LONGTEXT, true ) + change_safe() add_string( "meta-description", NULL, NULL, META_DESCR_TEXT, META_DESCR_LONGTEXT, true ) + change_safe() add_string( "meta-date", NULL, NULL, META_DATE_TEXT, META_DATE_LONGTEXT, true ) + change_safe() add_string( "meta-url", NULL, NULL, META_URL_TEXT, META_URL_LONGTEXT, true ) + change_safe() set_section( N_( "Advanced" ), NULL ) @@ -1781,6 +1938,9 @@ vlc_module_begin () add_integer( "clock-synchro", -1, NULL, CLOCK_SYNCHRO_TEXT, CLOCK_SYNCHRO_LONGTEXT, true ) change_integer_list( pi_clock_values, ppsz_clock_descriptions, NULL ) + add_integer( "clock-jitter", 5 * CLOCK_FREQ/1000, NULL, CLOCK_JITTER_TEXT, + CLOCK_JITTER_LONGTEXT, true ) + change_safe() add_bool( "network-synchronisation", false, NULL, NETSYNC_TEXT, NETSYNC_LONGTEXT, true ) @@ -1875,8 +2035,7 @@ vlc_module_begin () set_category( CAT_ADVANCED ) set_subcategory( SUBCAT_ADVANCED_CPU ) add_category_hint( N_("CPU"), CPU_CAT_LONGTEXT, true ) - add_bool( "fpu", 1, NULL, FPU_TEXT, FPU_LONGTEXT, true ) - change_need_restart () + add_obsolete_bool( "fpu" ) #if defined( __i386__ ) || defined( __x86_64__ ) add_bool( "mmx", 1, NULL, MMX_TEXT, MMX_LONGTEXT, true ) change_need_restart () @@ -1888,6 +2047,14 @@ vlc_module_begin () change_need_restart () add_bool( "sse2", 1, NULL, SSE2_TEXT, SSE2_LONGTEXT, true ) change_need_restart () + add_bool( "sse3", 1, NULL, SSE3_TEXT, SSE3_LONGTEXT, true ) + change_need_restart () + add_bool( "ssse3", 1, NULL, SSSE3_TEXT, SSSE3_LONGTEXT, true ) + change_need_restart () + add_bool( "sse41", 1, NULL, SSE4_1_TEXT, SSE4_1_LONGTEXT, true ) + change_need_restart () + add_bool( "sse42", 1, NULL, SSE4_2_TEXT, SSE4_2_LONGTEXT, true ) + change_need_restart () #endif #if defined( __powerpc__ ) || defined( __ppc__ ) || defined( __ppc64__ ) add_bool( "altivec", 1, NULL, ALTIVEC_TEXT, ALTIVEC_LONGTEXT, true ) @@ -1909,6 +2076,9 @@ vlc_module_begin () add_directory( "plugin-path", NULL, NULL, PLUGIN_PATH_TEXT, PLUGIN_PATH_LONGTEXT, true ) change_need_restart () + add_directory( "data-path", NULL, NULL, DATA_PATH_TEXT, + DATA_PATH_LONGTEXT, true ) + change_need_restart () set_section( N_("Performance options"), NULL ) add_obsolete_bool( "minimize-threads" ) @@ -1939,14 +2109,12 @@ vlc_module_begin () ONEINSTANCE_LONGTEXT, true ) add_bool( "started-from-file", 0, NULL, STARTEDFROMFILE_TEXT, STARTEDFROMFILE_LONGTEXT, true ) - change_internal () - change_unsaveable () + change_volatile () add_bool( "one-instance-when-started-from-file", 1, NULL, ONEINSTANCEWHENSTARTEDFROMFILE_TEXT, ONEINSTANCEWHENSTARTEDFROMFILE_LONGTEXT, true ) add_bool( "playlist-enqueue", 0, NULL, PLAYLISTENQUEUE_TEXT, PLAYLISTENQUEUE_LONGTEXT, true ) - change_unsaveable () #endif #if defined(WIN32) @@ -1961,13 +2129,23 @@ vlc_module_begin () add_category_hint( N_("Playlist"), PLAYLIST_CAT_LONGTEXT , false ) add_bool( "random", 0, NULL, RANDOM_TEXT, RANDOM_LONGTEXT, false ) change_short('Z') + change_safe() add_bool( "loop", 0, NULL, LOOP_TEXT, LOOP_LONGTEXT, false ) change_short('L') + change_safe() add_bool( "repeat", 0, NULL, REPEAT_TEXT, REPEAT_LONGTEXT, false ) change_short('R') + change_safe() add_bool( "play-and-exit", 0, NULL, PAE_TEXT, PAE_LONGTEXT, false ) add_bool( "play-and-stop", 0, NULL, PAS_TEXT, PAS_LONGTEXT, false ) + change_safe() + 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 ) @@ -2031,9 +2209,7 @@ vlc_module_begin () add_bool( "interact", true, NULL, INTERACTION_TEXT, INTERACTION_LONGTEXT, false ) - add_bool( "show-intf", false, NULL, SHOWINTF_TEXT, SHOWINTF_LONGTEXT, - false ) - change_need_restart () + add_obsolete_bool( "show-intf" ); add_bool ( "stats", true, NULL, STATS_TEXT, STATS_LONGTEXT, true ) change_need_restart () @@ -2074,15 +2250,10 @@ vlc_module_begin () * open network KEY_MODIFIER_COMMAND|'n' * open capture KEY_MODIFIER_COMMAND|'r' * save playlist KEY_MODIFIER_COMMAND|'s' - * playlist random KEY_MODIFIER_COMMAND|'z' * playlist repeat all KEY_MODIFIER_COMMAND|'l' * playlist repeat KEY_MODIFIER_COMMAND|'r' - * video half size KEY_MODIFIER_COMMAND|'0' - * video normal size KEY_MODIFIER_COMMAND|'1' - * video double size KEY_MODIFIER_COMMAND|'2' * video fit to screen KEY_MODIFIER_COMMAND|'3' * minimize window KEY_MODIFIER_COMMAND|'m' - * quit application KEY_MODIFIER_COMMAND|'q' * close window KEY_MODIFIER_COMMAND|'w' * streaming wizard KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'w' * show controller KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'c' @@ -2103,6 +2274,9 @@ vlc_module_begin () # define KEY_PLAY KEY_UNSET # define KEY_FASTER KEY_MODIFIER_COMMAND|'=' # define KEY_SLOWER KEY_MODIFIER_COMMAND|'-' +# define KEY_RATE_NORMAL KEY_UNSET +# define KEY_RATE_FASTER_FINE KEY_UNSET +# define KEY_RATE_SLOWER_FINE KEY_UNSET # define KEY_NEXT KEY_MODIFIER_COMMAND|KEY_RIGHT # define KEY_PREV KEY_MODIFIER_COMMAND|KEY_LEFT # define KEY_STOP KEY_MODIFIER_COMMAND|'.' @@ -2127,13 +2301,17 @@ vlc_module_begin () # define KEY_VOL_MUTE KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|KEY_DOWN # define KEY_SUBDELAY_UP 'j' # define KEY_SUBDELAY_DOWN 'h' +# define KEY_SUBPOS_DOWN KEY_UNSET +# define KEY_SUBPOS_UP KEY_UNSET # define KEY_AUDIODELAY_UP 'g' # define KEY_AUDIODELAY_DOWN 'f' # define KEY_AUDIO_TRACK 'l' # define KEY_SUBTITLE_TRACK 's' # define KEY_ASPECT_RATIO 'a' # define KEY_CROP 'c' -# define KEY_TOGGLE_SCALING 'o' +# define KEY_TOGGLE_AUTOSCALE 'o' +# define KEY_SCALE_UP KEY_MODIFIER_ALT|'o' +# define KEY_SCALE_DOWN KEY_MODIFIER_SHIFT|KEY_MODIFIER_ALT|'o' # define KEY_DEINTERLACE 'd' # define KEY_INTF_SHOW 'i' # define KEY_INTF_HIDE KEY_MODIFIER_SHIFT|'i' @@ -2145,7 +2323,7 @@ vlc_module_begin () # define KEY_SNAPSHOT KEY_MODIFIER_COMMAND|KEY_MODIFIER_ALT|'s' # define KEY_ZOOM 'z' # define KEY_UNZOOM KEY_MODIFIER_SHIFT|'z' -# define KEY_RANDOM 'r' +# define KEY_RANDOM KEY_MODIFIER_COMMAND|'z' # define KEY_LOOP KEY_MODIFIER_SHIFT|'l' # define KEY_CROP_TOP KEY_MODIFIER_ALT|'i' @@ -2159,9 +2337,9 @@ vlc_module_begin () /* the macosx-interface already has bindings */ # define KEY_ZOOM_QUARTER KEY_UNSET -# define KEY_ZOOM_HALF KEY_UNSET -# define KEY_ZOOM_ORIGINAL KEY_UNSET -# define KEY_ZOOM_DOUBLE KEY_UNSET +# define KEY_ZOOM_HALF KEY_MODIFIER_COMMAND|'0' +# define KEY_ZOOM_ORIGINAL KEY_MODIFIER_COMMAND|'1' +# define KEY_ZOOM_DOUBLE KEY_MODIFIER_COMMAND|'2' # define KEY_SET_BOOKMARK1 KEY_MODIFIER_COMMAND|KEY_F1 # define KEY_SET_BOOKMARK2 KEY_MODIFIER_COMMAND|KEY_F2 @@ -2196,6 +2374,7 @@ vlc_module_begin () # define KEY_MENU_UP KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|KEY_UP # define KEY_MENU_DOWN KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|KEY_DOWN # define KEY_MENU_SELECT KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|KEY_ENTER +# define KEY_AUDIODEVICE_CYCLE KEY_MODIFIER_SHIFT|'a' #else /* Non Mac OS X */ /* @@ -2207,11 +2386,14 @@ vlc_module_begin () */ # define KEY_TOGGLE_FULLSCREEN 'f' # define KEY_LEAVE_FULLSCREEN KEY_ESC -# define KEY_PLAY_PAUSE KEY_SPACE +# define KEY_PLAY_PAUSE ' ' # define KEY_PAUSE KEY_UNSET # define KEY_PLAY KEY_UNSET # define KEY_FASTER '+' # define KEY_SLOWER '-' +# define KEY_RATE_NORMAL '=' +# define KEY_RATE_FASTER_FINE ']' +# define KEY_RATE_SLOWER_FINE '[' # define KEY_NEXT 'n' # define KEY_PREV 'p' # define KEY_STOP 's' @@ -2236,6 +2418,8 @@ vlc_module_begin () # define KEY_VOL_MUTE 'm' # define KEY_SUBDELAY_UP 'h' # define KEY_SUBDELAY_DOWN 'g' +# define KEY_SUBPOS_DOWN KEY_UNSET +# define KEY_SUBPOS_UP KEY_UNSET # define KEY_AUDIODELAY_UP 'k' # define KEY_AUDIODELAY_DOWN 'j' # define KEY_RANDOM 'r' @@ -2245,7 +2429,9 @@ vlc_module_begin () # define KEY_SUBTITLE_TRACK 'v' # define KEY_ASPECT_RATIO 'a' # define KEY_CROP 'c' -# define KEY_TOGGLE_SCALING 'o' +# define KEY_TOGGLE_AUTOSCALE 'o' +# define KEY_SCALE_UP KEY_MODIFIER_ALT|'o' +# define KEY_SCALE_DOWN KEY_MODIFIER_SHIFT|KEY_MODIFIER_ALT|'o' # define KEY_DEINTERLACE 'd' # define KEY_INTF_SHOW 'i' # define KEY_INTF_HIDE KEY_MODIFIER_SHIFT|'i' @@ -2278,10 +2464,10 @@ vlc_module_begin () # define KEY_UNCROP_RIGHT KEY_MODIFIER_ALT|KEY_MODIFIER_SHIFT|'f' /* Zooming */ -# define KEY_ZOOM_QUARTER KEY_MODIFIER_CTRL|'1' -# define KEY_ZOOM_HALF KEY_MODIFIER_CTRL|'2' -# define KEY_ZOOM_ORIGINAL KEY_MODIFIER_CTRL|'3' -# define KEY_ZOOM_DOUBLE KEY_MODIFIER_CTRL|'4' +# define KEY_ZOOM_QUARTER KEY_MODIFIER_ALT|'1' +# define KEY_ZOOM_HALF KEY_MODIFIER_ALT|'2' +# define KEY_ZOOM_ORIGINAL KEY_MODIFIER_ALT|'3' +# define KEY_ZOOM_DOUBLE KEY_MODIFIER_ALT|'4' /* Bookmarks */ # define KEY_SET_BOOKMARK1 KEY_MODIFIER_CTRL|KEY_F1 @@ -2330,6 +2516,12 @@ vlc_module_begin () FASTER_KEY_LONGTEXT, false ) add_key( "key-slower", KEY_SLOWER, NULL, SLOWER_KEY_TEXT, SLOWER_KEY_LONGTEXT, false ) + add_key( "key-rate-normal", KEY_RATE_NORMAL, NULL, RATE_NORMAL_KEY_TEXT, + RATE_NORMAL_KEY_LONGTEXT, false ) + add_key( "key-rate-faster-fine", KEY_RATE_FASTER_FINE, NULL, RATE_FASTER_FINE_KEY_TEXT, + RATE_FASTER_FINE_KEY_LONGTEXT, false ) + add_key( "key-rate-slower-fine", KEY_RATE_SLOWER_FINE, NULL, RATE_SLOWER_FINE_KEY_TEXT, + RATE_SLOWER_FINE_KEY_LONGTEXT, false ) add_key( "key-next", KEY_NEXT, NULL, NEXT_KEY_TEXT, NEXT_KEY_LONGTEXT, false ) add_key( "key-prev", KEY_PREV, NULL, PREV_KEY_TEXT, @@ -2389,13 +2581,17 @@ vlc_module_begin () SUBDELAY_UP_KEY_TEXT, SUBDELAY_UP_KEY_LONGTEXT, true ) add_key( "key-subdelay-down", KEY_SUBDELAY_DOWN, NULL, SUBDELAY_DOWN_KEY_TEXT, SUBDELAY_DOWN_KEY_LONGTEXT, true ) + add_key( "key-subpos-up", KEY_SUBPOS_UP, NULL, + SUBPOS_UP_KEY_TEXT, SUBPOS_UP_KEY_LONGTEXT, true ) + add_key( "key-subpos-down", KEY_SUBPOS_DOWN, NULL, + SUBPOS_DOWN_KEY_TEXT, SUBPOS_DOWN_KEY_LONGTEXT, true ) add_key( "key-audiodelay-up", KEY_AUDIODELAY_UP, NULL, AUDIODELAY_UP_KEY_TEXT, AUDIODELAY_UP_KEY_LONGTEXT, true ) add_key( "key-audiodelay-down", KEY_AUDIODELAY_DOWN, NULL, AUDIODELAY_DOWN_KEY_TEXT, AUDIODELAY_DOWN_KEY_LONGTEXT, true ) add_key( "key-audio-track", KEY_AUDIO_TRACK, NULL, AUDIO_TRACK_KEY_TEXT, AUDIO_TRACK_KEY_LONGTEXT, false ) - add_key( "key-audiodevice-cycle", KEY_STOP, NULL, AUDI_DEVICE_CYCLE_KEY_TEXT, + add_key( "key-audiodevice-cycle", KEY_AUDIODEVICE_CYCLE, NULL, AUDI_DEVICE_CYCLE_KEY_TEXT, AUDI_DEVICE_CYCLE_KEY_LONGTEXT, false ) add_key( "key-subtitle-track", KEY_SUBTITLE_TRACK, NULL, SUBTITLE_TRACK_KEY_TEXT, SUBTITLE_TRACK_KEY_LONGTEXT, false ) @@ -2403,8 +2599,12 @@ vlc_module_begin () ASPECT_RATIO_KEY_TEXT, ASPECT_RATIO_KEY_LONGTEXT, false ) add_key( "key-crop", KEY_CROP, NULL, CROP_KEY_TEXT, CROP_KEY_LONGTEXT, false ) - add_key( "key-toggle-scaling", KEY_TOGGLE_SCALING, NULL, - TOGGLE_SCALING_KEY_TEXT, TOGGLE_SCALING_KEY_LONGTEXT, false ) + add_key( "key-toggle-autoscale", KEY_TOGGLE_AUTOSCALE, NULL, + TOGGLE_AUTOSCALE_KEY_TEXT, TOGGLE_AUTOSCALE_KEY_LONGTEXT, false ) + add_key( "key-incr-scalefactor", KEY_SCALE_UP, NULL, + SCALE_UP_KEY_TEXT, SCALE_UP_KEY_LONGTEXT, false ) + add_key( "key-decr-scalefactor", KEY_SCALE_DOWN, NULL, + SCALE_DOWN_KEY_TEXT, SCALE_DOWN_KEY_LONGTEXT, false ) add_key( "key-deinterlace", KEY_DEINTERLACE, NULL, DEINTERLACE_KEY_TEXT, DEINTERLACE_KEY_LONGTEXT, false ) add_key( "key-intf-show", KEY_INTF_SHOW, NULL, @@ -2566,12 +2766,10 @@ vlc_module_begin () N_("print a list of available modules with extra detail") #define MODULE_TEXT \ N_("print help on a specific module (can be combined with --advanced " \ - "and --help-verbose). Prefix the module name with = for strict" \ + "and --help-verbose). Prefix the module name with = for strict " \ "matches.") #define IGNORE_CONFIG_TEXT \ N_("no configuration option will be loaded nor saved to config file") -#define SAVE_CONFIG_TEXT \ - N_("save the current command line options in the config") #define RESET_CONFIG_TEXT \ N_("reset the current config to the default values") #define CONFIG_TEXT \ @@ -2583,54 +2781,36 @@ vlc_module_begin () add_bool( "help", false, NULL, HELP_TEXT, "", false ) change_short( 'h' ) - change_internal () - change_unsaveable () + change_volatile () add_bool( "full-help", false, NULL, FULL_HELP_TEXT, "", false ) change_short( 'H' ) - change_internal () - change_unsaveable () + change_volatile () add_bool( "longhelp", false, NULL, LONGHELP_TEXT, "", false ) - change_internal () - change_unsaveable () + change_volatile () add_bool( "help-verbose", false, NULL, HELP_VERBOSE_TEXT, "", false ) - change_internal () - change_unsaveable () + change_volatile () add_bool( "list", false, NULL, LIST_TEXT, "", false ) change_short( 'l' ) - change_internal () - change_unsaveable () + change_volatile () add_bool( "list-verbose", false, NULL, LIST_VERBOSE_TEXT, "", false ) - change_internal () - change_unsaveable () + change_volatile () add_string( "module", NULL, NULL, MODULE_TEXT, "", false ) change_short( 'p' ) - change_internal () - change_unsaveable () - add_bool( "ignore-config", false, NULL, IGNORE_CONFIG_TEXT, "", false ) - change_internal () - change_unsaveable () - add_bool( "save-config", false, NULL, SAVE_CONFIG_TEXT, "", - false ) - change_internal () - change_unsaveable () + change_volatile () + add_bool( "ignore-config", true, NULL, IGNORE_CONFIG_TEXT, "", false ) + change_volatile () + add_obsolete_bool( "save-config" ) add_bool( "reset-config", false, NULL, RESET_CONFIG_TEXT, "", false ) - change_internal () - change_unsaveable () + change_volatile () add_bool( "reset-plugins-cache", false, NULL, RESET_PLUGINS_CACHE_TEXT, "", false ) - change_internal () - change_unsaveable () + change_volatile () add_bool( "version", false, NULL, VERSION_TEXT, "", false ) - change_internal () - change_unsaveable () + change_volatile () add_string( "config", NULL, NULL, CONFIG_TEXT, "", false ) - change_internal () - change_unsaveable () - add_bool( "version", false, NULL, VERSION_TEXT, "", false ) - change_internal () - change_unsaveable () + change_volatile () /* Usage (mainly useful for cmd line stuff) */ /* add_usage_hint( PLAYLIST_USAGE ) */ @@ -2647,105 +2827,113 @@ vlc_module_end () * Initializer for the libvlc instance structure * storing the action / key associations *****************************************************************************/ -const struct hotkey libvlc_hotkeys[] = +const struct action libvlc_actions[] = { - { "key-quit", ACTIONID_QUIT, 0, }, - { "key-play-pause", ACTIONID_PLAY_PAUSE, 0, }, - { "key-play", ACTIONID_PLAY, 0, }, - { "key-pause", ACTIONID_PAUSE, 0, }, - { "key-stop", ACTIONID_STOP, 0, }, - { "key-position", ACTIONID_POSITION, 0, }, - { "key-jump-extrashort", ACTIONID_JUMP_BACKWARD_EXTRASHORT, 0, }, - { "key-jump+extrashort", ACTIONID_JUMP_FORWARD_EXTRASHORT, 0, }, - { "key-jump-short", ACTIONID_JUMP_BACKWARD_SHORT, 0, }, - { "key-jump+short", ACTIONID_JUMP_FORWARD_SHORT, 0, }, - { "key-jump-medium", ACTIONID_JUMP_BACKWARD_MEDIUM, 0, }, - { "key-jump+medium", ACTIONID_JUMP_FORWARD_MEDIUM, 0, }, - { "key-jump-long", ACTIONID_JUMP_BACKWARD_LONG, 0, }, - { "key-jump+long", ACTIONID_JUMP_FORWARD_LONG, 0, }, - { "key-frame-next", ACTIONID_FRAME_NEXT, 0, }, - { "key-prev", ACTIONID_PREV, 0, }, - { "key-next", ACTIONID_NEXT, 0, }, - { "key-faster", ACTIONID_FASTER, 0, }, - { "key-slower", ACTIONID_SLOWER, 0, }, - { "key-toggle-fullscreen", ACTIONID_TOGGLE_FULLSCREEN, 0, }, - { "key-leave-fullscreen", ACTIONID_LEAVE_FULLSCREEN, 0, }, - { "key-vol-up", ACTIONID_VOL_UP, 0, }, - { "key-vol-down", ACTIONID_VOL_DOWN, 0, }, - { "key-vol-mute", ACTIONID_VOL_MUTE, 0, }, - { "key-subdelay-down", ACTIONID_SUBDELAY_DOWN, 0, }, - { "key-subdelay-up", ACTIONID_SUBDELAY_UP, 0, }, - { "key-audiodelay-down", ACTIONID_AUDIODELAY_DOWN, 0, }, - { "key-audiodelay-up", ACTIONID_AUDIODELAY_UP, 0, }, - { "key-audio-track", ACTIONID_AUDIO_TRACK, 0, }, - { "key-subtitle-track", ACTIONID_SUBTITLE_TRACK, 0, }, - { "key-aspect-ratio", ACTIONID_ASPECT_RATIO, 0, }, - { "key-crop", ACTIONID_CROP, 0, }, - { "key-deinterlace", ACTIONID_DEINTERLACE, 0, }, - { "key-intf-show", ACTIONID_INTF_SHOW, 0, }, - { "key-intf-hide", ACTIONID_INTF_HIDE, 0, }, - { "key-snapshot", ACTIONID_SNAPSHOT, 0, }, - { "key-zoom", ACTIONID_ZOOM, 0, }, - { "key-unzoom", ACTIONID_UNZOOM, 0, }, - { "key-crop-top", ACTIONID_CROP_TOP, 0, }, - { "key-uncrop-top", ACTIONID_UNCROP_TOP, 0, }, - { "key-crop-left", ACTIONID_CROP_LEFT, 0, }, - { "key-uncrop-left", ACTIONID_UNCROP_LEFT, 0, }, - { "key-crop-bottom", ACTIONID_CROP_BOTTOM, 0, }, - { "key-uncrop-bottom", ACTIONID_UNCROP_BOTTOM, 0, }, - { "key-crop-right", ACTIONID_CROP_RIGHT, 0, }, - { "key-uncrop-right", ACTIONID_UNCROP_RIGHT, 0, }, - { "key-nav-activate", ACTIONID_NAV_ACTIVATE, 0, }, - { "key-nav-up", ACTIONID_NAV_UP, 0, }, - { "key-nav-down", ACTIONID_NAV_DOWN, 0, }, - { "key-nav-left", ACTIONID_NAV_LEFT, 0, }, - { "key-nav-right", ACTIONID_NAV_RIGHT, 0, }, - { "key-disc-menu", ACTIONID_DISC_MENU, 0, }, - { "key-title-prev", ACTIONID_TITLE_PREV, 0, }, - { "key-title-next", ACTIONID_TITLE_NEXT, 0, }, - { "key-chapter-prev", ACTIONID_CHAPTER_PREV, 0, }, - { "key-chapter-next", ACTIONID_CHAPTER_NEXT, 0, }, - { "key-zoom-quarter", ACTIONID_ZOOM_QUARTER, 0, }, - { "key-zoom-half", ACTIONID_ZOOM_HALF, 0, }, - { "key-zoom-original", ACTIONID_ZOOM_ORIGINAL, 0, }, - { "key-zoom-double", ACTIONID_ZOOM_DOUBLE, 0, }, - { "key-set-bookmark1", ACTIONID_SET_BOOKMARK1, 0, }, - { "key-set-bookmark2", ACTIONID_SET_BOOKMARK2, 0, }, - { "key-set-bookmark3", ACTIONID_SET_BOOKMARK3, 0, }, - { "key-set-bookmark4", ACTIONID_SET_BOOKMARK4, 0, }, - { "key-set-bookmark5", ACTIONID_SET_BOOKMARK5, 0, }, - { "key-set-bookmark6", ACTIONID_SET_BOOKMARK6, 0, }, - { "key-set-bookmark7", ACTIONID_SET_BOOKMARK7, 0, }, - { "key-set-bookmark8", ACTIONID_SET_BOOKMARK8, 0, }, - { "key-set-bookmark9", ACTIONID_SET_BOOKMARK9, 0, }, - { "key-set-bookmark10", ACTIONID_SET_BOOKMARK10, 0, }, - { "key-play-bookmark1", ACTIONID_PLAY_BOOKMARK1, 0, }, - { "key-play-bookmark2", ACTIONID_PLAY_BOOKMARK2, 0, }, - { "key-play-bookmark3", ACTIONID_PLAY_BOOKMARK3, 0, }, - { "key-play-bookmark4", ACTIONID_PLAY_BOOKMARK4, 0, }, - { "key-play-bookmark5", ACTIONID_PLAY_BOOKMARK5, 0, }, - { "key-play-bookmark6", ACTIONID_PLAY_BOOKMARK6, 0, }, - { "key-play-bookmark7", ACTIONID_PLAY_BOOKMARK7, 0, }, - { "key-play-bookmark8", ACTIONID_PLAY_BOOKMARK8, 0, }, - { "key-play-bookmark9", ACTIONID_PLAY_BOOKMARK9, 0, }, - { "key-play-bookmark10", ACTIONID_PLAY_BOOKMARK10, 0, }, - { "key-history-back", ACTIONID_HISTORY_BACK, 0, }, - { "key-history-forward", ACTIONID_HISTORY_FORWARD, 0, }, - { "key-record", ACTIONID_RECORD, 0, }, - { "key-dump", ACTIONID_DUMP, 0, }, - { "key-random", ACTIONID_RANDOM, 0, }, - { "key-loop", ACTIONID_LOOP, 0, }, - { "key-wallpaper", ACTIONID_WALLPAPER, 0, }, - { "key-menu-on", ACTIONID_MENU_ON, 0, }, - { "key-menu-off", ACTIONID_MENU_OFF, 0, }, - { "key-menu-right", ACTIONID_MENU_RIGHT, 0, }, - { "key-menu-left", ACTIONID_MENU_LEFT, 0, }, - { "key-menu-up", ACTIONID_MENU_UP, 0, }, - { "key-menu-down", ACTIONID_MENU_DOWN, 0, }, - { "key-menu-select", ACTIONID_MENU_SELECT, 0, }, - { "key-audiodevice-cycle", ACTIONID_AUDIODEVICE_CYCLE, 0, }, - { "key-toggle-scaling", ACTIONID_TOGGLE_SCALING, 0, }, - { NULL, 0, 0, } + /* *MUST* be sorted (ASCII order) */ + { "key-aspect-ratio", ACTIONID_ASPECT_RATIO, }, + { "key-audio-track", ACTIONID_AUDIO_TRACK, }, + { "key-audiodelay-down", ACTIONID_AUDIODELAY_DOWN, }, + { "key-audiodelay-up", ACTIONID_AUDIODELAY_UP, }, + { "key-audiodevice-cycle", ACTIONID_AUDIODEVICE_CYCLE, }, + { "key-chapter-next", ACTIONID_CHAPTER_NEXT, }, + { "key-chapter-prev", ACTIONID_CHAPTER_PREV, }, + { "key-crop", ACTIONID_CROP, }, + { "key-crop-bottom", ACTIONID_CROP_BOTTOM, }, + { "key-crop-left", ACTIONID_CROP_LEFT, }, + { "key-crop-right", ACTIONID_CROP_RIGHT, }, + { "key-crop-top", ACTIONID_CROP_TOP, }, + { "key-decr-scalefactor", ACTIONID_SCALE_DOWN, }, + { "key-deinterlace", ACTIONID_DEINTERLACE, }, + { "key-disc-menu", ACTIONID_DISC_MENU, }, + { "key-dump", ACTIONID_DUMP, }, + { "key-faster", ACTIONID_FASTER, }, + { "key-frame-next", ACTIONID_FRAME_NEXT, }, + { "key-history-back", ACTIONID_HISTORY_BACK, }, + { "key-history-forward", ACTIONID_HISTORY_FORWARD, }, + { "key-incr-scalefactor", ACTIONID_SCALE_UP, }, + { "key-intf-hide", ACTIONID_INTF_HIDE, }, + { "key-intf-show", ACTIONID_INTF_SHOW, }, + { "key-jump+extrashort", ACTIONID_JUMP_FORWARD_EXTRASHORT, }, + { "key-jump+long", ACTIONID_JUMP_FORWARD_LONG, }, + { "key-jump+medium", ACTIONID_JUMP_FORWARD_MEDIUM, }, + { "key-jump+short", ACTIONID_JUMP_FORWARD_SHORT, }, + { "key-jump-extrashort", ACTIONID_JUMP_BACKWARD_EXTRASHORT, }, + { "key-jump-long", ACTIONID_JUMP_BACKWARD_LONG, }, + { "key-jump-medium", ACTIONID_JUMP_BACKWARD_MEDIUM, }, + { "key-jump-short", ACTIONID_JUMP_BACKWARD_SHORT, }, + { "key-leave-fullscreen", ACTIONID_LEAVE_FULLSCREEN, }, + { "key-loop", ACTIONID_LOOP, }, + { "key-menu-down", ACTIONID_MENU_DOWN, }, + { "key-menu-left", ACTIONID_MENU_LEFT, }, + { "key-menu-off", ACTIONID_MENU_OFF, }, + { "key-menu-on", ACTIONID_MENU_ON, }, + { "key-menu-right", ACTIONID_MENU_RIGHT, }, + { "key-menu-select", ACTIONID_MENU_SELECT, }, + { "key-menu-up", ACTIONID_MENU_UP, }, + { "key-nav-activate", ACTIONID_NAV_ACTIVATE, }, + { "key-nav-down", ACTIONID_NAV_DOWN, }, + { "key-nav-left", ACTIONID_NAV_LEFT, }, + { "key-nav-right", ACTIONID_NAV_RIGHT, }, + { "key-nav-up", ACTIONID_NAV_UP, }, + { "key-next", ACTIONID_NEXT, }, + { "key-pause", ACTIONID_PAUSE, }, + { "key-play", ACTIONID_PLAY, }, + { "key-play-bookmark1", ACTIONID_PLAY_BOOKMARK1, }, + { "key-play-bookmark10", ACTIONID_PLAY_BOOKMARK10, }, + { "key-play-bookmark2", ACTIONID_PLAY_BOOKMARK2, }, + { "key-play-bookmark3", ACTIONID_PLAY_BOOKMARK3, }, + { "key-play-bookmark4", ACTIONID_PLAY_BOOKMARK4, }, + { "key-play-bookmark5", ACTIONID_PLAY_BOOKMARK5, }, + { "key-play-bookmark6", ACTIONID_PLAY_BOOKMARK6, }, + { "key-play-bookmark7", ACTIONID_PLAY_BOOKMARK7, }, + { "key-play-bookmark8", ACTIONID_PLAY_BOOKMARK8, }, + { "key-play-bookmark9", ACTIONID_PLAY_BOOKMARK9, }, + { "key-play-pause", ACTIONID_PLAY_PAUSE, }, + { "key-position", ACTIONID_POSITION, }, + { "key-prev", ACTIONID_PREV, }, + { "key-quit", ACTIONID_QUIT, }, + { "key-random", ACTIONID_RANDOM, }, + { "key-rate-faster-fine", ACTIONID_RATE_FASTER_FINE, }, + { "key-rate-normal", ACTIONID_RATE_NORMAL, }, + { "key-rate-slower-fine", ACTIONID_RATE_SLOWER_FINE, }, + { "key-record", ACTIONID_RECORD, }, + { "key-set-bookmark1", ACTIONID_SET_BOOKMARK1, }, + { "key-set-bookmark10", ACTIONID_SET_BOOKMARK10, }, + { "key-set-bookmark2", ACTIONID_SET_BOOKMARK2, }, + { "key-set-bookmark3", ACTIONID_SET_BOOKMARK3, }, + { "key-set-bookmark4", ACTIONID_SET_BOOKMARK4, }, + { "key-set-bookmark5", ACTIONID_SET_BOOKMARK5, }, + { "key-set-bookmark6", ACTIONID_SET_BOOKMARK6, }, + { "key-set-bookmark7", ACTIONID_SET_BOOKMARK7, }, + { "key-set-bookmark8", ACTIONID_SET_BOOKMARK8, }, + { "key-set-bookmark9", ACTIONID_SET_BOOKMARK9, }, + { "key-slower", ACTIONID_SLOWER, }, + { "key-snapshot", ACTIONID_SNAPSHOT, }, + { "key-stop", ACTIONID_STOP, }, + { "key-subdelay-down", ACTIONID_SUBDELAY_DOWN, }, + { "key-subdelay-up", ACTIONID_SUBDELAY_UP, }, + { "key-subpos-down", ACTIONID_SUBPOS_DOWN, }, + { "key-subpos-up", ACTIONID_SUBPOS_UP, }, + { "key-subtitle-track", ACTIONID_SUBTITLE_TRACK, }, + { "key-title-next", ACTIONID_TITLE_NEXT, }, + { "key-title-prev", ACTIONID_TITLE_PREV, }, + { "key-toggle-autoscale", ACTIONID_TOGGLE_AUTOSCALE, }, + { "key-toggle-fullscreen", ACTIONID_TOGGLE_FULLSCREEN, }, + { "key-uncrop-bottom", ACTIONID_UNCROP_BOTTOM, }, + { "key-uncrop-left", ACTIONID_UNCROP_LEFT, }, + { "key-uncrop-right", ACTIONID_UNCROP_RIGHT, }, + { "key-uncrop-top", ACTIONID_UNCROP_TOP, }, + { "key-unzoom", ACTIONID_UNZOOM, }, + { "key-vol-down", ACTIONID_VOL_DOWN, }, + { "key-vol-mute", ACTIONID_VOL_MUTE, }, + { "key-vol-up", ACTIONID_VOL_UP, }, + { "key-wallpaper", ACTIONID_WALLPAPER, }, + { "key-zoom", ACTIONID_ZOOM, }, + { "key-zoom-double", ACTIONID_ZOOM_DOUBLE, }, + { "key-zoom-half", ACTIONID_ZOOM_HALF, }, + { "key-zoom-original", ACTIONID_ZOOM_ORIGINAL, }, + { "key-zoom-quarter", ACTIONID_ZOOM_QUARTER, }, }; -const size_t libvlc_hotkeys_size = sizeof (libvlc_hotkeys); +const size_t libvlc_actions_count = + sizeof (libvlc_actions) / sizeof (libvlc_actions[0]);