X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.h;h=98128d9185285fff2ce4f0e489c457cd81f4b8c4;hb=d1551e175043a959e22ebaccce5a9a3a9aba9222;hp=38c65ca3051af439fbe8c486131fc75d1ec07a59;hpb=0894ff443403be47932a6b0dedbaefa9114b36a6;p=vlc diff --git a/src/libvlc.h b/src/libvlc.h index 38c65ca305..98128d9185 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -288,6 +288,13 @@ static char *ppsz_align_descriptions[] = "aspect, or a float value (1.25, 1.3333, etc.) expressing pixel " \ "squareness.") +#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 aspect ratio") #define MASPECT_RATIO_LONGTEXT N_( \ "This will force the monitor aspect ratio. Most monitors have a 4:3." \ @@ -329,8 +336,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 +834,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") @@ -1017,6 +1026,7 @@ vlc_module_begin(); 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_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, @@ -1068,23 +1078,7 @@ vlc_module_begin(); /* Input options */ set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACCESS ); - add_category_hint( N_("Input"), INPUT_CAT_LONGTEXT , VLC_FALSE ); - add_module( "access", "access2", NULL, NULL, ACCESS_TEXT, - ACCESS_LONGTEXT, VLC_TRUE ); - - set_subcategory( SUBCAT_INPUT_ACCESS_FILTER ); - add_module_list_cat( "access-filter", SUBCAT_INPUT_ACCESS_FILTER, NULL, NULL, - ACCESS_FILTER_TEXT, ACCESS_FILTER_LONGTEXT, VLC_FALSE ); - - - set_subcategory( SUBCAT_INPUT_DEMUX ); - add_module( "demux", "demux2", NULL, NULL, DEMUX_TEXT, - DEMUX_LONGTEXT, VLC_TRUE ); - set_subcategory( SUBCAT_INPUT_VCODEC ); - set_subcategory( SUBCAT_INPUT_ACODEC ); - set_subcategory( SUBCAT_INPUT_SCODEC ); - set_subcategory( SUBCAT_INPUT_ADVANCED ); + set_subcategory( SUBCAT_INPUT_GENERAL ); set_section( N_( "Track settings" ), NULL ); add_integer( "program", 0, NULL, @@ -1170,9 +1164,9 @@ vlc_module_begin(); set_section( N_( "Advanced" ), NULL ); add_integer( "cr-average", 40, NULL, CR_AVERAGE_TEXT, - CR_AVERAGE_LONGTEXT, VLC_FALSE ); + CR_AVERAGE_LONGTEXT, VLC_TRUE ); add_integer( "clock-synchro", -1, NULL, CLOCK_SYNCHRO_TEXT, - CLOCK_SYNCHRO_LONGTEXT, VLC_FALSE ); + CLOCK_SYNCHRO_LONGTEXT, VLC_TRUE ); change_integer_list( pi_clock_values, ppsz_clock_descriptions, 0 ); /* Decoder options */ @@ -1182,6 +1176,23 @@ vlc_module_begin(); add_string( "encoder", NULL, NULL, ENCODER_TEXT, ENCODER_LONGTEXT, VLC_TRUE ); + set_subcategory( SUBCAT_INPUT_ACCESS ); + add_category_hint( N_("Input"), INPUT_CAT_LONGTEXT , VLC_FALSE ); + add_module( "access", "access2", NULL, NULL, ACCESS_TEXT, + ACCESS_LONGTEXT, VLC_TRUE ); + + set_subcategory( SUBCAT_INPUT_ACCESS_FILTER ); + add_module_list_cat( "access-filter", SUBCAT_INPUT_ACCESS_FILTER, NULL, NULL, + ACCESS_FILTER_TEXT, ACCESS_FILTER_LONGTEXT, VLC_FALSE ); + + + set_subcategory( SUBCAT_INPUT_DEMUX ); + add_module( "demux", "demux2", NULL, NULL, DEMUX_TEXT, + DEMUX_LONGTEXT, VLC_TRUE ); + set_subcategory( SUBCAT_INPUT_VCODEC ); + set_subcategory( SUBCAT_INPUT_ACODEC ); + set_subcategory( SUBCAT_INPUT_SCODEC ); + /* Stream output options */ set_category( CAT_SOUT ); @@ -1253,11 +1264,7 @@ vlc_module_begin(); add_bool( "minimize-threads", 0, NULL, MINIMIZE_THREADS_TEXT, MINIMIZE_THREADS_LONGTEXT, VLC_TRUE ); - /* Always set prio's on Darwin */ -#if defined(SYS_DARWIN) - add_bool( "rt-priority", VLC_TRUE, NULL, RT_PRIORITY_TEXT, - RT_PRIORITY_LONGTEXT, VLC_TRUE ); -#elif !defined(SYS_BEOS) && defined(PTHREAD_COND_T_IN_PTHREAD_H) +#if !defined(SYS_DARWIN) && !defined(SYS_BEOS) && defined(PTHREAD_COND_T_IN_PTHREAD_H) add_bool( "rt-priority", VLC_FALSE, NULL, RT_PRIORITY_TEXT, RT_PRIORITY_LONGTEXT, VLC_TRUE ); #endif @@ -1407,6 +1414,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' @@ -1474,6 +1482,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' @@ -1553,6 +1562,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, @@ -1715,6 +1726,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 },