Remove dead xinerama and VidMod checks

diff --git a/configure.ac b/configure.ac
index ef62ea7957b86039e6d0fc5377733092ab10264b..1ad81788a430a9f0f002f5912499ac1a4a3874b1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3515,68 +3515,6 @@ AS_IF([test "${enable_xvmc}" != "no"], [
   ])
 ])
 
-dnl
-dnl  Check for the Xinerama extension
-dnl
-AC_ARG_ENABLE(xinerama,
-  [  --enable-xinerama       Xinerama support (default enabled)],, [
-  enable_xinerama="$enable_xvideo"
-])
-AS_IF([test "$enable_xinerama" != "no"], [
-  ac_cv_have_xinerama="no"
-  CFLAGS="${CFLAGS_save} ${X_LIBS} ${X_PRE_LIBS} -lX11 -lXext"
-  AC_CHECK_HEADERS(X11/extensions/Xinerama.h,[
-    AC_CHECK_LIB(Xinerama_pic, XineramaQueryExtension,[
-      VLC_ADD_LIBS([xvideo],[-lXinerama_pic])
-      VLC_ADD_LIBS([x11],[-lXinerama_pic])
-      VLC_ADD_LIBS([glx],[-lXinerama_pic])
-      VLC_ADD_LIBS([xvmc],[-lXinerama_pic])
-      ac_cv_have_xinerama="yes"
-    ],[
-      AC_CHECK_LIB(Xinerama, XineramaQueryExtension,[
-        VLC_ADD_LIBS([xvideo],[-lXinerama])
-        VLC_ADD_LIBS([x11],[-lXinerama])
-        VLC_ADD_LIBS([glx],[-lXinerama])
-        VLC_ADD_LIBS([xvmc],[-lXinerama])
-        ac_cv_have_xinerama="yes"
-      ])
-    ])
-  ])
-  if test "${ac_cv_have_xinerama}" = "yes"; then
-    AC_DEFINE(HAVE_XINERAMA, 1, [Define this if you have libXinerama installed])
-  fi
-
-dnl
-dnl  Check for XF86VidMode extension
-dnl
-  ac_cv_have_xf86vidmode="no"
-  AC_CHECK_HEADERS(X11/extensions/xf86vmode.h,[
-    AC_CHECK_LIB(Xxf86vm_pic, XF86VidModeGetViewPort,[
-      VLC_ADD_LIBS([xvideo],[-lXxf86vm_pic])
-      VLC_ADD_LIBS([x11],[-lXxf86vm_pic])
-      VLC_ADD_LIBS([glx],[-lXxf86vm_pic])
-      VLC_ADD_LIBS([xvmc],[-lXxf86vm_pic])
-      ac_cv_have_xf86vidmode="yes"
-    ],[
-      AC_CHECK_LIB(Xxf86vm, XF86VidModeGetViewPort,[
-        VLC_ADD_LIBS([xvideo],[-lXxf86vm])
-        VLC_ADD_LIBS([x11],[-lXxf86vm])
-        VLC_ADD_LIBS([glx],[-lXxf86vm])
-        VLC_ADD_LIBS([xvmc],[-lXxf86vm])
-        ac_cv_have_xf86vidmode="yes"
-      ])
-    ])
-  ],[true],
-[#ifdef HAVE_X11_XLIB_H
-# include <X11/Xlib.h>
-#endif]
-   )
-  AS_IF([test "${ac_cv_have_xf86vidmode}" = "yes"],
-    [AC_DEFINE(HAVE_XF86VIDMODE, 1, [Define this if you have libXxf86vm installed])
-  ])
-  CFLAGS="${CFLAGS_save}"
-])
-
 dnl End of Xlib tests
 CPPFLAGS="${CPPFLAGS_save}"
 

diff --git a/modules/video_output/x11/glx.c b/modules/video_output/x11/glx.c
index 2521197d304071c72f09770ed5406ba17ea94387..2bf4f8fea8ce9003a0256522228fb655b9b35136 100644 (file)
--- a/modules/video_output/x11/glx.c
+++ b/modules/video_output/x11/glx.c
@@ -110,11 +110,6 @@ static void SwitchContext( vout_thread_t * );
 #define SHM_LONGTEXT N_( \
     "Use shared memory to communicate between VLC and the X server.")
 
-#define SCREEN_TEXT N_("Screen for fullscreen mode.")
-#define SCREEN_LONGTEXT N_( \
-    "Screen to use in fullscreen mode. For instance " \
-    "set it to 0 for first screen, 1 for the second.")
-
 vlc_module_begin ()
     set_shortname( "OpenGL(GLX)" )
     set_category( CAT_VIDEO )
