Mark *-altfullscreen as obsolete for now

diff --git a/modules/video_output/x11/glx.c b/modules/video_output/x11/glx.c
index 2bf4f8fea8ce9003a0256522228fb655b9b35136..c1e7b2467d23c93ab923788d4465beed01f5da7d 100644 (file)
--- 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 8c228934eaca12d0cb9f4a110a4c9fc2b1e13482..463c80968b733821b088d8e003e07dbf94efb597 100644 (file)
--- 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 0b902a69ed80ce63f0e483e965e31c36b5d2d85c..c38193852aaef1396257a31a652af240b2a795f2 100644 (file)
--- 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 57f75f8997a688032b97144733e42f843aff8345..1be186973338649661f37706cd54826ad4e15599 100644 (file)
--- 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 3bcb6f88332c43d0d156fec46c1729071b29be10..5f7376c666f2fdc1ce2fdd46f2ed23cdd6ea8169 100644 (file)
--- 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"))