X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.h;h=690e913009a8a7e397e7108ec637c89ca6389465;hb=c9d8217fd9cb95ecd8b1844c9c141e042f36bceb;hp=38fbadc37cb1864b37dbc92352bec2c65e7d9fd8;hpb=2cf38dd9195464f7d418938c96337bd83f635bcd;p=vlc diff --git a/src/libvlc.h b/src/libvlc.h index 38fbadc37c..690e913009 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -279,6 +279,12 @@ static char *ppsz_align_descriptions[] = "Allows you to specify the image format in which the video snapshots will " \ "be stored.") +#define CROP_TEXT N_("Video cropping") +#define CROP_LONGTEXT N_( \ + "This will force the cropping of the source video. " \ + "Accepted formats are x:y (4:3, 16:9, etc.) expressing the global image " \ + "aspect.") + #define ASPECT_RATIO_TEXT N_("Source aspect ratio") #define ASPECT_RATIO_LONGTEXT N_( \ "This will force the source aspect ratio. For instance, some DVDs claim " \ @@ -288,11 +294,18 @@ static char *ppsz_align_descriptions[] = "aspect, or a float value (1.25, 1.3333, etc.) expressing pixel " \ "squareness.") -#define MASPECT_RATIO_TEXT N_("Monitor aspect ratio") +#define HDTV_FIX_TEXT N_("Fix HDTV height") +#define HDTV_FIX_LONGTEXT N_( \ + "This option allows proper handling of HDTV-1080 video format " \ + "even if broken encoder incorrectly set height to 1088 lines. " \ + "Disable this option only if your video has non-standard format " \ + "requiring all 1088 lines.") + +#define MASPECT_RATIO_TEXT N_("Monitor pixel aspect ratio") #define MASPECT_RATIO_LONGTEXT N_( \ - "This will force the monitor aspect ratio. Most monitors have a 4:3." \ - "If you have a 16:9 screen, you will need to change this to 16:9 in" \ - "order to keep proportions.") + "This will force the monitor aspect ratio. Most monitors have square " \ + "pixels (1:1). If you have a 16:9 screen, you might need to change this " \ + "to 4:3 in order to keep proportions.") #define SKIP_FRAMES_TEXT N_("Skip frames") #define SKIP_FRAMES_LONGTEXT N_( \ @@ -329,8 +342,8 @@ static char *ppsz_clock_descriptions[] = #define MTU_TEXT N_("MTU of the network interface") #define MTU_LONGTEXT N_( \ - "This is the typical size of UDP packets that we expect. On Ethernet " \ - "it is usually 1500.") + "This is the maximum packet size that can be transmitted " \ + "over network interface. On Ethernet it is usually 1500 bytes.") #define TTL_TEXT N_("Time To Live") #define TTL_LONGTEXT N_( \ @@ -827,6 +840,8 @@ static char *ppsz_clock_descriptions[] = #define NAV_RIGHT_KEY_LONGTEXT N_("Select the key to move the selector right in DVD menus.") #define NAV_ACTIVATE_KEY_TEXT N_("Activate") #define NAV_ACTIVATE_KEY_LONGTEXT N_("Select the key to activate selected item in DVD menus.") +#define DISC_MENU_TEXT N_("Go to the DVD menu") +#define DISC_MENU_LONGTEXT N_("Select the key to take you to the DVD menu") #define TITLE_PREV_TEXT N_("Select previous DVD title") #define TITLE_PREV_LONGTEXT N_("Select the key to choose the previous title from the DVD") #define TITLE_NEXT_TEXT N_("Select next DVD title") @@ -1013,10 +1028,12 @@ vlc_module_begin(); 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( "aspect-ratio", "", NULL, - ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_FALSE ); - add_string( "monitor-aspect-ratio", "4:3", NULL, - MASPECT_RATIO_TEXT, MASPECT_RATIO_LONGTEXT, VLC_FALSE ); + add_string( "crop", NULL, NULL, CROP_TEXT, CROP_LONGTEXT, VLC_FALSE ); + add_string( "aspect-ratio", NULL, NULL, + ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, VLC_FALSE ); + add_string( "monitor-par", NULL, NULL, + MASPECT_RATIO_TEXT, MASPECT_RATIO_LONGTEXT, VLC_TRUE ); + add_bool( "hdtv-fix", 1, NULL, HDTV_FIX_TEXT, HDTV_FIX_LONGTEXT, VLC_TRUE ); add_bool( "video-deco", 1, NULL, VIDEO_DECO_TEXT, VIDEO_DECO_LONGTEXT, VLC_TRUE ); add_string( "video-title", NULL, NULL, VIDEO_TITLE_TEXT, @@ -1059,7 +1076,7 @@ vlc_module_begin(); #endif add_string( "sub-autodetect-path", SUB_PATH, NULL, SUB_PATH_TEXT, SUB_PATH_LONGTEXT, VLC_TRUE ); - add_integer( "sub-margin", -1, NULL, SUB_MARGIN_TEXT, + add_integer( "sub-margin", 0, NULL, SUB_MARGIN_TEXT, SUB_MARGIN_LONGTEXT, VLC_TRUE ); add_deprecated( "spu-margin", VLC_FALSE ); /*Deprecated since 0.8.2 */ set_section( N_( "Overlays" ) , NULL ); @@ -1404,6 +1421,7 @@ vlc_module_begin(); # define KEY_SUBTITLE_TRACK 's' # define KEY_INTF_SHOW 'i' # define KEY_INTF_HIDE 'I' +# define KEY_DISC_MENU KEY_MODIFIER_CTRL|'m' # define KEY_TITLE_PREV KEY_MODIFIER_CTRL|'p' # define KEY_TITLE_NEXT KEY_MODIFIER_CTRL|'n' # define KEY_CHAPTER_PREV KEY_MODIFIER_CTRL|'u' @@ -1471,6 +1489,7 @@ vlc_module_begin(); # define KEY_SUBTITLE_TRACK 'k' # define KEY_INTF_SHOW 'i' # define KEY_INTF_HIDE 'I' +# define KEY_DISC_MENU KEY_MODIFIER_CTRL|'m' # define KEY_TITLE_PREV KEY_MODIFIER_CTRL|'p' # define KEY_TITLE_NEXT KEY_MODIFIER_CTRL|'n' # define KEY_CHAPTER_PREV KEY_MODIFIER_CTRL|'u' @@ -1550,6 +1569,8 @@ vlc_module_begin(); add_key( "key-nav-right", KEY_NAV_RIGHT, NULL, NAV_RIGHT_KEY_TEXT, NAV_RIGHT_KEY_LONGTEXT, VLC_TRUE ); + add_key( "key-disc-menu", KEY_DISC_MENU, NULL, DISC_MENU_TEXT, + DISC_MENU_LONGTEXT, VLC_TRUE ); add_key( "key-title-prev", KEY_TITLE_PREV, NULL, TITLE_PREV_TEXT, TITLE_PREV_LONGTEXT, VLC_TRUE ); add_key( "key-title-next", KEY_TITLE_NEXT, NULL, TITLE_NEXT_TEXT, @@ -1712,6 +1733,7 @@ static struct hotkey p_hotkeys[] = { "key-nav-down", ACTIONID_NAV_DOWN, 0, 0, 0, 0 }, { "key-nav-left", ACTIONID_NAV_LEFT, 0, 0, 0, 0 }, { "key-nav-right", ACTIONID_NAV_RIGHT, 0, 0, 0, 0 }, + { "key-disc-menu", ACTIONID_DISC_MENU, 0, 0, 0, 0 }, { "key-title-prev", ACTIONID_TITLE_PREV, 0, 0, 0, 0 }, { "key-title-next", ACTIONID_TITLE_NEXT, 0, 0, 0, 0 }, { "key-chapter-prev", ACTIONID_CHAPTER_PREV, 0, 0, 0, 0 },