/*****************************************************************************
* libvlc-module.c: Options for the main (libvlc itself) module
*****************************************************************************
- * Copyright (C) 1998-2009 the VideoLAN team
+ * Copyright (C) 1998-2009 VLC authors and VideoLAN
* $Id$
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Gildas Bazin <gbazin@videolan.org>
* Jean-Paul Saman <jpsaman #_at_# m2x.nl>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
// Pretend we are a builtin module
#define RTSP_PORT_TEXT N_( "RTSP server port" )
#define RTSP_PORT_LONGTEXT N_( \
- "The HTTPS server will listen on this TCP port. " \
+ "The RTSP server will listen on this TCP port. " \
"The standard RTSP port number is 554. " \
"However allocation of port numbers below 1025 is usually restricted " \
"by the operating system." )
#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_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_TEXT N_("Hide interface")
VIDEO_ON_TOP_LONGTEXT, false )
add_bool( "video-wallpaper", false, WALLPAPER_TEXT,
WALLPAPER_LONGTEXT, false )
-#ifdef WIN32
- add_deprecated_alias( "directx-wallpaper" ) /* since 1.1.0 */
-#endif
add_bool( "disable-screensaver", true, SS_TEXT, SS_LONGTEXT,
true )
add_integer( "rtsp-port", 8554, RTSP_PORT_TEXT, RTSP_PORT_LONGTEXT, true )
change_integer_range( 1, 65535 )
add_loadfile( "http-cert", NULL, HTTP_CERT_TEXT, CERT_LONGTEXT, true )
- add_deprecated_alias( "sout-http-cert" ) /* since 1.2.0 */
+ add_obsolete_string( "sout-http-cert" ) /* since 1.2.0 */
add_loadfile( "http-key", NULL, HTTP_KEY_TEXT, KEY_LONGTEXT, true )
- add_deprecated_alias( "sout-http-key" ) /* since 1.2.0 */
+ add_obsolete_string( "sout-http-key" ) /* since 1.2.0 */
add_loadfile( "http-ca", NULL, HTTP_CA_TEXT, CA_LONGTEXT, true )
- add_deprecated_alias( "sout-http-ca" ) /* since 1.2.0 */
+ add_obsolete_string( "sout-http-ca" ) /* since 1.2.0 */
add_loadfile( "http-crl", NULL, HTTP_CRL_TEXT, CRL_LONGTEXT, true )
- add_deprecated_alias( "sout-http-crl" ) /* since 1.2.0 */
+ add_obsolete_string( "sout-http-crl" ) /* since 1.2.0 */
set_section( N_( "Socks proxy") , NULL )
add_string( "socks", NULL,
PLAYLISTENQUEUE_LONGTEXT, true )
#endif
-#if defined(WIN32)
+#if defined(WIN32) || defined(__OS2__)
add_bool( "high-priority", 0, HPRIORITY_TEXT,
HPRIORITY_LONGTEXT, false )
#endif
add_bool( "quiet", 0, QUIET_TEXT, QUIET_LONGTEXT, false )
change_short('q')
-#if !defined(WIN32)
+#if !defined(WIN32) && !defined(__OS2__)
add_bool( "daemon", 0, DAEMON_TEXT, DAEMON_LONGTEXT, true )
change_short('d')
# define KEY_SCALE_UP "Alt+o"
# define KEY_SCALE_DOWN "Shift+Alt+o"
# define KEY_DEINTERLACE "d"
-# define KEY_INTF_SHOW "i"
-# define KEY_INTF_HIDE "Shift+i"
+# define KEY_INTF_TOGGLE_FSC "i"
# define KEY_INTF_BOSS NULL
# define KEY_DISC_MENU "Ctrl+m"
# define KEY_TITLE_PREV "Ctrl+p"
# define KEY_SCALE_UP "Alt+o"
# define KEY_SCALE_DOWN "Alt+Shift+o"
# define KEY_DEINTERLACE "d"
-# define KEY_INTF_SHOW "i"
-# define KEY_INTF_HIDE "Shift+i"
+# define KEY_INTF_TOGGLE_FSC "i"
# define KEY_INTF_BOSS NULL
# define KEY_DISC_MENU "Shift+m"
# define KEY_TITLE_PREV "Shift+o"
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-intf-show", KEY_INTF_SHOW,
- INTF_SHOW_KEY_TEXT, INTF_SHOW_KEY_LONGTEXT, true )
- add_key( "key-intf-hide", KEY_INTF_HIDE,
- INTF_HIDE_KEY_TEXT, INTF_HIDE_KEY_LONGTEXT, true )
+ 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-snapshot", KEY_SNAPSHOT,
projects / vlc / blobdiff