#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" )
#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.")
"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." )
#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")
#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_bool( "drop-late-frames", 1, NULL, DROP_LATE_FRAMES_TEXT,
DROP_LATE_FRAMES_LONGTEXT, true )
/* Used in vout_synchro */
#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 )
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_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,
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" )
*****************************************************************************/
const struct action libvlc_actions[] =
{
- { "key-quit", ACTIONID_QUIT, },
- { "key-play-pause", ACTIONID_PLAY_PAUSE, },
- { "key-play", ACTIONID_PLAY, },
- { "key-pause", ACTIONID_PAUSE, },
- { "key-stop", ACTIONID_STOP, },
- { "key-position", ACTIONID_POSITION, },
- { "key-jump-extrashort", ACTIONID_JUMP_BACKWARD_EXTRASHORT, },
- { "key-jump+extrashort", ACTIONID_JUMP_FORWARD_EXTRASHORT, },
- { "key-jump-short", ACTIONID_JUMP_BACKWARD_SHORT, },
- { "key-jump+short", ACTIONID_JUMP_FORWARD_SHORT, },
- { "key-jump-medium", ACTIONID_JUMP_BACKWARD_MEDIUM, },
- { "key-jump+medium", ACTIONID_JUMP_FORWARD_MEDIUM, },
- { "key-jump-long", ACTIONID_JUMP_BACKWARD_LONG, },
- { "key-jump+long", ACTIONID_JUMP_FORWARD_LONG, },
- { "key-frame-next", ACTIONID_FRAME_NEXT, },
- { "key-prev", ACTIONID_PREV, },
- { "key-next", ACTIONID_NEXT, },
- { "key-faster", ACTIONID_FASTER, },
- { "key-slower", ACTIONID_SLOWER, },
- { "key-rate-normal", ACTIONID_RATE_NORMAL, },
- { "key-rate-faster-fine", ACTIONID_RATE_FASTER_FINE, },
- { "key-rate-slower-fine", ACTIONID_RATE_SLOWER_FINE, },
- { "key-toggle-fullscreen", ACTIONID_TOGGLE_FULLSCREEN, },
- { "key-leave-fullscreen", ACTIONID_LEAVE_FULLSCREEN, },
- { "key-vol-up", ACTIONID_VOL_UP, },
- { "key-vol-down", ACTIONID_VOL_DOWN, },
- { "key-vol-mute", ACTIONID_VOL_MUTE, },
- { "key-subdelay-down", ACTIONID_SUBDELAY_DOWN, },
- { "key-subdelay-up", ACTIONID_SUBDELAY_UP, },
- { "key-subpos-down", ACTIONID_SUBPOS_DOWN, },
- { "key-subpos-up", ACTIONID_SUBPOS_UP, },
+ /* *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-audio-track", ACTIONID_AUDIO_TRACK, },
- { "key-subtitle-track", ACTIONID_SUBTITLE_TRACK, },
- { "key-aspect-ratio", ACTIONID_ASPECT_RATIO, },
+ { "key-audiodevice-cycle", ACTIONID_AUDIODEVICE_CYCLE, },
+ { "key-chapter-next", ACTIONID_CHAPTER_NEXT, },
+ { "key-chapter-prev", ACTIONID_CHAPTER_PREV, },
{ "key-crop", ACTIONID_CROP, },
- { "key-deinterlace", ACTIONID_DEINTERLACE, },
- { "key-intf-show", ACTIONID_INTF_SHOW, },
- { "key-intf-hide", ACTIONID_INTF_HIDE, },
- { "key-snapshot", ACTIONID_SNAPSHOT, },
- { "key-zoom", ACTIONID_ZOOM, },
- { "key-unzoom", ACTIONID_UNZOOM, },
- { "key-crop-top", ACTIONID_CROP_TOP, },
- { "key-uncrop-top", ACTIONID_UNCROP_TOP, },
- { "key-crop-left", ACTIONID_CROP_LEFT, },
- { "key-uncrop-left", ACTIONID_UNCROP_LEFT, },
{ "key-crop-bottom", ACTIONID_CROP_BOTTOM, },
- { "key-uncrop-bottom", ACTIONID_UNCROP_BOTTOM, },
+ { "key-crop-left", ACTIONID_CROP_LEFT, },
{ "key-crop-right", ACTIONID_CROP_RIGHT, },
- { "key-uncrop-right", ACTIONID_UNCROP_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-up", ACTIONID_NAV_UP, },
{ "key-nav-down", ACTIONID_NAV_DOWN, },
{ "key-nav-left", ACTIONID_NAV_LEFT, },
{ "key-nav-right", ACTIONID_NAV_RIGHT, },
- { "key-disc-menu", ACTIONID_DISC_MENU, },
- { "key-title-prev", ACTIONID_TITLE_PREV, },
- { "key-title-next", ACTIONID_TITLE_NEXT, },
- { "key-chapter-prev", ACTIONID_CHAPTER_PREV, },
- { "key-chapter-next", ACTIONID_CHAPTER_NEXT, },
- { "key-zoom-quarter", ACTIONID_ZOOM_QUARTER, },
- { "key-zoom-half", ACTIONID_ZOOM_HALF, },
- { "key-zoom-original", ACTIONID_ZOOM_ORIGINAL, },
- { "key-zoom-double", ACTIONID_ZOOM_DOUBLE, },
- { "key-set-bookmark1", ACTIONID_SET_BOOKMARK1, },
- { "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-set-bookmark10", ACTIONID_SET_BOOKMARK10, },
+ { "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-bookmark7", ACTIONID_PLAY_BOOKMARK7, },
{ "key-play-bookmark8", ACTIONID_PLAY_BOOKMARK8, },
{ "key-play-bookmark9", ACTIONID_PLAY_BOOKMARK9, },
- { "key-play-bookmark10", ACTIONID_PLAY_BOOKMARK10, },
- { "key-history-back", ACTIONID_HISTORY_BACK, },
- { "key-history-forward", ACTIONID_HISTORY_FORWARD, },
- { "key-record", ACTIONID_RECORD, },
- { "key-dump", ACTIONID_DUMP, },
+ { "key-play-pause", ACTIONID_PLAY_PAUSE, },
+ { "key-position", ACTIONID_POSITION, },
+ { "key-prev", ACTIONID_PREV, },
+ { "key-quit", ACTIONID_QUIT, },
{ "key-random", ACTIONID_RANDOM, },
- { "key-loop", ACTIONID_LOOP, },
- { "key-wallpaper", ACTIONID_WALLPAPER, },
- { "key-menu-on", ACTIONID_MENU_ON, },
- { "key-menu-off", ACTIONID_MENU_OFF, },
- { "key-menu-right", ACTIONID_MENU_RIGHT, },
- { "key-menu-left", ACTIONID_MENU_LEFT, },
- { "key-menu-up", ACTIONID_MENU_UP, },
- { "key-menu-down", ACTIONID_MENU_DOWN, },
- { "key-menu-select", ACTIONID_MENU_SELECT, },
- { "key-audiodevice-cycle", ACTIONID_AUDIODEVICE_CYCLE, },
+ { "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-incr-scalefactor", ACTIONID_SCALE_UP, },
- { "key-decr-scalefactor", ACTIONID_SCALE_DOWN, },
+ { "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_actions_count =
projects / vlc / blobdiff