/*****************************************************************************
- * libvlc-module.c: Options for the main (libvlc itself) module
+ * libvlc-module.c: Options for the core (libvlc itself) module
*****************************************************************************
* Copyright (C) 1998-2009 VLC authors and VideoLAN
* $Id$
*****************************************************************************/
// Pretend we are a builtin module
-#define MODULE_NAME main
-#define MODULE_PATH main
-
+#define MODULE_NAME core
#ifdef HAVE_CONFIG_H
# include "config.h"
{ "png", "jpg", "tiff" };
/*****************************************************************************
- * Configuration options for the main program. Each module will also separatly
+ * Configuration options for the core module. Each module will also separatly
* define its own configuration options.
* Look into configuration.h if you need to know more about the following
* macros.
# define DVD_DEVICE "/dev/cd0c"
# define CD_DEVICE "/dev/cd0c"
# elif defined(__linux__)
-# define DVD_DEVICE "/dev/dvd1"
-# define CD_DEVICE "/dev/cdrom1"
+# define DVD_DEVICE "/dev/sr0"
+# define CD_DEVICE "/dev/sr0"
# else
# define DVD_DEVICE "/dev/dvd"
# define CD_DEVICE "/dev/cdrom"
#define HTTP_CERT_TEXT N_("HTTP/TLS server certificate")
#define CERT_LONGTEXT N_( \
- "This X.509 certicate file (PEM format) is used for server-side TLS." )
+ "This X.509 certicate file (PEM format) is used for server-side TLS. " \
+ "On OS X, the string is used as a label to search the certificate in the keychain." )
#define HTTP_KEY_TEXT N_("HTTP/TLS server private key")
#define KEY_LONGTEXT N_( \
"This option is useful if you want to lower the latency when " \
"reading a stream")
-#define PLUGIN_PATH_LONGTEXT N_( \
- "Additional path for VLC to look for its modules. You can add " \
- "several paths by concatenating them using \" PATH_SEP \" as separator")
-
#define VLM_CONF_TEXT N_("VLM configuration file")
#define VLM_CONF_LONGTEXT N_( \
"Read a VLM configuration file as soon as VLM is started." )
"Automatically preparse files added to the playlist " \
"(to retrieve some metadata)." )
-#define ALBUM_ART_TEXT N_( "Album art policy" )
-#define ALBUM_ART_LONGTEXT N_( \
- "Choose how album art will be downloaded." )
-
-static const int pi_albumart_values[] = { ALBUM_ART_WHEN_ASKED,
- ALBUM_ART_WHEN_PLAYED,
- ALBUM_ART_ALL };
-static const char *const ppsz_albumart_descriptions[] =
- { N_("Manual download only"),
- N_("When track starts playing"),
- N_("As soon as track is added") };
+#define METADATA_NETWORK_TEXT N_( "Allow metadata network access" )
#define SD_TEXT N_( "Services discovery modules")
#define SD_LONGTEXT N_( \
"The media library is automatically saved and reloaded each time you " \
"start VLC." )
-#define LOAD_ML_TEXT N_( "Load Media Library" )
-#define LOAD_ML_LONGTEXT N_( \
- "Enable this option to load the SQL-based Media Library at VLC startup" )
-
#define PLTREE_TEXT N_("Display playlist tree")
#define PLTREE_LONGTEXT N_( \
"The playlist can use a tree to categorize some items, like the " \
#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 SUBTITLE_TOGGLE_KEY_TEXT N_("Toggle subtitles")
+#define SUBTITLE_TOGGLE_KEY_LONGTEXT N_("Toggle subtitle track visibility.")
#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")
set_section( N_("On Screen Display") , NULL )
add_category_hint( N_("Subpictures"), SUB_CAT_LONGTEXT , false )
- add_bool( "spu", 1, SPU_TEXT, SPU_LONGTEXT, true )
+ add_bool( "spu", 1, SPU_TEXT, SPU_LONGTEXT, false )
change_safe ()
add_bool( "osd", 1, OSD_TEXT, OSD_LONGTEXT, false )
add_module( "text-renderer", "text renderer", NULL, TEXTRENDERER_TEXT,
add_module( "access", "access", NULL, ACCESS_TEXT, ACCESS_LONGTEXT, true )
set_subcategory( SUBCAT_INPUT_DEMUX )
- add_module( "demux", "demux", NULL, DEMUX_TEXT, DEMUX_LONGTEXT, true )
+ add_module( "demux", "demux", "any", DEMUX_TEXT, DEMUX_LONGTEXT, true )
set_subcategory( SUBCAT_INPUT_VCODEC )
set_subcategory( SUBCAT_INPUT_ACODEC )
set_subcategory( SUBCAT_INPUT_SCODEC )
SOUT_DISPLAY_LONGTEXT, true )
add_bool( "sout-keep", false, SOUT_KEEP_TEXT,
SOUT_KEEP_LONGTEXT, true )
- add_bool( "sout-all", 0, SOUT_ALL_TEXT,
+ add_bool( "sout-all", true, SOUT_ALL_TEXT,
SOUT_ALL_LONGTEXT, true )
add_bool( "sout-audio", 1, SOUT_AUDIO_TEXT,
SOUT_AUDIO_LONGTEXT, true )
add_bool( "auto-preparse", true, PREPARSE_TEXT,
PREPARSE_LONGTEXT, false )
- add_integer( "album-art", ALBUM_ART_WHEN_ASKED, ALBUM_ART_TEXT,
- ALBUM_ART_LONGTEXT, false )
- change_integer_list( pi_albumart_values,
- ppsz_albumart_descriptions )
+ add_obsolete_integer( "album-art" )
+ add_bool( "metadata-network-access", false, METADATA_NETWORK_TEXT,
+ METADATA_NETWORK_TEXT, false )
set_subcategory( SUBCAT_PLAYLIST_SD )
add_string( "services-discovery", "", SD_TEXT, SD_LONGTEXT, true )
add_bool( "interact", true, INTERACTION_TEXT,
INTERACTION_LONGTEXT, false )
- add_bool ( "stats", true, STATS_TEXT, STATS_LONGTEXT, true )
+ add_bool ( "stats", false, STATS_TEXT, STATS_LONGTEXT, true )
set_subcategory( SUBCAT_INTERFACE_MAIN )
add_module_cat( "intf", SUBCAT_INTERFACE_MAIN, NULL, INTF_TEXT,
# define KEY_TOGGLE_FULLSCREEN "Command+f"
# define KEY_LEAVE_FULLSCREEN "Esc"
# define KEY_PLAY_PAUSE "Space"
-# define KEY_PAUSE NULL
+# define KEY_SIMPLE_PAUSE NULL
# define KEY_PLAY NULL
# define KEY_FASTER "Command+="
# define KEY_SLOWER "Command+-"
# define KEY_AUDIODELAY_DOWN "f"
# define KEY_AUDIO_TRACK "l"
# define KEY_SUBTITLE_TRACK "s"
+# define KEY_SUBTITLE_TOGGLE "Shift+s"
# define KEY_PROGRAM_SID_NEXT "x"
# define KEY_PROGRAM_SID_PREV "Shift+x"
# define KEY_ASPECT_RATIO "a"
# define KEY_PLAY_BOOKMARK9 NULL
# define KEY_PLAY_BOOKMARK10 NULL
# define KEY_RECORD "Command+Shift+r"
-# define KEY_WALLPAPER "w"
+# define KEY_WALLPAPER NULL
# define KEY_AUDIODEVICE_CYCLE "Shift+a"
# define KEY_PLAY_CLEAR NULL
*/
# define KEY_TOGGLE_FULLSCREEN "f"
# define KEY_LEAVE_FULLSCREEN "Esc"
-# define KEY_PLAY_PAUSE "Space\tMedia Play Pause"
-# define KEY_PAUSE "Browser Stop"
+# define KEY_SIMPLE_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 "["
+#ifdef _WIN32
+# define KEY_PLAY_PAUSE "Space"
+# define KEY_NEXT "n"
+# define KEY_PREV "p"
+# define KEY_STOP "s"
+#else
+# define KEY_PLAY_PAUSE "Space\tMedia Play Pause"
# define KEY_NEXT "n\tMedia Next Track"
# define KEY_PREV "p\tMedia Prev Track"
# define KEY_STOP "s\tMedia Stop"
+#endif
# 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\tBrowser Next"
# define KEY_NAV_ACTIVATE "Enter"
# define KEY_NAV_UP "Up"
# define KEY_NAV_DOWN "Down"
#ifdef _WIN32 /* On Windows, people expect volume keys to control the master */
# define KEY_VOL_UP "Ctrl+Up"
# define KEY_VOL_DOWN "Ctrl+Down"
+# define KEY_VOL_MUTE "m"
+# define KEY_FRAME_NEXT "e"
#else
# 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_FRAME_NEXT "e\tBrowser Next"
#endif
-# 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_SUBTITLE_TOGGLE "Shift+v"
# define KEY_PROGRAM_SID_NEXT "x"
# define KEY_PROGRAM_SID_PREV "Shift+x"
# define KEY_ASPECT_RATIO "a"
LEAVE_FULLSCREEN_KEY_LONGTEXT, false )
add_key( "key-play-pause", KEY_PLAY_PAUSE, PLAY_PAUSE_KEY_TEXT,
PLAY_PAUSE_KEY_LONGTEXT, false )
- add_key( "key-pause", KEY_PAUSE, PAUSE_KEY_TEXT,
+ add_key( "key-pause", KEY_SIMPLE_PAUSE, PAUSE_KEY_TEXT,
PAUSE_KEY_LONGTEXT, true )
add_key( "key-play", KEY_PLAY, PLAY_KEY_TEXT,
PLAY_KEY_LONGTEXT, true )
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-subtitle-toggle", KEY_SUBTITLE_TOGGLE,
+ SUBTITLE_TOGGLE_KEY_TEXT, SUBTITLE_TOGGLE_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,
/* Usage (mainly useful for cmd line stuff) */
/* add_usage_hint( PLAYLIST_USAGE ) */
- set_description( N_("main program") )
+ set_description( N_("core program") )
vlc_module_end ()
/*****************************************************************************
projects / vlc / blobdiff