Remove Xlib X11 video output

[vlc] / modules / video_output / x11 / xvideo.c

diff --git a/modules/video_output/x11/xvideo.c b/modules/video_output/x11/xvideo.c
index d449766ba3a52889b59d973a378344a63e160354..c38193852aaef1396257a31a652af240b2a795f2 100644 (file)
--- a/modules/video_output/x11/xvideo.c
+++ b/modules/video_output/x11/xvideo.c
@@ -28,13 +28,18 @@
  * Preamble
  *****************************************************************************/
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 
 /*****************************************************************************
  * Exported prototypes
  *****************************************************************************/
-extern int  E_(Activate)   ( vlc_object_t * );
-extern void E_(Deactivate) ( vlc_object_t * );
+extern int  Activate   ( vlc_object_t * );
+extern void Deactivate ( vlc_object_t * );
 
 /*****************************************************************************
  * Module descriptor
@@ -44,15 +49,6 @@ extern void E_(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 " \
@@ -67,30 +63,21 @@ extern void E_(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 );
-    set_subcategory( SUBCAT_VIDEO_VOUT );
-    add_string( "xvideo-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, VLC_TRUE );
-    add_integer( "xvideo-adaptor", -1, NULL, ADAPTOR_TEXT, ADAPTOR_LONGTEXT, VLC_TRUE );
-    add_bool( "xvideo-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT, VLC_TRUE );
-    add_string( "xvideo-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, VLC_TRUE );
+vlc_module_begin ()
+    set_shortname( "XVideo" )
+    set_category( CAT_VIDEO )
+    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_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, VLC_TRUE );
-#endif
-#ifdef HAVE_XINERAMA
-    add_integer ( "xvideo-xineramascreen", 0, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, VLC_TRUE );
+    add_bool( "xvideo-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, true )
 #endif
 
-    set_description( _("XVideo extension video output") );
-    set_capability( "video output", 150 );
-    set_callbacks( E_(Activate), E_(Deactivate) );
-vlc_module_end();
+    set_description( N_("XVideo extension video output") )
+    set_capability( "video output", 150 )
+    set_callbacks( Activate, Deactivate )
+vlc_module_end ()
 
 /* following functions are local */