#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_cpu.h>
-#include <vlc_aout_intf.h>
+#include <vlc_playlist.h>
#include "libvlc.h"
#include "modules/modules.h"
//#define Nothing here, this is just to prevent update-po from being stupid
#include "vlc_keys.h"
#include "vlc_meta.h"
-
-#if defined (WIN32) || defined (__APPLE__)
-static const char *const ppsz_language[] =
-{
- "auto",
- "en",
- "ar",
- "bn",
- "pt_BR",
- "en_GB",
- "el",
- "bg",
- "ca",
- "zh_TW",
- "cs",
- "da",
- "nl",
- "fi",
- "fr",
- "gl",
- "ka",
- "de",
- "he",
- "hr",
- "hu",
- "hy",
- "id",
- "it",
- "ja",
- "ko",
- "lt",
- "mn",
- "ms",
- "nn",
- "kk",
- "km",
- "oc",
- "fa",
- "pl",
- "pt_PT",
- "pa",
- "ro",
- "ru",
- "zh_CN",
- "si",
- "sr",
- "sk",
- "sl",
- "ckb",
- "es",
- "sv",
- "tr",
- "uk",
- "vi",
- "wa",
-};
-
-static const char *const ppsz_language_text[] =
-{
- N_("Auto"),
- "American English",
- "ﻉﺮﺒﻳ",
- "বাংলা",
- "Português Brasileiro",
- "British English",
- "Νέα Ελληνικά",
- "български език",
- "Català",
- "正體中文",
- "Čeština",
- "Dansk",
- "Nederlands",
- "Suomi",
- "Français",
- "Galego",
- "ქართული",
- "Deutsch",
- "עברית",
- "hrvatski",
- "Magyar",
- "հայերեն",
- "Bahasa Indonesia",
- "Italiano",
- "日本語",
- "한국어",
- "lietuvių",
- "Монгол хэл",
- "Melayu",
- "Nynorsk",
- "Қазақ тілі",
- "ភាសាខ្មែរ",
- "Occitan",
- "ﻑﺍﺮﺳی",
- "Polski",
- "Português",
- "ਪੰਜਾਬੀ",
- "Română",
- "Русский",
- "简体中文",
- "සිංහල",
- "српски",
- "Slovensky",
- "slovenščina",
- "کوردیی سۆرانی",
- "Español",
- "Svenska",
- "Türkçe",
- "украї́нська мо́ва",
- "tiếng Việt",
- "Walon",
-};
-#endif
+#include <vlc_aout.h>
static const char *const ppsz_snap_formats[] =
-{ "png", "jpg" };
+{ "png", "jpg", "tiff" };
/*****************************************************************************
* Configuration options for the main program. Each module will also separatly
"This is the verbosity level (0=only errors and " \
"standard messages, 1=warnings, 2=debug).")
-#define VERBOSE_OBJECTS_TEXT N_("Choose which objects should print debug " \
- "message")
-#define VERBOSE_OBJECTS_LONGTEXT N_( \
- "This is a ',' separated string, each object should be prefixed by " \
- "a '+' or a '-' to respectively enable or disable it. The keyword " \
- "'all' refers to all objects. Objects can be referred to by their " \
- "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.")
-
#define QUIET_TEXT N_("Be quiet")
#define QUIET_LONGTEXT N_( \
"Turn off all warning and information messages.")
#define OPEN_LONGTEXT N_( \
"This stream will always be opened at VLC startup." )
-#define LANGUAGE_TEXT N_("Language")
-#define LANGUAGE_LONGTEXT N_( "You can manually select a language for the " \
- "interface. The system language is auto-detected if \"auto\" is " \
- "specified here." )
-
#define COLOR_TEXT N_("Color messages")
#define COLOR_LONGTEXT N_( \
"This enables colorization of the messages sent to the console " \
#define MONO_LONGTEXT N_("This will force a mono audio output.")
#endif
-#define VOLUME_TEXT N_("Default audio volume")
-#define VOLUME_LONGTEXT N_( \
- "You can set the default audio output volume here, in a range from 0 to " \
- "1024.")
+#define GAIN_TEXT N_("Audio gain")
+#define GAIN_LONGTEXT N_( \
+ "This linear gain will be applied to outputted audio.")
#define VOLUME_STEP_TEXT N_("Audio output volume step")
#define VOLUME_STEP_LONGTEXT N_( \
- "The step size of the volume is adjustable using this option, " \
- "in a range from 0 to 1024." )
+ "The step size of the volume is adjustable using this option.")
#define AOUT_VOLUME_STEP 32
#define VOLUME_SAVE_TEXT N_( "Remember the audio volume" )
"The volume can be recorded and automatically restored next time " \
"VLC is used." )
-#define AOUT_RATE_TEXT N_("Audio output frequency (Hz)")
-#define AOUT_RATE_LONGTEXT N_( \
- "You can force the audio output frequency here. Common values are " \
- "0 (undefined), 48000, 44100, 32000, 22050, 16000, 11025, 8000.")
-
#if !defined( __APPLE__ )
#define AOUT_RESAMP_TEXT N_("High quality audio resampling")
#define AOUT_RESAMP_LONGTEXT N_( \
"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 AUDIO_RESAMPLER_TEXT N_("Audio resampler")
+#define AUDIO_RESAMPLER_LONGTEXT N_( \
+ "This selects which plugin to use for audio resampling." )
+
#define MULTICHA_TEXT N_("Audio output channels mode")
#define MULTICHA_LONGTEXT N_( \
"This sets the audio output channels mode that will " \
static const char *const ppsz_force_dolby_descriptions[] = {
N_("Auto"), N_("On"), N_("Off") };
+#define STEREO_MODE_TEXT N_("Stereo audio output mode")
+static const int pi_stereo_mode_values[] = { AOUT_VAR_CHAN_UNSET,
+ AOUT_VAR_CHAN_STEREO, AOUT_VAR_CHAN_RSTEREO,
+ AOUT_VAR_CHAN_LEFT, AOUT_VAR_CHAN_RIGHT, AOUT_VAR_CHAN_DOLBYS
+};
+static const char *const ppsz_stereo_mode_texts[] = { N_("Unset"),
+ N_("Stereo"), N_("Reverse stereo"),
+ N_("Left"), N_("Right"), N_("Dolby Surround")
+};
#define AUDIO_FILTER_TEXT N_("Audio filters")
#define AUDIO_FILTER_LONGTEXT N_( \
"This adds audio post processing filters, to modify " \
"the sound rendering." )
-#define AUDIO_VISUAL_TEXT N_("Audio visualizations ")
+#define AUDIO_VISUAL_TEXT N_("Audio visualizations")
#define AUDIO_VISUAL_LONGTEXT N_( \
"This adds visualization modules (spectrum analyzer, etc.).")
"When several video formats are available, select one whose " \
"resolution is closest to (but not higher than) this setting, " \
"in number of lines. Use this option if you don't have enough CPU " \
- "power or network bandwith to play higher resolutions.")
+ "power or network bandwidth to play higher resolutions.")
static const int pi_prefres[] = { -1, 1080, 720, 576, 360, 240 };
static const char *const ppsz_prefres[] = {
N_("Best available"), N_("Full HD (1080p)"), N_("HD (720p)"),
# if defined(__OpenBSD__)
# define DVD_DEVICE "/dev/cd0c"
# define CD_DEVICE "/dev/cd0c"
+# elif defined(__linux__)
+# define DVD_DEVICE "/dev/dvd1"
+# define CD_DEVICE "/dev/cdrom1"
# else
# define DVD_DEVICE "/dev/dvd"
# define CD_DEVICE "/dev/cdrom"
#define HTTP_CRL_TEXT N_("HTTP/TLS Certificate Revocation List")
#define CRL_LONGTEXT N_( \
- "This file countains an optional CRL to prevent remove clients " \
+ "This file contains an optional CRL to prevent remove clients " \
"from using revoked certificates in TLS sessions.")
#define SOCKS_SERVER_TEXT N_("SOCKS server")
#define SOUT_MUX_CACHING_TEXT N_("Stream output muxer caching (ms)")
#define SOUT_MUX_CACHING_LONGTEXT N_( \
"This allow you to configure the initial caching amount for stream output " \
- " muxer. This value should be set in milliseconds." )
+ "muxer. This value should be set in milliseconds." )
#define PACKETIZER_TEXT N_("Preferred packetizer list")
#define PACKETIZER_LONGTEXT N_( \
* Advanced
****************************************************************************/
-// DEPRECATED
-#define CPU_CAT_LONGTEXT N_( \
- "These options allow you to enable special CPU optimizations. " \
- "You should always leave all these enabled." )
-
// DEPRECATED
#define MISC_CAT_LONGTEXT N_( \
"These options allow you to select default modules. Leave these " \
"alone unless you really know what you are doing." )
-#define MEMCPY_TEXT N_("Memory copy module")
-#define MEMCPY_LONGTEXT N_( \
- "You can select which memory copy module you want to use. By default " \
- "VLC will select the fastest one supported by your hardware.")
-
#define ACCESS_TEXT N_("Access module")
#define ACCESS_LONGTEXT N_( \
"This allows you to force an access module. You can use it if " \
"Log all VLC messages to syslog (UNIX systems)." )
#define ONEINSTANCE_TEXT N_("Allow only one running instance")
-#if defined( WIN32 )
+#if defined( WIN32 ) || defined( __OS2__ )
#define ONEINSTANCE_LONGTEXT N_( \
"Allowing only one running instance of VLC can sometimes be useful, " \
"for example if you associated VLC with some media types and you " \
"don't want a new instance of VLC to be opened each time you " \
- "double-click on a file in the explorer. This option will allow you " \
+ "open a file in your file manager. This option will allow you " \
"to play the file with the already running instance or enqueue it.")
#elif defined( HAVE_DBUS )
#define ONEINSTANCE_LONGTEXT N_( \
#define AUTOSTART_LONGTEXT N_( "Automatically start playing the playlist " \
"content once it's loaded." )
+#define CORK_TEXT N_("Pause on audio communication")
+#define CORK_LONGTEXT N_( \
+ "If pending audio communication is detected, playback will be paused " \
+ "automatically." )
+
#define ML_TEXT N_("Use media library")
#define ML_LONGTEXT N_( \
"The media library is automatically saved and reloaded each time you " \
#define HOTKEY_CAT_LONGTEXT N_( "These settings are the global VLC key " \
"bindings, known as \"hotkeys\"." )
+enum{
+ MOUSEWHEEL_VOLUME,
+ MOUSEWHEEL_POSITION,
+ NO_MOUSEWHEEL,
+};
+
+static const int mouse_wheel_values[] = { 2, 0, 1 };
+static const char *const mouse_wheel_texts[] =
+ { N_("Ignore"), N_("Volume Control"), N_("Position Control") };
+
+#define MOUSE_WHEEL_MODE_TEXT N_("MouseWheel up-down axis Control")
+#define MOUSE_WHEEL_MODE_LONGTEXT N_( \
+ "The MouseWheel up-down (vertical) axis can control volume, position or " \
+ "mousewheel event can be ignored")
#define TOGGLE_FULLSCREEN_KEY_TEXT N_("Fullscreen")
#define TOGGLE_FULLSCREEN_KEY_LONGTEXT N_("Select the hotkey to use to swap fullscreen state.")
#define LEAVE_FULLSCREEN_KEY_TEXT N_("Exit fullscreen")
#define AUDIO_TRACK_KEY_LONGTEXT N_("Cycle through the available audio tracks(languages).")
#define SUBTITLE_TRACK_KEY_TEXT N_("Cycle subtitle track")
#define SUBTITLE_TRACK_KEY_LONGTEXT N_("Cycle through the available subtitle tracks.")
+#define PROGRAM_SID_KEY_TEXT N_("Cycle program Service ID")
+#define PROGRAM_SID_KEY_LONGTEXT N_("Cycle through the available program Service IDs (SIDs).")
#define ASPECT_RATIO_KEY_TEXT N_("Cycle source aspect ratio")
#define ASPECT_RATIO_KEY_LONGTEXT N_("Cycle through a predefined list of source aspect ratios.")
#define CROP_KEY_TEXT N_("Cycle video crop")
#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 DEINTERLACE_KEY_TEXT N_("Toggle deinterlacing")
+#define DEINTERLACE_KEY_LONGTEXT N_("Activate or deactivate deinterlacing.")
+#define DEINTERLACE_MODE_KEY_TEXT N_("Cycle deinterlace modes")
+#define DEINTERLACE_MODE_KEY_LONGTEXT N_("Cycle through available deinterlace modes.")
#define INTF_TOGGLE_FSC_KEY_TEXT N_("Show controller in fullscreen")
#define INTF_SHOW_KEY_TEXT N_("Show interface")
#define INTF_SHOW_KEY_LONGTEXT N_("Raise the interface above all other windows.")
#define INTF_HIDE_KEY_LONGTEXT N_("Lower the interface below all other windows.")
#define INTF_BOSS_KEY_TEXT N_("Boss key")
#define INTF_BOSS_KEY_LONGTEXT N_("Hide the interface and pause playback.")
+#define INTF_POPUP_MENU_KEY_TEXT N_("Context menu")
+#define INTF_POPUP_MENU_KEY_LONGTEXT N_("Show the contextual popup menu.")
#define SNAP_KEY_TEXT N_("Take video snapshot")
#define SNAP_KEY_LONGTEXT N_("Takes a video snapshot and writes it to disk.")
#define WALLPAPER_KEY_LONGTEXT N_( \
"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")
-#define MENU_OFF_KEY_TEXT N_("Do not display OSD menu on video output")
-#define MENU_OFF_KEY_LONGTEXT N_("Do not display OSD menu on top of video output")
-#define MENU_RIGHT_KEY_TEXT N_("Highlight widget on the right")
-#define MENU_RIGHT_KEY_LONGTEXT N_( \
- "Move OSD menu highlight to the widget on the right")
-#define MENU_LEFT_KEY_TEXT N_("Highlight widget on the left")
-#define MENU_LEFT_KEY_LONGTEXT N_( \
- "Move OSD menu highlight to the widget on the left")
-#define MENU_UP_KEY_TEXT N_("Highlight widget on top")
-#define MENU_UP_KEY_LONGTEXT N_( \
- "Move OSD menu highlight to the widget on top")
-#define MENU_DOWN_KEY_TEXT N_("Highlight widget below")
-#define MENU_DOWN_KEY_LONGTEXT N_( \
- "Move OSD menu highlight to the widget below")
-#define MENU_SELECT_KEY_TEXT N_("Select current widget")
-#define MENU_SELECT_KEY_LONGTEXT N_( \
- "Selecting current widget performs the associated action.")
-
#define AUDI_DEVICE_CYCLE_KEY_TEXT N_("Cycle through audio devices")
#define AUDI_DEVICE_CYCLE_KEY_LONGTEXT N_("Cycle through available audio devices")
add_bool( "audio", 1, AUDIO_TEXT, AUDIO_LONGTEXT, false )
change_safe ()
- add_integer_with_range( "volume", AOUT_VOLUME_DEFAULT, 0,
- AOUT_VOLUME_MAX, VOLUME_TEXT,
- VOLUME_LONGTEXT, false )
- add_integer_with_range( "volume-step", AOUT_VOLUME_STEP, 0,
- AOUT_VOLUME_MAX, VOLUME_STEP_TEXT,
- VOLUME_STEP_LONGTEXT, true )
+ add_float( "gain", 1., GAIN_TEXT, GAIN_LONGTEXT, true )
+ change_float_range( 0., 8. )
+ add_obsolete_integer( "volume" ) /* since 2.1.0 */
+ add_integer( "volume-step", AOUT_VOLUME_STEP, VOLUME_STEP_TEXT,
+ VOLUME_STEP_LONGTEXT, true )
+ change_integer_range( 1, AOUT_VOLUME_DEFAULT )
add_bool( "volume-save", true, VOLUME_SAVE_TEXT, VOLUME_SAVE_TEXT, true )
add_obsolete_integer( "aout-rate" ) /* since 2.0.0 */
#if HAVE_FPU && !defined( __APPLE__ )
add_integer( "force-dolby-surround", 0, FORCE_DOLBY_TEXT,
FORCE_DOLBY_LONGTEXT, false )
change_integer_list( pi_force_dolby_values, ppsz_force_dolby_descriptions )
+ add_integer( "stereo-mode", 0, STEREO_MODE_TEXT, STEREO_MODE_TEXT, true )
+ change_integer_list( pi_stereo_mode_values, ppsz_stereo_mode_texts )
add_integer( "audio-desync", 0, DESYNC_TEXT,
DESYNC_LONGTEXT, true )
change_safe ()
+ add_module( "audio-resampler", "audio resampler", NULL,
+ AUDIO_RESAMPLER_TEXT, AUDIO_RESAMPLER_LONGTEXT, true )
+
/* FIXME TODO create a subcat replay gain ? */
add_string( "audio-replay-gain-mode", ppsz_replay_gain_mode[0], AUDIO_REPLAY_GAIN_MODE_TEXT,
AUDIO_REPLAY_GAIN_MODE_LONGTEXT, false )
- change_string_list( ppsz_replay_gain_mode, ppsz_replay_gain_mode_text, 0 )
+ change_string_list( ppsz_replay_gain_mode, ppsz_replay_gain_mode_text )
add_float( "audio-replay-gain-preamp", 0.0,
AUDIO_REPLAY_GAIN_PREAMP_TEXT, AUDIO_REPLAY_GAIN_PREAMP_LONGTEXT, false )
add_float( "audio-replay-gain-default", -7.0,
true )
change_short('A')
set_subcategory( SUBCAT_AUDIO_AFILTER )
- add_module_list_cat( "audio-filter", SUBCAT_AUDIO_AFILTER, NULL,
- AUDIO_FILTER_TEXT, AUDIO_FILTER_LONGTEXT, false )
+ add_module_list( "audio-filter", "audio filter", NULL,
+ AUDIO_FILTER_TEXT, AUDIO_FILTER_LONGTEXT, false )
set_subcategory( SUBCAT_AUDIO_VISUAL )
add_module( "audio-visual", "visualization2", NULL,AUDIO_VISUAL_TEXT,
AUDIO_VISUAL_LONGTEXT, false )
change_safe ()
add_bool( "grayscale", 0, GRAYSCALE_TEXT,
GRAYSCALE_LONGTEXT, true )
-#if defined (HAVE_MAEMO)
-# define FULLSCREEN_DEFAULT true
-#else
-# define FULLSCREEN_DEFAULT false
-#endif
- add_bool( "fullscreen", FULLSCREEN_DEFAULT, FULLSCREEN_TEXT,
- FULLSCREEN_LONGTEXT, false )
+ add_bool( "fullscreen", false, FULLSCREEN_TEXT, FULLSCREEN_LONGTEXT, false )
change_short('f')
change_safe ()
add_bool( "embedded-video", 1, EMBEDDED_TEXT, EMBEDDED_LONGTEXT,
SNAP_PREFIX_LONGTEXT, false )
add_string( "snapshot-format", "png", SNAP_FORMAT_TEXT,
SNAP_FORMAT_LONGTEXT, false )
- change_string_list( ppsz_snap_formats, NULL, 0 )
+ change_string_list( ppsz_snap_formats, ppsz_snap_formats )
add_bool( "snapshot-preview", true, SNAP_PREVIEW_TEXT,
SNAP_PREVIEW_LONGTEXT, false )
add_bool( "snapshot-sequential", false, SNAP_SEQUENTIAL_TEXT,
change_safe()
add_string( "deinterlace-mode", "blend",
DEINTERLACE_MODE_TEXT, DEINTERLACE_MODE_LONGTEXT, false )
- change_string_list( ppsz_deinterlace_mode, ppsz_deinterlace_mode_text, 0 )
+ change_string_list( ppsz_deinterlace_mode, ppsz_deinterlace_mode_text )
change_safe()
set_subcategory( SUBCAT_VIDEO_VOUT )
set_subcategory( SUBCAT_VIDEO_VFILTER )
add_module_list_cat( "video-filter", SUBCAT_VIDEO_VFILTER, NULL,
VIDEO_FILTER_TEXT, VIDEO_FILTER_LONGTEXT, false )
- add_module_list_cat( "video-splitter", SUBCAT_VIDEO_VFILTER, NULL,
- VIDEO_SPLITTER_TEXT, VIDEO_SPLITTER_LONGTEXT, false )
+ add_module_list( "video-splitter", "video splitter", NULL,
+ VIDEO_SPLITTER_TEXT, VIDEO_SPLITTER_LONGTEXT, false )
add_obsolete_string( "vout-filter" ) /* since 2.0.0 */
#if 0
add_string( "pixel-ratio", "1", PIXEL_RATIO_TEXT, PIXEL_RATIO_TEXT )
add_integer( "sub-margin", 0, SUB_MARGIN_TEXT,
SUB_MARGIN_LONGTEXT, true )
set_section( N_( "Overlays" ) , NULL )
- add_module_list_cat( "sub-source", SUBCAT_VIDEO_SUBPIC, NULL,
- SUB_SOURCE_TEXT, SUB_SOURCE_LONGTEXT, false )
- add_module_list_cat( "sub-filter", SUBCAT_VIDEO_SUBPIC, NULL,
- SUB_FILTER_TEXT, SUB_FILTER_LONGTEXT, false )
+ add_module_list( "sub-source", "sub source", NULL,
+ SUB_SOURCE_TEXT, SUB_SOURCE_LONGTEXT, false )
+ add_module_list( "sub-filter", "sub filter", NULL,
+ SUB_FILTER_TEXT, SUB_FILTER_LONGTEXT, false )
/* Input options */
set_category( CAT_INPUT )
add_obsolete_integer( "linsys-hdsdi-caching" ) /* 2.0.0 */
add_obsolete_integer( "linsys-sdi-caching" ) /* 2.0.0 */
add_obsolete_integer( "oss-caching" ) /* 2.0.0 */
- add_obsolete_integer( "pvr-caching" ) /* 2.0.0 */
add_obsolete_integer( "screen-caching" ) /* 2.0.0 */
add_obsolete_integer( "v4l2-caching" ) /* 2.0.0 */
add_integer( "disc-caching", DEFAULT_PTS_DELAY / 1000,
add_obsolete_bool( "prefer-system-codecs" )
set_subcategory( SUBCAT_INPUT_STREAM_FILTER )
- add_module_list_cat( "stream-filter", SUBCAT_INPUT_STREAM_FILTER, NULL,
- STREAM_FILTER_TEXT, STREAM_FILTER_LONGTEXT, false )
+ add_module_list( "stream-filter", "stream_filter", NULL,
+ STREAM_FILTER_TEXT, STREAM_FILTER_LONGTEXT, false )
/* Stream output options */
set_subcategory( SUBCAT_SOUT_STREAM )
+ add_integer( "sap-interval", 5, ANN_SAPINTV_TEXT,
+ ANN_SAPINTV_LONGTEXT, true )
+
set_subcategory( SUBCAT_SOUT_MUX )
add_module( "mux", "sout mux", NULL, MUX_TEXT, MUX_LONGTEXT, true )
set_subcategory( SUBCAT_SOUT_ACO )
add_module( "packetizer", "packetizer", NULL,
PACKETIZER_TEXT, PACKETIZER_LONGTEXT, true )
- set_subcategory( SUBCAT_SOUT_SAP )
- add_integer( "sap-interval", 5, ANN_SAPINTV_TEXT,
- ANN_SAPINTV_LONGTEXT, true )
-
set_subcategory( SUBCAT_SOUT_VOD )
/* CPU options */
set_category( CAT_ADVANCED )
- set_subcategory( SUBCAT_ADVANCED_CPU )
- add_category_hint( N_("CPU"), CPU_CAT_LONGTEXT, true )
add_obsolete_bool( "fpu" )
#if defined( __i386__ ) || defined( __x86_64__ )
add_obsolete_bool( "mmx" ) /* since 2.0.0 */
set_subcategory( SUBCAT_ADVANCED_MISC )
set_section( N_("Special modules"), NULL )
add_category_hint( N_("Miscellaneous"), MISC_CAT_LONGTEXT, true )
- add_module( "memcpy", "memcpy", NULL, MEMCPY_TEXT, MEMCPY_LONGTEXT, true )
add_module( "vod-server", "vod server", NULL, VOD_SERVER_TEXT,
VOD_SERVER_LONGTEXT, true )
INHIBIT_LONGTEXT, true )
#endif
-#if defined(WIN32) || defined(HAVE_DBUS)
- add_bool( "one-instance", 0, ONEINSTANCE_TEXT,
- ONEINSTANCE_LONGTEXT, true )
- add_bool( "started-from-file", 0, STARTEDFROMFILE_TEXT,
- STARTEDFROMFILE_LONGTEXT, true )
- change_volatile ()
- add_bool( "one-instance-when-started-from-file", 1,
- ONEINSTANCEWHENSTARTEDFROMFILE_TEXT,
- ONEINSTANCEWHENSTARTEDFROMFILE_LONGTEXT, true )
- add_bool( "playlist-enqueue", 0, PLAYLISTENQUEUE_TEXT,
- PLAYLISTENQUEUE_LONGTEXT, true )
-#endif
-
#if defined(WIN32) || defined(__OS2__)
add_bool( "high-priority", 0, HPRIORITY_TEXT,
HPRIORITY_LONGTEXT, false )
#endif
+#define CLOCK_SOURCE_TEXT N_("Clock source")
+#ifdef WIN32
+ add_string( "clock-source", NULL, CLOCK_SOURCE_TEXT, CLOCK_SOURCE_TEXT, true )
+ change_string_cb( EnumClockSource )
+#endif
+
/* Playlist options */
set_category( CAT_PLAYLIST )
set_subcategory( SUBCAT_PLAYLIST_GENERAL )
change_safe()
add_bool( "playlist-autostart", true,
AUTOSTART_TEXT, AUTOSTART_LONGTEXT, false )
+ add_bool( "playlist-cork", true, CORK_TEXT, CORK_LONGTEXT, false )
+#if defined(WIN32) || defined(HAVE_DBUS) || defined(__OS2__)
+ add_bool( "one-instance", 0, ONEINSTANCE_TEXT,
+ ONEINSTANCE_LONGTEXT, true )
+ add_bool( "started-from-file", 0, STARTEDFROMFILE_TEXT,
+ STARTEDFROMFILE_LONGTEXT, true )
+ change_volatile ()
+ add_bool( "one-instance-when-started-from-file", 1,
+ ONEINSTANCEWHENSTARTEDFROMFILE_TEXT,
+ ONEINSTANCEWHENSTARTEDFROMFILE_LONGTEXT, true )
+ add_bool( "playlist-enqueue", 0, PLAYLISTENQUEUE_TEXT,
+ PLAYLISTENQUEUE_LONGTEXT, true )
+#endif
add_bool( "media-library", 0, ML_TEXT, ML_LONGTEXT, false )
#if defined( MEDIA_LIBRARY )
add_bool( "load-media-library-on-startup", 1, LOAD_ML_TEXT,
add_integer( "verbose", 0, VERBOSE_TEXT, VERBOSE_LONGTEXT,
false )
change_short('v')
- add_string( "verbose-objects", 0, VERBOSE_OBJECTS_TEXT, VERBOSE_OBJECTS_LONGTEXT,
- false )
+ add_obsolete_string( "verbose-objects" ) /* since 2.1.0 */
add_bool( "quiet", 0, QUIET_TEXT, QUIET_LONGTEXT, false )
change_short('q')
#endif
#if defined (WIN32) || defined (__APPLE__)
- add_string( "language", "auto", LANGUAGE_TEXT, LANGUAGE_LONGTEXT,
- false )
- change_string_list( ppsz_language, ppsz_language_text, 0 )
+ add_obsolete_string( "language" ) /* since 2.1.0 */
#endif
add_bool( "color", true, COLOR_TEXT, COLOR_LONGTEXT, true )
set_subcategory( SUBCAT_INTERFACE_HOTKEYS )
add_category_hint( N_("Hot keys"), HOTKEY_CAT_LONGTEXT , false )
+ add_integer( "hotkeys-mousewheel-mode", 0, MOUSE_WHEEL_MODE_TEXT,
+ MOUSE_WHEEL_MODE_LONGTEXT, false )
+ change_integer_list( mouse_wheel_values, mouse_wheel_texts )
+
#if defined(__APPLE__)
/* Don't use the following combo's */
# define KEY_AUDIODELAY_DOWN "f"
# define KEY_AUDIO_TRACK "l"
# define KEY_SUBTITLE_TRACK "s"
+# define KEY_PROGRAM_SID "x"
# define KEY_ASPECT_RATIO "a"
# define KEY_CROP "c"
# define KEY_TOGGLE_AUTOSCALE "o"
# define KEY_SCALE_UP "Alt+o"
# define KEY_SCALE_DOWN "Shift+Alt+o"
# define KEY_DEINTERLACE "d"
+# define KEY_DEINTERLACE_MODE "Shift+d"
# define KEY_INTF_TOGGLE_FSC "i"
# define KEY_INTF_BOSS NULL
+# define KEY_INTF_POPUP_MENU "Menu"
# define KEY_DISC_MENU "Ctrl+m"
# define KEY_TITLE_PREV "Ctrl+p"
# define KEY_TITLE_NEXT "Ctrl+n"
# define KEY_PLAY_BOOKMARK10 NULL
# define KEY_RECORD "Command+Shift+r"
# define KEY_WALLPAPER "w"
-
-# define KEY_MENU_ON "Alt+m"
-# define KEY_MENU_OFF "Alt+Shift+m"
-# define KEY_MENU_RIGHT "Alt+Shift+Right"
-# define KEY_MENU_LEFT "Alt+Shift+Left"
-# define KEY_MENU_UP "Alt+Shift+Up"
-# define KEY_MENU_DOWN "Alt+Shift+Down"
-# define KEY_MENU_SELECT "Alt+Shift+Enter"
# define KEY_AUDIODEVICE_CYCLE "Shift+a"
#else /* Non Mac OS X */
*/
# define KEY_TOGGLE_FULLSCREEN "f"
# define KEY_LEAVE_FULLSCREEN "Esc"
-# define KEY_PLAY_PAUSE "Space"
-# define KEY_PAUSE NULL
-# define KEY_PLAY NULL
+# define KEY_PLAY_PAUSE "Space\tMedia Play Pause"
+# define KEY_PAUSE "Browser Stop"
+# define KEY_PLAY "Browser Refresh"
# 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_NEXT "n\tMedia Next Track"
+# define KEY_PREV "p\tMedia Prev Track"
+# define KEY_STOP "s\tMedia Stop"
# define KEY_POSITION "t"
# define KEY_JUMP_MEXTRASHORT "Shift+Left"
# define KEY_JUMP_PEXTRASHORT "Shift+Right"
# define KEY_JUMP_PMEDIUM "Ctrl+Right"
# define KEY_JUMP_MLONG "Ctrl+Alt+Left"
# define KEY_JUMP_PLONG "Ctrl+Alt+Right"
-# define KEY_FRAME_NEXT "e"
+# define KEY_FRAME_NEXT "e\tBrowser Next"
# define KEY_NAV_ACTIVATE "Enter"
# define KEY_NAV_UP "Up"
# define KEY_NAV_DOWN "Down"
# define KEY_NAV_LEFT "Left"
# define KEY_NAV_RIGHT "Right"
# define KEY_QUIT "Ctrl+q"
-# define KEY_VOL_UP "Ctrl+Up"
-# define KEY_VOL_DOWN "Ctrl+Down"
-# define KEY_VOL_MUTE "m"
+# define KEY_VOL_UP "Ctrl+Up\tVolume Up"
+# define KEY_VOL_DOWN "Ctrl+Down\tVolume Down"
+# define KEY_VOL_MUTE "m\tVolume Mute"
# define KEY_SUBDELAY_UP "h"
# define KEY_SUBDELAY_DOWN "g"
# define KEY_SUBPOS_DOWN NULL
# define KEY_AUDIO_TRACK "b"
# define KEY_SUBTITLE_TRACK "v"
+# define KEY_PROGRAM_SID "x"
# define KEY_ASPECT_RATIO "a"
# define KEY_CROP "c"
# define KEY_TOGGLE_AUTOSCALE "o"
# define KEY_SCALE_UP "Alt+o"
# define KEY_SCALE_DOWN "Alt+Shift+o"
# define KEY_DEINTERLACE "d"
+# define KEY_DEINTERLACE_MODE "Shift+d"
# define KEY_INTF_TOGGLE_FSC "i"
# define KEY_INTF_BOSS NULL
+# define KEY_INTF_POPUP_MENU "Menu"
# define KEY_DISC_MENU "Shift+m"
# define KEY_TITLE_PREV "Shift+o"
# define KEY_TITLE_NEXT "Shift+b"
# define KEY_PLAY_BOOKMARK8 "F8"
# define KEY_PLAY_BOOKMARK9 "F9"
# define KEY_PLAY_BOOKMARK10 "F10"
-
-/* OSD menu */
-# define KEY_MENU_ON "Alt+Shift+m"
-# define KEY_MENU_OFF "Ctrl+Alt+m"
-# define KEY_MENU_RIGHT "Alt+Shift+Right"
-# define KEY_MENU_LEFT "Alt+Shift+Left"
-# define KEY_MENU_UP "Alt+Shift+Up"
-# define KEY_MENU_DOWN "Alt+Shift+Down"
-# define KEY_MENU_SELECT "Alt+Shift+Enter"
#endif
add_key( "key-toggle-fullscreen", KEY_TOGGLE_FULLSCREEN, TOGGLE_FULLSCREEN_KEY_TEXT,
AUDI_DEVICE_CYCLE_KEY_LONGTEXT, false )
add_key( "key-subtitle-track", KEY_SUBTITLE_TRACK,
SUBTITLE_TRACK_KEY_TEXT, SUBTITLE_TRACK_KEY_LONGTEXT, false )
+ add_key( "key-program-sid", KEY_PROGRAM_SID,
+ PROGRAM_SID_KEY_TEXT, PROGRAM_SID_KEY_LONGTEXT, false )
add_key( "key-aspect-ratio", KEY_ASPECT_RATIO,
ASPECT_RATIO_KEY_TEXT, ASPECT_RATIO_KEY_LONGTEXT, false )
add_key( "key-crop", KEY_CROP,
SCALE_DOWN_KEY_TEXT, SCALE_DOWN_KEY_LONGTEXT, false )
add_key( "key-deinterlace", KEY_DEINTERLACE,
DEINTERLACE_KEY_TEXT, DEINTERLACE_KEY_LONGTEXT, false )
+ add_key( "key-deinterlace-mode", KEY_DEINTERLACE_MODE,
+ DEINTERLACE_MODE_KEY_TEXT, DEINTERLACE_MODE_KEY_LONGTEXT, false )
add_key( "key-intf-show", KEY_INTF_TOGGLE_FSC,
INTF_TOGGLE_FSC_KEY_TEXT, INTF_TOGGLE_FSC_KEY_TEXT, false )
add_obsolete_inner( "key-intf-hide", CONFIG_ITEM_KEY )
add_key( "key-intf-boss", KEY_INTF_BOSS,
INTF_BOSS_KEY_TEXT, INTF_BOSS_KEY_LONGTEXT, true )
+ add_key( "key-intf-popup-menu", KEY_INTF_POPUP_MENU,
+ INTF_POPUP_MENU_KEY_TEXT, INTF_POPUP_MENU_KEY_LONGTEXT, true )
add_key( "key-snapshot", KEY_SNAPSHOT,
SNAP_KEY_TEXT, SNAP_KEY_LONGTEXT, true )
add_key( "key-record", KEY_RECORD,
add_key( "key-wallpaper", KEY_WALLPAPER, WALLPAPER_KEY_TEXT,
WALLPAPER_KEY_LONGTEXT, false )
- add_key( "key-menu-on", KEY_MENU_ON,
- MENU_ON_KEY_TEXT, MENU_ON_KEY_LONGTEXT, true )
- add_key( "key-menu-off", KEY_MENU_OFF,
- MENU_OFF_KEY_TEXT, MENU_OFF_KEY_LONGTEXT, true )
- add_key( "key-menu-right", KEY_MENU_RIGHT,
- MENU_RIGHT_KEY_TEXT, MENU_RIGHT_KEY_LONGTEXT, true )
- add_key( "key-menu-left", KEY_MENU_LEFT,
- MENU_LEFT_KEY_TEXT, MENU_LEFT_KEY_LONGTEXT, true )
- add_key( "key-menu-up", KEY_MENU_UP,
- MENU_UP_KEY_TEXT, MENU_UP_KEY_LONGTEXT, true )
- add_key( "key-menu-down", KEY_MENU_DOWN,
- MENU_DOWN_KEY_TEXT, MENU_DOWN_KEY_LONGTEXT, true )
- add_key( "key-menu-select", KEY_MENU_SELECT,
- MENU_SELECT_KEY_TEXT, MENU_SELECT_KEY_LONGTEXT, true )
-
add_key( "key-crop-top", KEY_CROP_TOP,
CROP_TOP_KEY_TEXT, CROP_TOP_KEY_LONGTEXT, true )
add_key( "key-uncrop-top", KEY_UNCROP_TOP,