Commit 2feb20f8 authored by gbazin's avatar gbazin
Browse files

* moved the "display" option from main to the relevant plugins. ( We now have
   the x11_display, xvideo_display, xmga_display and ggi_display options ).
parent 07197c19
......@@ -2,7 +2,7 @@
* ggi.c : GGI plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001 VideoLAN
* $Id: ggi.c,v 1.18 2002/03/17 17:00:38 sam Exp $
* $Id: ggi.c,v 1.19 2002/03/25 19:16:20 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -59,7 +59,14 @@ static void SetPalette ( vout_thread_t *, u16 *, u16 *, u16 * );
/*****************************************************************************
* Building configuration tree
*****************************************************************************/
#define DISPLAY_TEXT "X11 display name"
#define DISPLAY_LONGTEXT "Specify the X11 hardware display you want to use.\n"\
"By default vlc will use the value of the DISPLAY " \
"environment variable."
MODULE_CONFIG_START
ADD_CATEGORY_HINT( "Miscellaneous", NULL )
ADD_STRING ( "ggi_display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT )
MODULE_CONFIG_STOP
MODULE_INIT_START
......@@ -399,7 +406,7 @@ static int OpenDisplay( vout_thread_t *p_vout )
}
/* Open display */
psz_display = config_GetPszVariable( "display" );
psz_display = config_GetPszVariable( "ggi_display" );
p_vout->p_sys->p_display = ggiOpen( psz_display, NULL );
if( psz_display ) free( psz_display );
......
......@@ -2,7 +2,7 @@
* xmga.c : X11 MGA plugin for vlc
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: xmga.c,v 1.10 2002/03/21 22:10:33 gbazin Exp $
* $Id: xmga.c,v 1.11 2002/03/25 19:16:20 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -102,8 +102,14 @@ static void ToggleCursor ( vout_thread_t * );
"2) Completly bypass the window manager, but then " \
"nothing will be able to show on top of the video"
#define DISPLAY_TEXT "X11 display name"
#define DISPLAY_LONGTEXT "Specify the X11 hardware display you want to use.\n"\
"By default vlc will use the value of the DISPLAY " \
"environment variable."
MODULE_CONFIG_START
ADD_CATEGORY_HINT( "Miscellaneous", NULL )
ADD_STRING ( "xmga_display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT )
ADD_BOOL ( "xmga_altfullscreen", NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT )
MODULE_CONFIG_STOP
......@@ -283,7 +289,7 @@ static int vout_Create( vout_thread_t *p_vout )
/* Open display, unsing the "display" config variable or the DISPLAY
* environment variable */
psz_display = config_GetPszVariable( "display" );
psz_display = config_GetPszVariable( "xmga_display" );
p_vout->p_sys->p_display = XOpenDisplay( psz_display );
if( p_vout->p_sys->p_display == NULL ) /* error */
......
......@@ -2,7 +2,7 @@
* x11.c : X11 plugin for vlc
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: x11.c,v 1.13 2002/03/17 13:53:21 gbazin Exp $
* $Id: x11.c,v 1.14 2002/03/25 19:16:20 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -46,8 +46,14 @@
"2) Completly bypass the window manager, but then " \
"nothing will be able to show on top of the video"
#define DISPLAY_TEXT "X11 display name"
#define DISPLAY_LONGTEXT "Specify the X11 hardware display you want to use.\n"\
"By default vlc will use the value of the DISPLAY " \
"environment variable."
MODULE_CONFIG_START
ADD_CATEGORY_HINT( "Miscellaneous", NULL )
ADD_STRING ( "x11_display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT )
ADD_BOOL ( "x11_altfullscreen", NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT )
MODULE_CONFIG_STOP
......
......@@ -2,7 +2,7 @@
* xcommon.c: Functions common to the X11 and XVideo plugins
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: xcommon.c,v 1.25 2002/03/21 22:10:33 gbazin Exp $
* $Id: xcommon.c,v 1.26 2002/03/25 19:16:20 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -299,7 +299,12 @@ static int vout_Create( vout_thread_t *p_vout )
/* Open display, unsing the "display" config variable or the DISPLAY
* environment variable */
psz_display = config_GetPszVariable( "display" );
#ifdef MODULE_NAME_IS_xvideo
psz_display = config_GetPszVariable( "xvideo_display" );
#else
psz_display = config_GetPszVariable( "x11_display" );
#endif
p_vout->p_sys->p_display = XOpenDisplay( psz_display );
if( p_vout->p_sys->p_display == NULL ) /* error */
......
......@@ -2,7 +2,7 @@
* xvideo.c : Xvideo plugin for vlc
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: xvideo.c,v 1.8 2002/03/17 13:53:21 gbazin Exp $
* $Id: xvideo.c,v 1.9 2002/03/25 19:16:20 gbazin Exp $
*
* Authors: Shane Harper <shanegh@optusnet.com.au>
* Vincent Seguin <seguin@via.ecp.fr>
......@@ -51,8 +51,14 @@
"2) Completly bypass the window manager, but then " \
"nothing will be able to show on top of the video"
#define DISPLAY_TEXT "X11 display name"
#define DISPLAY_LONGTEXT "Specify the X11 hardware display you want to use.\n"\
"By default vlc will use the value of the DISPLAY " \
"environment variable."
MODULE_CONFIG_START
ADD_CATEGORY_HINT( "Miscellaneous", NULL )
ADD_STRING ( "xvideo_display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT )
ADD_INTEGER ( "xvideo_adaptor", -1, NULL, ADAPTOR_TEXT, ADAPTOR_LONGTEXT )
ADD_BOOL ( "xvideo_altfullscreen", NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT )
MODULE_CONFIG_STOP
......
......@@ -4,7 +4,7 @@
* and spawn threads.
*****************************************************************************
* Copyright (C) 1998-2001 VideoLAN
* $Id: main.c,v 1.168 2002/03/25 02:06:24 jobi Exp $
* $Id: main.c,v 1.169 2002/03/25 19:16:20 gbazin Exp $
*
* Authors: Vincent Seguin <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
......@@ -165,24 +165,28 @@
"video decoding stage shouldn't even be done, so it" \
"can allow you to save some processing power"
#define DISPLAY_TEXT "display identifier"
#define DISPLAY_LONGTEXT NULL
#define WIDTH_TEXT "video width"
#define WIDTH_LONGTEXT "You can enforce the video width here.\nNote" \
"that by default vlc will adapt to the video properties"
"that by default vlc will adapt to the video " \
"characteristics"
#define HEIGHT_TEXT "video height"
#define HEIGHT_LONGTEXT NULL
#define HEIGHT_LONGTEXT "You can enforce the video height here.\nNote" \
"that by default vlc will adapt to the video " \
"characteristics"
#define GRAYSCALE_TEXT "grayscale video output"
#define GRAYSCALE_LONGTEXT NULL
#define GRAYSCALE_LONGTEXT "Using this option, vlc will not decode the color "\
"information from the video (this can also allow " \
"you to save some processing power)"
#define FULLSCREEN_TEXT "fullscreen video output"
#define FULLSCREEN_LONGTEXT NULL
#define FULLSCREEN_LONGTEXT "If this option is enabled, vlc will always " \
"start a video in fullscreen mode"
#define NOOVERLAY_TEXT "disable accelerated display"
#define NOOVERLAY_LONGTEXT NULL
#define NOOVERLAY_TEXT "disable hardware acceleration for the video output"
#define NOOVERLAY_LONGTEXT "By default vlc will try to take advantage of the "\
"overlay capabilities of you graphics card.\n"
#define SPUMARGIN_TEXT "force SPU position"
#define SPUMARGIN_LONGTEXT NULL
......@@ -313,7 +317,6 @@ ADD_INTEGER ( "aout_format", 0, NULL, FORMAT_TEXT,
ADD_CATEGORY_HINT( "Video", NULL )
ADD_PLUGIN ( "vout", MODULE_CAPABILITY_VOUT, NULL, NULL, VOUT_TEXT, VOUT_LONGTEXT )
ADD_BOOL ( "novideo", NULL, NOVIDEO_TEXT, NOVIDEO_LONGTEXT )
ADD_STRING ( "display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT )
ADD_INTEGER ( "width", -1, NULL, WIDTH_TEXT, WIDTH_LONGTEXT )
ADD_INTEGER ( "height", -1, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT )
ADD_BOOL ( "grayscale", NULL, GRAYSCALE_TEXT, GRAYSCALE_LONGTEXT )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment