X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.h;h=d219c10e2a86b59cae0a189ba749f4a799312307;hb=bc138de9f090772a5bf99d93914684e3db151fa6;hp=f03e819dff7fb9050b1ecf72f81c02daa20fbe7f;hpb=44bc88f363c914cad96faeeb987d30b1ad64671a;p=vlc diff --git a/src/libvlc.h b/src/libvlc.h index f03e819dff..d219c10e2a 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -32,8 +32,9 @@ static char *ppsz_language[] = "pl", "pt_BR", "ru", "sv" }; static char *ppsz_language_text[] = { N_("Auto"), N_("American"), N_("British"), N_("Spanish"), N_("German"), - N_("French"), N_("Hungarian"), N_("Italian"), N_("Japanese"), N_("Dutch"), N_("Norwegian"), - N_("Polish"), N_("Brazilian"), N_("Russian"), N_("Swedish") }; + N_("French"), N_("Hungarian"), N_("Italian"), N_("Japanese"), N_("Dutch"), + N_("Norwegian"), N_("Polish"), N_("Brazilian"), N_("Russian"), + N_("Swedish") }; /***************************************************************************** * Configuration options for the main program. Each module will also separatly @@ -161,14 +162,6 @@ static char *ppsz_language_text[] = "the sound, or audio visualization modules (spectrum analyzer, ...).") #define AUDIO_CHANNEL_MIXER N_("Channel mixer") -#if 0 -#define AUDIO_CHANNEL_MIXER_LONGTEXT N_( \ - "This allows you to choose a specific audio channel mixer. For instance " \ - "the headphone channel mixer will downmix any audio source to a stereo " \ - "output and give the feeling that you are standing in a room with a " \ - "complete 5.1 speaker set when using only a headphone.") -#endif - #define AUDIO_CHANNEL_MIXER_LONGTEXT N_( \ "This allows you to choose a specific audio channel mixer. For " \ "instance, you can use the \"headphone\" mixer that gives 5.1 feeling " \ @@ -202,17 +195,29 @@ static char *ppsz_language_text[] = "You can enforce the video height here. By default (-1) VLC will " \ "adapt to the video characteristics.") +#define VIDEOX_TEXT N_("Video x coordinate") +#define VIDEOX_LONGTEXT N_( \ + "You can enforce the position of the top left corner of the video window "\ + "here (x coordinate).") + +#define VIDEOY_TEXT N_("Video y coordinate") +#define VIDEOY_LONGTEXT N_( \ + "You can enforce the position of the top left corner of the video window "\ + "here (y coordinate).") + +#define VIDEO_TITLE_TEXT N_("Video title") +#define VIDEO_TITLE_LONGTEXT N_( \ + "You can specify a custom video window title here.") + #define ALIGN_TEXT N_("Video alignment") #define ALIGN_LONGTEXT N_( \ "You can enforce the video alignement in its window. By default (0) it " \ "will be centered (0=center, 1=left, 2=right, 4=top, 8=bottom, you can " \ "also use combinations of these values).") static int pi_align_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 }; -static char *ppsz_align_descriptions[] = { N_("Center"), - N_("Left"), N_("Right"), - N_("Top"), N_("Bottom"), - N_("Top-Left"), N_("Top-Right"), - N_("Bottom-Left"), N_("Bottom-Right")}; +static char *ppsz_align_descriptions[] = +{ N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"), + N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") }; #define ZOOM_TEXT N_("Zoom video") #define ZOOM_LONGTEXT N_( \ @@ -262,16 +267,6 @@ static char *ppsz_align_descriptions[] = { N_("Center"), "aspect, or a float value (1.25, 1.3333, etc.) expressing pixel " \ "squareness.") -#if 0 -#define PIXEL_RATIO_TEXT N_("Destination aspect ratio") -#define PIXEL_RATIO_LONGTEXT N_( \ - "This will force the destination pixel size. By default VLC assumes " \ - "your pixels are square, unless your hardware has a way to tell it " \ - "otherwise. This may be used when you output VLC's signal to another " \ - "device such as a TV set. Accepted format is a float value (1, 1.25, " \ - "1.3333, etc.) expressing pixel squareness.") -#endif - #define INPUT_CAT_LONGTEXT N_( \ "These options allow you to modify the behaviour of the input " \ "subsystem, such as the DVD or VCD device, the network interface " \ @@ -324,6 +319,17 @@ static char *ppsz_align_descriptions[] = { N_("Center"), #define INPUT_REPEAT_TEXT N_("Number of time the same input will be repeated") #define INPUT_REPEAT_LONGTEXT N_("Number of time the same input will be repeated") +#define START_TIME_TEXT N_("Input start time (second)") +#define START_TIME_LONGTEXT N_("Input start time (second)") + +#define STOP_TIME_TEXT N_("Input stop time (second)") +#define STOP_TIME_LONGTEXT N_("Input stop time (second)") + +#define BOOKMARKS_TEXT N_("Bookmarks list for a stream") +#define BOOKMARKS_LONGTEXT N_("You can specify a list of bookmarks for a stream in " \ + "the form \"{name=bookmark-name,time=optional-time-offset," \ + "bytes=optional-byte-offset},{etc...}\"") + #define SUB_AUTO_TEXT N_("Autodetect subtitle files") #define SUB_AUTO_LONGTEXT \ N_("Automatically detect a subtitle file, if no subtitle filename is " \ @@ -384,6 +390,38 @@ static char *ppsz_align_descriptions[] = { N_("Center"), "If you check this box, IPv4 will be used by default for all UDP and " \ "HTTP connections.") +#define META_TITLE_TEXT N_("Title metadata") +#define META_TITLE_LONGTEXT N_( \ + "Allows you to specify a \"title\" metadata for an input.") + +#define META_AUTHOR_TEXT N_("Author metadata") +#define META_AUTHOR_LONGTEXT N_( \ + "Allows you to specify an \"author\" metadata for an input.") + +#define META_ARTIST_TEXT N_("Artist metadata") +#define META_ARTIST_LONGTEXT N_( \ + "Allows you to specify an \"artist\" metadata for an input.") + +#define META_GENRE_TEXT N_("Genre metadata") +#define META_GENRE_LONGTEXT N_( \ + "Allows you to specify a \"genre\" metadata for an input.") + +#define META_CPYR_TEXT N_("Copyright metadata") +#define META_CPYR_LONGTEXT N_( \ + "Allows you to specify a \"copyright\" metadata for an input.") + +#define META_DESCR_TEXT N_("Description metadata") +#define META_DESCR_LONGTEXT N_( \ + "Allows you to specify a \"description\" metadata for an input.") + +#define META_DATE_TEXT N_("Date metadata") +#define META_DATE_LONGTEXT N_( \ + "Allows you to specify a \"date\" metadata for an input.") + +#define META_URL_TEXT N_("URL metadata") +#define META_URL_LONGTEXT N_( \ + "Allows you to specify a \"url\" metadata for an input.") + #define CODEC_CAT_LONGTEXT N_( \ "This option can be used to alter the way VLC selects " \ "its codecs (decompression methods). Only advanced users should " \ @@ -626,6 +664,10 @@ static char *ppsz_align_descriptions[] = { N_("Center"), #define VOL_DOWN_KEY_LONGTEXT N_("Select the key to decrease audio volume.") #define VOL_MUTE_KEY_TEXT N_("Mute") #define VOL_MUTE_KEY_LONGTEXT N_("Select the key to turn off audio volume.") +#define SUBDELAY_UP_KEY_TEXT N_("Subtitle delay up") +#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 PLAY_BOOKMARK1_KEY_TEXT N_("Play playlist bookmark 1") #define PLAY_BOOKMARK2_KEY_TEXT N_("Play playlist bookmark 2") #define PLAY_BOOKMARK3_KEY_TEXT N_("Play playlist bookmark 3") @@ -651,10 +693,12 @@ static char *ppsz_align_descriptions[] = { N_("Center"), #define PLAYLIST_USAGE N_("\nPlaylist items:" \ "\n *.mpg, *.vob plain MPEG-1/2 files" \ - "\n [dvd:][device][@raw_device][@[title][,[chapter][,angle]]]" \ + "\n [dvd://][device][@raw_device][@[title][,[chapter][,angle]]]" \ "\n DVD device" \ - "\n [vcd:][device][@[title][,[chapter]]" \ + "\n [vcd://][device][@{S|T|E|P}[number]]" \ "\n VCD device" \ + "\n [cdda://][device][@[T][track-number]]" \ + "\n Audio CD device" \ "\n udpstream:[[]@[][:]]" \ "\n UDP stream sent by a streaming server" \ "\n vlc:pause pause execution of " \ @@ -736,6 +780,10 @@ vlc_module_begin(); add_bool( "video", 1, NULL, VIDEO_TEXT, VIDEO_LONGTEXT, VLC_TRUE ); add_integer( "width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, VLC_TRUE ); add_integer( "height", -1, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, VLC_TRUE ); + add_integer( "video-x", -1, NULL, VIDEOX_TEXT, VIDEOX_LONGTEXT, VLC_TRUE ); + add_integer( "video-y", -1, NULL, VIDEOY_TEXT, VIDEOY_LONGTEXT, VLC_TRUE ); + add_string( "video-title", NULL, NULL, VIDEO_TITLE_TEXT, + VIDEO_TITLE_LONGTEXT, VLC_TRUE ); add_integer( "align", 0, NULL, ALIGN_TEXT, ALIGN_LONGTEXT, VLC_TRUE ); change_integer_list( pi_align_values, ppsz_align_descriptions, 0 ); add_float( "zoom", 1, NULL, ZOOM_TEXT, ZOOM_LONGTEXT, VLC_TRUE ); @@ -783,16 +831,42 @@ vlc_module_begin(); SUB_FILE_TEXT, SUB_FILE_LONGTEXT, VLC_TRUE ); add_integer( "input-repeat", 0, NULL, INPUT_REPEAT_TEXT, INPUT_REPEAT_LONGTEXT, VLC_TRUE ); - - add_file( "dvd", DVD_DEVICE, NULL, DVD_DEV_TEXT, DVD_DEV_LONGTEXT, VLC_FALSE ); - add_file( "vcd", VCD_DEVICE, NULL, VCD_DEV_TEXT, VCD_DEV_LONGTEXT, VLC_FALSE ); - add_file( "cd-audio", CDAUDIO_DEVICE, NULL, CDAUDIO_DEV_TEXT, CDAUDIO_DEV_LONGTEXT, VLC_FALSE ); + add_integer( "start-time", 0, NULL, + START_TIME_TEXT, START_TIME_LONGTEXT, VLC_TRUE ); + add_integer( "stop-time", 0, NULL, + STOP_TIME_TEXT, STOP_TIME_LONGTEXT, VLC_TRUE ); + add_string( "bookmarks", NULL, NULL, + BOOKMARKS_TEXT, BOOKMARKS_LONGTEXT, VLC_TRUE ); + + add_file( "dvd", DVD_DEVICE, NULL, DVD_DEV_TEXT, DVD_DEV_LONGTEXT, + VLC_FALSE ); + add_file( "vcd", VCD_DEVICE, NULL, VCD_DEV_TEXT, VCD_DEV_LONGTEXT, + VLC_FALSE ); + add_file( "cd-audio", CDAUDIO_DEVICE, NULL, CDAUDIO_DEV_TEXT, + CDAUDIO_DEV_LONGTEXT, VLC_FALSE ); add_bool( "ipv6", 0, NULL, IPV6_TEXT, IPV6_LONGTEXT, VLC_FALSE ); change_short('6'); add_bool( "ipv4", 0, NULL, IPV4_TEXT, IPV4_LONGTEXT, VLC_FALSE ); change_short('4'); + add_string( "meta-title", NULL, NULL, META_TITLE_TEXT, + META_TITLE_LONGTEXT, VLC_TRUE ); + add_string( "meta-author", NULL, NULL, META_AUTHOR_TEXT, + META_AUTHOR_LONGTEXT, VLC_TRUE ); + add_string( "meta-artist", NULL, NULL, META_ARTIST_TEXT, + META_ARTIST_LONGTEXT, VLC_TRUE ); + add_string( "meta-genre", NULL, NULL, META_GENRE_TEXT, + META_GENRE_LONGTEXT, VLC_TRUE ); + add_string( "meta-copyright", NULL, NULL, META_CPYR_TEXT, + META_CPYR_LONGTEXT, VLC_TRUE ); + add_string( "meta-description", NULL, NULL, META_DESCR_TEXT, + META_DESCR_LONGTEXT, VLC_TRUE ); + add_string( "meta-date", NULL, NULL, META_DATE_TEXT, + META_DATE_LONGTEXT, VLC_TRUE ); + add_string( "meta-url", NULL, NULL, META_URL_TEXT, + META_URL_LONGTEXT, VLC_TRUE ); + /* Decoder options */ add_category_hint( N_("Decoders"), CODEC_CAT_LONGTEXT , VLC_TRUE ); add_module( "codec", "decoder", NULL, NULL, CODEC_TEXT, CODEC_LONGTEXT, VLC_TRUE ); @@ -895,6 +969,10 @@ vlc_module_begin(); add_key( "key-vol-up", KEY_MODIFIER_COMMAND|KEY_UP, NULL, VOL_UP_KEY_TEXT, VOL_UP_KEY_LONGTEXT, VLC_FALSE ); add_key( "key-vol-down", KEY_MODIFIER_COMMAND|KEY_DOWN, NULL, VOL_DOWN_KEY_TEXT, VOL_DOWN_KEY_LONGTEXT, VLC_FALSE ); add_key( "key-vol-mute", KEY_MODIFIER_COMMAND|KEY_MODIFIER_SHIFT|'m', NULL, VOL_MUTE_KEY_TEXT, VOL_MUTE_KEY_LONGTEXT, VLC_FALSE ); + add_key( "key-subdelay-up", KEY_MODIFIER_COMMAND|'j', NULL, + SUBDELAY_UP_KEY_TEXT, SUBDELAY_UP_KEY_LONGTEXT, VLC_FALSE ); + add_key( "key-subdelay-down", KEY_MODIFIER_COMMAND|'h', NULL, + SUBDELAY_DOWN_KEY_TEXT, SUBDELAY_DOWN_KEY_LONGTEXT, VLC_FALSE ); add_key( "key-set-bookmark1", KEY_MODIFIER_COMMAND|KEY_F1, NULL, SET_BOOKMARK1_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); add_key( "key-set-bookmark2", KEY_MODIFIER_COMMAND|KEY_F2, NULL, SET_BOOKMARK2_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); add_key( "key-set-bookmark3", KEY_MODIFIER_COMMAND|KEY_F3, NULL, SET_BOOKMARK3_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); @@ -941,6 +1019,10 @@ vlc_module_begin(); add_key( "key-vol-up", 'a', NULL, VOL_UP_KEY_TEXT, VOL_UP_KEY_LONGTEXT, VLC_FALSE ); add_key( "key-vol-down", 'z', NULL, VOL_DOWN_KEY_TEXT, VOL_DOWN_KEY_LONGTEXT, VLC_FALSE ); add_key( "key-vol-mute", 'm', NULL, VOL_MUTE_KEY_TEXT, VOL_MUTE_KEY_LONGTEXT, VLC_FALSE ); + add_key( "key-subdelay-up", KEY_MODIFIER_COMMAND|'h', NULL, + SUBDELAY_UP_KEY_TEXT, SUBDELAY_UP_KEY_LONGTEXT, VLC_FALSE ); + add_key( "key-subdelay-down", KEY_MODIFIER_COMMAND|'j', NULL, + SUBDELAY_DOWN_KEY_TEXT, SUBDELAY_DOWN_KEY_LONGTEXT, VLC_FALSE ); add_key( "key-set-bookmark1", KEY_MODIFIER_CTRL|KEY_F1, NULL, SET_BOOKMARK1_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); add_key( "key-set-bookmark2", KEY_MODIFIER_CTRL|KEY_F2, NULL, SET_BOOKMARK2_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); add_key( "key-set-bookmark3", KEY_MODIFIER_CTRL|KEY_F3, NULL, SET_BOOKMARK3_KEY_TEXT, SET_BOOKMARK_KEY_LONGTEXT, VLC_TRUE ); @@ -1020,6 +1102,8 @@ static struct hotkey p_hotkeys[] = { "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-nav-activate", ACTIONID_NAV_ACTIVATE, 0 }, { "key-nav-up", ACTIONID_NAV_UP, 0 }, { "key-nav-down", ACTIONID_NAV_DOWN, 0 },