[vlc-devel] commit: Mark *-altfullscreen as obsolete for now ( Rémi Denis-Courmont )
git version control
git at videolan.org
Sun Aug 16 21:37:37 CEST 2009
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Aug 16 22:37:20 2009 +0300| [32a1da0def65c356288dc3b14a2301a8169ce8c0] | committer: Rémi Denis-Courmont
Mark *-altfullscreen as obsolete for now
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=32a1da0def65c356288dc3b14a2301a8169ce8c0
---
modules/video_output/x11/glx.c | 10 ----------
modules/video_output/x11/x11.c | 10 ----------
modules/video_output/x11/xvideo.c | 10 ----------
modules/video_output/x11/xvmc.c | 10 ----------
modules/video_output/xcb/window.c | 5 +++++
5 files changed, 5 insertions(+), 40 deletions(-)
diff --git a/modules/video_output/x11/glx.c b/modules/video_output/x11/glx.c
index 2bf4f8f..c1e7b24 100644
--- a/modules/video_output/x11/glx.c
+++ b/modules/video_output/x11/glx.c
@@ -92,15 +92,6 @@ static void SwitchContext( vout_thread_t * );
"If your graphics card provides several adaptors, you have " \
"to choose which one will be used (you shouldn't have to change this).")
-#define ALT_FS_TEXT N_("Alternate fullscreen method")
-#define ALT_FS_LONGTEXT N_( \
- "There are two ways to make a fullscreen window, unfortunately each one " \
- "has its drawbacks.\n" \
- "1) Let the window manager handle your fullscreen window (default), but " \
- "things like taskbars will likely show on top of the video.\n" \
- "2) Completely bypass the window manager, but then nothing will be able " \
- "to show on top of the video.")
-
#define DISPLAY_TEXT N_("X11 display")
#define DISPLAY_LONGTEXT N_( \
"X11 hardware display to use. By default VLC will " \
@@ -120,7 +111,6 @@ vlc_module_begin ()
add_string( "glx-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, true )
add_integer( "glx-adaptor", -1, NULL, ADAPTOR_TEXT, ADAPTOR_LONGTEXT, true )
- add_bool( "glx-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT, true )
#ifdef HAVE_SYS_SHM_H
add_bool( "glx-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, true )
#endif
diff --git a/modules/video_output/x11/x11.c b/modules/video_output/x11/x11.c
index 8c22893..463c809 100644
--- a/modules/video_output/x11/x11.c
+++ b/modules/video_output/x11/x11.c
@@ -43,15 +43,6 @@ extern void Deactivate ( vlc_object_t * );
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define ALT_FS_TEXT N_("Alternate fullscreen method")
-#define ALT_FS_LONGTEXT N_( \
- "There are two ways to make a fullscreen window, unfortunately each one " \
- "has its drawbacks.\n" \
- "1) Let the window manager handle your fullscreen window (default), but " \
- "things like taskbars will likely show on top of the video.\n" \
- "2) Completely bypass the window manager, but then nothing will be able " \
- "to show on top of the video.")
-
#define DISPLAY_TEXT N_("X11 display")
#define DISPLAY_LONGTEXT N_( \
"X11 hardware display to use. By default VLC will " \
@@ -66,7 +57,6 @@ vlc_module_begin ()
set_category( CAT_VIDEO )
set_subcategory( SUBCAT_VIDEO_VOUT )
add_string( "x11-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, true )
- add_bool( "x11-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT, true )
#ifdef HAVE_SYS_SHM_H
add_bool( "x11-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, true )
#endif
diff --git a/modules/video_output/x11/xvideo.c b/modules/video_output/x11/xvideo.c
index 0b902a6..c381938 100644
--- a/modules/video_output/x11/xvideo.c
+++ b/modules/video_output/x11/xvideo.c
@@ -49,15 +49,6 @@ extern void Deactivate ( vlc_object_t * );
"If your graphics card provides several adaptors, you need to choose " \
"which one will be used (you shouldn't have to change this).")
-#define ALT_FS_TEXT N_("Alternate fullscreen method")
-#define ALT_FS_LONGTEXT N_( \
- "There are two ways to make a fullscreen window, unfortunately each one " \
- "has its drawbacks.\n" \
- "1) Let the window manager handle your fullscreen window (default), but " \
- "things like taskbars will likely show on top of the video.\n" \
- "2) Completely bypass the window manager, but then nothing will be able " \
- "to show on top of the video.")
-
#define DISPLAY_TEXT N_("X11 display")
#define DISPLAY_LONGTEXT N_( \
"X11 hardware display to use. By default VLC will " \
@@ -78,7 +69,6 @@ vlc_module_begin ()
set_subcategory( SUBCAT_VIDEO_VOUT )
add_string( "xvideo-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, true )
add_integer( "xvideo-adaptor", -1, NULL, ADAPTOR_TEXT, ADAPTOR_LONGTEXT, true )
- add_bool( "xvideo-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT, true )
add_string( "xvideo-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true )
#ifdef HAVE_SYS_SHM_H
add_bool( "xvideo-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, true )
diff --git a/modules/video_output/x11/xvmc.c b/modules/video_output/x11/xvmc.c
index 57f75f8..1be1869 100644
--- a/modules/video_output/x11/xvmc.c
+++ b/modules/video_output/x11/xvmc.c
@@ -99,15 +99,6 @@ extern void Deactivate ( vlc_object_t * );
"If you graphics card provides several adaptors, this option allows you " \
"to choose which one will be used (you shouldn't have to change this).")
-#define ALT_FS_TEXT N_("Alternate fullscreen method")
-#define ALT_FS_LONGTEXT N_( \
- "There are two ways to make a fullscreen window, unfortunately each one " \
- "has its drawbacks.\n" \
- "1) Let the window manager handle your fullscreen window (default), but " \
- "things like taskbars will likely show on top of the video.\n" \
- "2) Completely bypass the window manager, but then nothing will be able " \
- "to show on top of the video.")
-
#define DISPLAY_TEXT N_("X11 display name")
#define DISPLAY_LONGTEXT N_( \
"Specify the X11 hardware display you want to use. By default VLC will " \
@@ -132,7 +123,6 @@ vlc_module_begin ()
set_shortname( "XVMC" )
add_string( "xvmc-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, true )
add_integer( "xvmc-adaptor", -1, NULL, ADAPTOR_TEXT, ADAPTOR_LONGTEXT, true )
- add_bool( "xvmc-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT, true )
add_string( "xvmc-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true )
#ifdef HAVE_SYS_SHM_H
add_bool( "xvmc-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, true )
diff --git a/modules/video_output/xcb/window.c b/modules/video_output/xcb/window.c
index 3bcb6f8..5f7376c 100644
--- a/modules/video_output/xcb/window.c
+++ b/modules/video_output/xcb/window.c
@@ -68,6 +68,11 @@ vlc_module_begin ()
add_string ("x11-display", NULL, NULL,
DISPLAY_TEXT, DISPLAY_LONGTEXT, true)
+ /* Obsolete since 1.1.0: */
+ add_obsolete_bool ("x11-altfullscreen")
+ add_obsolete_bool ("xvideo-altfullscreen")
+ add_obsolete_bool ("xvmc-altfullscreen")
+ add_obsolete_bool ("glx-altfullscreen")
add_submodule ()
set_shortname (N_("Drawable"))
More information about the vlc-devel
mailing list