@@ -129,9 +124,6 @@ vlc_module_begin ()
 #ifdef HAVE_SYS_SHM_H
     add_bool( "glx-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, true )
 #endif
-#ifdef HAVE_XINERAMA
-    add_integer ( "glx-xineramascreen", -1, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true )
-#endif
 vlc_module_end ()
 
 /*****************************************************************************

diff --git a/modules/video_output/x11/x11.c b/modules/video_output/x11/x11.c
index 179e3d5a84b49a6ec62858d91b05a38d750bacc9..8c228934eaca12d0cb9f4a110a4c9fc2b1e13482 100644 (file)
--- a/modules/video_output/x11/x11.c
+++ b/modules/video_output/x11/x11.c
@@ -61,11 +61,6 @@ extern void Deactivate ( vlc_object_t * );
 #define SHM_LONGTEXT N_( \
     "Use shared memory to communicate between VLC and the X server.")
 
-#define SCREEN_TEXT N_("Screen for fullscreen mode.")
-#define SCREEN_LONGTEXT N_( \
-    "Screen to use in fullscreen mode. For instance " \
-    "set it to 0 for first screen, 1 for the second.")
-
 vlc_module_begin ()
     set_shortname( "X11" )
     set_category( CAT_VIDEO )
@@ -74,9 +69,6 @@ vlc_module_begin ()
     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
-#ifdef HAVE_XINERAMA
-    add_integer ( "x11-xineramascreen", -1, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true )
 #endif
     set_description( N_("X11 video output") )
     set_capability( "video output", 70 )

diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c
index efbe60ba7795b4eda81671f2006f084e79cd5b8a..976981b8075fc5c4ab11d76731e4c9052dd6274e 100644 (file)
--- a/modules/video_output/x11/xcommon.c
+++ b/modules/video_output/x11/xcommon.c
@@ -81,14 +81,6 @@
 #   include <GL/glx.h>
 #endif
 
-#ifdef HAVE_XINERAMA
-#   include <X11/extensions/Xinerama.h>
-#endif
-
-#ifdef HAVE_X11_EXTENSIONS_XF86VMODE_H
-#   include <X11/extensions/xf86vmode.h>
-#endif
-
 #ifdef MODULE_NAME_IS_xvmc
 #   include <X11/extensions/vldXvMC.h>
 #   include "../../codec/xvmc/accel_xvmc.h"

diff --git a/modules/video_output/x11/xcommon.h b/modules/video_output/x11/xcommon.h
index bd9ef7c0bb6cc9dff58b813c6ac23eb6a171aa67..f4933a278186885f2fc7dee9bcc91224b6ea97d5 100644 (file)
--- a/modules/video_output/x11/xcommon.h
+++ b/modules/video_output/x11/xcommon.h
@@ -76,11 +76,6 @@ typedef struct x11_window_t
 
     Atom                wm_protocols;
     Atom                wm_delete_window;
-
-#ifdef HAVE_XINERAMA
-    int                 i_screen;
-#endif
-
 } x11_window_t;
 
 /*****************************************************************************

diff --git a/modules/video_output/x11/xvideo.c b/modules/video_output/x11/xvideo.c
index 6ac68df58a3e92da574d97526a66003e2444f0a5..0b902a69ed80ce63f0e483e965e31c36b5d2d85c 100644 (file)
--- a/modules/video_output/x11/xvideo.c
+++ b/modules/video_output/x11/xvideo.c
@@ -72,11 +72,6 @@ extern void Deactivate ( vlc_object_t * );
 #define SHM_LONGTEXT N_( \
     "Use shared memory to communicate between VLC and the X server.")
 
-#define SCREEN_TEXT N_("Screen for fullscreen mode.")
-#define SCREEN_LONGTEXT N_( \
-    "Screen to use in fullscreen mode. For instance " \
-    "set it to 0 for first screen, 1 for the second.")
-
 vlc_module_begin ()
     set_shortname( "XVideo" )
     set_category( CAT_VIDEO )
@@ -88,9 +83,6 @@ vlc_module_begin ()
 #ifdef HAVE_SYS_SHM_H
     add_bool( "xvideo-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, true )
 #endif
-#ifdef HAVE_XINERAMA
-    add_integer ( "xvideo-xineramascreen", -1, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true )
-#endif
 
     set_description( N_("XVideo extension video output") )
     set_capability( "video output", 150 )

diff --git a/modules/video_output/x11/xvmc.c b/modules/video_output/x11/xvmc.c
index 8e10fcbadeb3b9e4bffbe9d61facdef5c5651313..57f75f8997a688032b97144733e42f843aff8345 100644 (file)
--- a/modules/video_output/x11/xvmc.c
+++ b/modules/video_output/x11/xvmc.c
@@ -122,11 +122,6 @@ extern void Deactivate ( vlc_object_t * );
 #define SHM_LONGTEXT N_( \
     "Use shared memory to communicate between VLC and the X server.")
 
-#define SCREEN_TEXT N_("Screen to be used for fullscreen mode.")
-#define SCREEN_LONGTEXT N_( \
-    "Choose the screen you want to use in fullscreen mode. For instance " \
-    "set it to 0 for first screen, 1 for the second.")
-
 #define MODE_TEXT N_("Deinterlace mode")
 #define MODE_LONGTEXT N_("You can choose the default deinterlace mode")
 
@@ -141,9 +136,6 @@ vlc_module_begin ()
     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 )
-#endif
-#ifdef HAVE_XINERAMA
-    add_integer ( "xvmc-xineramascreen", -1, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true )
 #endif
     add_string( "xvmc-deinterlace-mode", "bob", NULL, MODE_TEXT, MODE_LONGTEXT, false )
     add_string( "xvmc-crop-style", "eq", NULL, CROP_TEXT, CROP_LONGTEXT, false )