#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.")
-#define AOUT_VOLUME_STEP 32
+#define AOUT_VOLUME_STEP 13
#define VOLUME_SAVE_TEXT N_( "Remember the audio volume" )
#define VOLUME_SAVE_LONGTEXT N_( \
"The volume can be recorded and automatically restored next time " \
"VLC is used." )
-#if !defined( __APPLE__ )
-#define AOUT_RESAMP_TEXT N_("High quality audio resampling")
-#define AOUT_RESAMP_LONGTEXT N_( \
- "This uses a high quality audio resampling algorithm. High quality " \
- "audio resampling can be processor intensive so you can " \
- "disable it and a cheaper resampling algorithm will be used instead.")
-#endif
-
#define DESYNC_TEXT N_("Audio desynchronization compensation")
#define DESYNC_LONGTEXT N_( \
"This delays the audio output. The delay must be given in milliseconds. " \
"Stream number of the audio track to use " \
"(from 0 to n).")
-#define INPUT_SUBTRACK_TEXT N_("Subtitles track")
+#define INPUT_SUBTRACK_TEXT N_("Subtitle track")
#define INPUT_SUBTRACK_LONGTEXT N_( \
"Stream number of the subtitle track to use " \
"(from 0 to n).")
#define INPUT_AUDIOTRACK_ID_LONGTEXT N_( \
"Stream ID of the audio track to use.")
-#define INPUT_SUBTRACK_ID_TEXT N_("Subtitles track ID")
+#define INPUT_SUBTRACK_ID_TEXT N_("Subtitle track ID")
#define INPUT_SUBTRACK_ID_LONGTEXT N_( \
"Stream ID of the subtitle track to use.")
#define SUB_FILTER_TEXT N_("Subpictures filter module")
#define SUB_FILTER_LONGTEXT N_( \
"This adds so-called \"subpicture filters\". These filter subpictures " \
- "created by subtitles decoders or other subpictures sources." )
+ "created by subtitle decoders or other subpictures sources." )
#define SUB_AUTO_TEXT N_("Autodetect subtitle files")
#define SUB_AUTO_LONGTEXT N_( \
# 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 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 PROGRAM_SID_NEXT_KEY_TEXT N_("Cycle next program Service ID")
+#define PROGRAM_SID_NEXT_KEY_LONGTEXT N_("Cycle through the available next program Service IDs (SIDs).")
+#define PROGRAM_SID_PREV_KEY_TEXT N_("Cycle previous program Service ID")
+#define PROGRAM_SID_PREV_KEY_LONGTEXT N_("Cycle through the available previous 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 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.")
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_bool( "hq-resampling", 1, AOUT_RESAMP_TEXT,
- AOUT_RESAMP_LONGTEXT, true )
-#endif
+ add_obsolete_bool( "hq-resampling" ) /* since 1.1.8 */
add_bool( "spdif", 0, SPDIF_TEXT, SPDIF_LONGTEXT, false )
add_integer( "force-dolby-surround", 0, FORCE_DOLBY_TEXT,
FORCE_DOLBY_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,
+ add_module( "audio-visual", "visualization2", "none", AUDIO_VISUAL_TEXT,
AUDIO_VISUAL_LONGTEXT, false )
/* Video options */
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,
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,
- LOAD_ML_LONGTEXT, false )
-#endif
add_bool( "playlist-tree", 0, PLTREE_TEXT, PLTREE_LONGTEXT, false )
add_string( "open", "", OPEN_TEXT, OPEN_LONGTEXT, false )
add_integer( "verbose", 0, VERBOSE_TEXT, VERBOSE_LONGTEXT,
false )
change_short('v')
+ change_volatile ()
add_obsolete_string( "verbose-objects" ) /* since 2.1.0 */
add_bool( "quiet", 0, QUIET_TEXT, QUIET_LONGTEXT, false )
change_short('q')
+ change_volatile ()
#if !defined(WIN32) && !defined(__OS2__)
add_bool( "daemon", 0, DAEMON_TEXT, DAEMON_LONGTEXT, true )
#endif
add_bool( "color", true, COLOR_TEXT, COLOR_LONGTEXT, true )
+ change_volatile ()
add_bool( "advanced", false, ADVANCED_TEXT, ADVANCED_LONGTEXT,
false )
add_bool( "interact", true, INTERACTION_TEXT,
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_PROGRAM_SID_NEXT "x"
+# define KEY_PROGRAM_SID_PREV "Shift+x"
# define KEY_ASPECT_RATIO "a"
# define KEY_CROP "c"
# define KEY_TOGGLE_AUTOSCALE "o"
# 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_AUDIO_TRACK "b"
# define KEY_SUBTITLE_TRACK "v"
-# define KEY_PROGRAM_SID "x"
+# define KEY_PROGRAM_SID_NEXT "x"
+# define KEY_PROGRAM_SID_PREV "Shift+x"
# define KEY_ASPECT_RATIO "a"
# define KEY_CROP "c"
# define KEY_TOGGLE_AUTOSCALE "o"
# 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"
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-program-sid-next", KEY_PROGRAM_SID_NEXT,
+ PROGRAM_SID_NEXT_KEY_TEXT, PROGRAM_SID_NEXT_KEY_LONGTEXT, false )
+ add_key( "key-program-sid-prev", KEY_PROGRAM_SID_PREV,
+ PROGRAM_SID_PREV_KEY_TEXT, PROGRAM_SID_PREV_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,
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,