static const char *const ppsz_language_text[] =
{
N_("Auto"),
- N_("American English"),
- N_("Arabic"),
- N_("Brazilian Portuguese"),
- N_("British English"),
- N_("Bulgarian"),
- N_("Catalan"),
- N_("Chinese Traditional"),
- N_("Czech"),
- N_("Danish"),
- N_("Dutch"),
- N_("Finnish"),
- N_("French"),
- N_("Galician"),
- N_("Georgian"),
- N_("German"),
- N_("Hebrew"),
- N_("Hungarian"),
- N_("Italian"),
- N_("Japanese"),
- N_("Korean"),
- N_("Malay"),
- N_("Occitan"),
- N_("Persian"),
- N_("Polish"),
- N_("Portuguese"),
- N_("Punjabi"),
- N_("Romanian"),
- N_("Russian"),
- N_("Simplified Chinese"),
- N_("Serbian"),
- N_("Slovak"),
- N_("Slovenian"),
- N_("Spanish"),
- N_("Swedish"),
- N_("Turkish"),
+ "American English",
+ "ﻉﺮﺒﻳ",
+ "Português Brasileiro",
+ "British English",
+ "български език",
+ "Català",
+ "正體中文",
+ "Čeština",
+ "Dansk",
+ "Nederlands",
+ "Suomi",
+ "Français",
+ "Galego",
+ "ქართული",
+ "Deutsch",
+ "עברית",
+ "Magyar",
+ "Italiano",
+ "日本語",
+ "한국어",
+ "Melayu",
+ "Occitan",
+ "ﻑﺍﺮﺳی",
+ "Polski",
+ "Português",
+ "ਪੰਜਾਬੀ",
+ "Română",
+ "Русский",
+ "简体中文",
+ "српски",
+ "Slovensky",
+ "slovenščina",
+ "Español",
+ "Svenska",
+ "Türkçe",
};
#endif
"aspect, or a float value (1.25, 1.3333, etc.) expressing pixel " \
"squareness.")
-#define SCALING_TEXT N_("Video scaling")
-#define SCALING_LONGTEXT N_( \
- "This enables upscaling a video in a given window.")
+#define AUTOSCALE_TEXT N_("Video Auto Scaling")
+#define AUTOSCALE_LONGTEXT N_( \
+ "Let the video scale to fit a given window or fullscreen.")
+
+#define SCALEFACTOR_TEXT N_("Video scaling factor")
+#define SCALEFACTOR_LONGTEXT N_( \
+ "Scaling factor used when Auto Scaling is disabled.\n" \
+ "Default value is 1.0 (original video size).")
#define CUSTOM_CROP_RATIOS_TEXT N_("Custom crop ratios list")
#define CUSTOM_CROP_RATIOS_LONGTEXT N_( \
#define FASTER_KEY_LONGTEXT N_("Select the hotkey to use for fast forward playback.")
#define SLOWER_KEY_TEXT N_("Slower")
#define SLOWER_KEY_LONGTEXT N_("Select the hotkey to use for slow motion playback.")
+#define RATE_NORMAL_KEY_TEXT N_("Normal rate")
+#define RATE_NORMAL_KEY_LONGTEXT N_("Select the hotkey to set the playback rate back to normal.")
+#define RATE_FASTER_FINE_KEY_TEXT N_("Faster (fine)")
+#define RATE_FASTER_FINE_KEY_LONGTEXT N_("Select the hotkey to use for fast forward playback.")
+#define RATE_SLOWER_FINE_KEY_TEXT N_("Slower (fine)")
+#define RATE_SLOWER_FINE_KEY_LONGTEXT N_("Select the hotkey to use for slow motion playback.")
#define NEXT_KEY_TEXT N_("Next")
#define NEXT_KEY_LONGTEXT N_("Select the hotkey to use to skip to the next item in the playlist.")
#define PREV_KEY_TEXT N_("Previous")
#define ASPECT_RATIO_KEY_LONGTEXT N_("Cycle through a predefined list of source aspect ratios.")
#define CROP_KEY_TEXT N_("Cycle video crop")
#define CROP_KEY_LONGTEXT N_("Cycle through a predefined list of crop formats.")
-#define TOGGLE_SCALING_KEY_TEXT N_("Toggle upscaling")
-#define TOGGLE_SCALING_KEY_LONGTEXT N_("Activate or deactivate upscaling.")
+#define TOGGLE_AUTOSCALE_KEY_TEXT N_("Toggle autoscaling")
+#define TOGGLE_AUTOSCALE_KEY_LONGTEXT N_("Activate or deactivate autoscaling.")
+#define SCALE_UP_KEY_TEXT N_("Increase scale factor")
+#define SCALE_UP_KEY_LONGTEXT N_("Increase scale factor.")
+#define SCALE_DOWN_KEY_TEXT N_("Decrease scale factor")
+#define SCALE_DOWN_KEY_LONGTEXT N_("Decrease scale factor.")
#define DEINTERLACE_KEY_TEXT N_("Cycle deinterlace modes")
#define DEINTERLACE_KEY_LONGTEXT N_("Cycle through deinterlace modes.")
#define INTF_SHOW_KEY_TEXT N_("Show interface")
add_string( "aspect-ratio", NULL, NULL,
ASPECT_RATIO_TEXT, ASPECT_RATIO_LONGTEXT, false )
change_safe ()
- add_bool( "scaling", true, NULL, SCALING_TEXT, SCALING_LONGTEXT, false )
+ add_bool( "autoscale", true, NULL, AUTOSCALE_TEXT, AUTOSCALE_LONGTEXT, false )
+ change_safe ()
+ add_float( "scale", 1.0, NULL, SCALEFACTOR_TEXT, SCALEFACTOR_LONGTEXT, false )
change_safe ()
add_string( "monitor-par", NULL, NULL,
MASPECT_RATIO_TEXT, MASPECT_RATIO_LONGTEXT, true )
# define KEY_PLAY KEY_UNSET
# define KEY_FASTER KEY_MODIFIER_COMMAND|'='
# define KEY_SLOWER KEY_MODIFIER_COMMAND|'-'
+# define KEY_RATE_NORMAL KEY_UNSET
+# define KEY_RATE_FASTER_FINE KEY_UNSET
+# define KEY_RATE_SLOWER_FINE KEY_UNSET
# define KEY_NEXT KEY_MODIFIER_COMMAND|KEY_RIGHT
# define KEY_PREV KEY_MODIFIER_COMMAND|KEY_LEFT
# define KEY_STOP KEY_MODIFIER_COMMAND|'.'
# define KEY_SUBTITLE_TRACK 's'
# define KEY_ASPECT_RATIO 'a'
# define KEY_CROP 'c'
-# define KEY_TOGGLE_SCALING 'o'
+# define KEY_TOGGLE_AUTOSCALE 'o'
+# define KEY_SCALE_UP KEY_MODIFIER_ALT|'o'
+# define KEY_SCALE_DOWN KEY_MODIFIER_SHIFT|KEY_MODIFIER_ALT|'o'
# define KEY_DEINTERLACE 'd'
# define KEY_INTF_SHOW 'i'
# define KEY_INTF_HIDE KEY_MODIFIER_SHIFT|'i'
# define KEY_PLAY KEY_UNSET
# define KEY_FASTER '+'
# define KEY_SLOWER '-'
+# define KEY_RATE_NORMAL '='
+# define KEY_RATE_FASTER_FINE ']'
+# define KEY_RATE_SLOWER_FINE '['
# define KEY_NEXT 'n'
# define KEY_PREV 'p'
# define KEY_STOP 's'
# define KEY_SUBTITLE_TRACK 'v'
# define KEY_ASPECT_RATIO 'a'
# define KEY_CROP 'c'
-# define KEY_TOGGLE_SCALING 'o'
+# define KEY_TOGGLE_AUTOSCALE 'o'
+# define KEY_SCALE_UP KEY_MODIFIER_ALT|'o'
+# define KEY_SCALE_DOWN KEY_MODIFIER_SHIFT|KEY_MODIFIER_ALT|'o'
# define KEY_DEINTERLACE 'd'
# define KEY_INTF_SHOW 'i'
# define KEY_INTF_HIDE KEY_MODIFIER_SHIFT|'i'
FASTER_KEY_LONGTEXT, false )
add_key( "key-slower", KEY_SLOWER, NULL, SLOWER_KEY_TEXT,
SLOWER_KEY_LONGTEXT, false )
+ add_key( "key-rate-normal", KEY_RATE_NORMAL, NULL, RATE_NORMAL_KEY_TEXT,
+ RATE_NORMAL_KEY_LONGTEXT, false )
+ add_key( "key-rate-faster-fine", KEY_RATE_FASTER_FINE, NULL, RATE_FASTER_FINE_KEY_TEXT,
+ RATE_FASTER_FINE_KEY_LONGTEXT, false )
+ add_key( "key-rate-slower-fine", KEY_RATE_SLOWER_FINE, NULL, RATE_SLOWER_FINE_KEY_TEXT,
+ RATE_SLOWER_FINE_KEY_LONGTEXT, false )
add_key( "key-next", KEY_NEXT, NULL, NEXT_KEY_TEXT,
NEXT_KEY_LONGTEXT, false )
add_key( "key-prev", KEY_PREV, NULL, PREV_KEY_TEXT,
ASPECT_RATIO_KEY_TEXT, ASPECT_RATIO_KEY_LONGTEXT, false )
add_key( "key-crop", KEY_CROP, NULL,
CROP_KEY_TEXT, CROP_KEY_LONGTEXT, false )
- add_key( "key-toggle-scaling", KEY_TOGGLE_SCALING, NULL,
- TOGGLE_SCALING_KEY_TEXT, TOGGLE_SCALING_KEY_LONGTEXT, false )
+ add_key( "key-toggle-autoscale", KEY_TOGGLE_AUTOSCALE, NULL,
+ TOGGLE_AUTOSCALE_KEY_TEXT, TOGGLE_AUTOSCALE_KEY_LONGTEXT, false )
+ add_key( "key-incr-scalefactor", KEY_SCALE_UP, NULL,
+ SCALE_UP_KEY_TEXT, SCALE_UP_KEY_LONGTEXT, false )
+ add_key( "key-decr-scalefactor", KEY_SCALE_DOWN, NULL,
+ SCALE_DOWN_KEY_TEXT, SCALE_DOWN_KEY_LONGTEXT, false )
add_key( "key-deinterlace", KEY_DEINTERLACE, NULL,
DEINTERLACE_KEY_TEXT, DEINTERLACE_KEY_LONGTEXT, false )
add_key( "key-intf-show", KEY_INTF_SHOW, NULL,
{ "key-next", ACTIONID_NEXT, 0, },
{ "key-faster", ACTIONID_FASTER, 0, },
{ "key-slower", ACTIONID_SLOWER, 0, },
+ { "key-rate-normal", ACTIONID_RATE_NORMAL, 0, },
+ { "key-rate-faster-fine", ACTIONID_RATE_FASTER_FINE, 0, },
+ { "key-rate-slower-fine", ACTIONID_RATE_SLOWER_FINE, 0, },
{ "key-toggle-fullscreen", ACTIONID_TOGGLE_FULLSCREEN, 0, },
{ "key-leave-fullscreen", ACTIONID_LEAVE_FULLSCREEN, 0, },
{ "key-vol-up", ACTIONID_VOL_UP, 0, },
{ "key-menu-down", ACTIONID_MENU_DOWN, 0, },
{ "key-menu-select", ACTIONID_MENU_SELECT, 0, },
{ "key-audiodevice-cycle", ACTIONID_AUDIODEVICE_CYCLE, 0, },
- { "key-toggle-scaling", ACTIONID_TOGGLE_SCALING, 0, },
+ { "key-toggle-autoscale", ACTIONID_TOGGLE_AUTOSCALE, 0, },
+ { "key-incr-scalefactor", ACTIONID_SCALE_UP, 0, },
+ { "key-decr-scalefactor", ACTIONID_SCALE_DOWN, 0, },
{ NULL, 0, 0, }
};
projects / vlc / blobdiff