X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc-module.c;h=95b60bcc7a36193618ceab4d6cbde706ee7e088b;hb=b8dddd33871f9932d58a6c7a69ba38d8e4f158bb;hp=c8b95f2b45494fef0c3c05da539d0519418500ca;hpb=28e52ddb9b8a1ae76eba086114ecf0bca90383ee;p=vlc diff --git a/src/libvlc-module.c b/src/libvlc-module.c index c8b95f2b45..95b60bcc7a 100644 --- a/src/libvlc-module.c +++ b/src/libvlc-module.c @@ -193,7 +193,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.") @@ -278,14 +278,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") @@ -342,7 +342,7 @@ static const char *const ppsz_force_dolby_descriptions[] = { #define AUDIO_TIME_STRETCH_TEXT N_( \ "Enable time streching 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" ) @@ -439,6 +439,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.") @@ -503,7 +508,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)") @@ -759,7 +764,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") @@ -838,24 +843,12 @@ static const char *const ppsz_clock_descriptions[] = #endif #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_( \ "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_( \ "This is the default Audio CD device to use." ) -#endif #define IPV6_TEXT N_("Force IPv6") #define IPV6_LONGTEXT N_( \ @@ -949,7 +942,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") @@ -1485,8 +1478,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") @@ -1657,6 +1649,11 @@ vlc_module_begin () #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 ) @@ -1732,7 +1729,7 @@ vlc_module_begin () 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') @@ -1760,6 +1757,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, @@ -2077,7 +2075,6 @@ vlc_module_begin () ONEINSTANCEWHENSTARTEDFROMFILE_LONGTEXT, true ) add_bool( "playlist-enqueue", 0, NULL, PLAYLISTENQUEUE_TEXT, PLAYLISTENQUEUE_LONGTEXT, true ) - change_unsaveable () #endif #if defined(WIN32) @@ -2725,12 +2722,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 \ @@ -2770,10 +2765,7 @@ vlc_module_begin () add_bool( "ignore-config", true, NULL, IGNORE_CONFIG_TEXT, "", false ) change_internal () change_unsaveable () - add_bool( "save-config", false, NULL, SAVE_CONFIG_TEXT, "", - false ) - change_internal () - change_unsaveable () + add_obsolete_bool( "save-config" ) add_bool( "reset-config", false, NULL, RESET_CONFIG_TEXT, "", false ) change_internal () change_unsaveable () @@ -2808,82 +2800,57 @@ vlc_module_end () *****************************************************************************/ 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, }, @@ -2892,25 +2859,51 @@ const struct action libvlc_actions[] = { "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 =