[vlc-devel] commit: Fix option glx-shm does not exist error ( Rémi Denis-Courmont )

[git version control]

vlc | branch: 0.8.6-bugfix | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sun Jul  6 16:33:57 2008 +0300| [2aedc1d194ec6addfd61c2b53960135d8594deaf]

Fix option glx-shm does not exist error

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2aedc1d194ec6addfd61c2b53960135d8594deaf
---

 modules/video_output/x11/glx.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/modules/video_output/x11/glx.c b/modules/video_output/x11/glx.c
index 1061b5e..ddaa6eb 100644
--- a/modules/video_output/x11/glx.c
+++ b/modules/video_output/x11/glx.c
@@ -103,6 +103,10 @@ static void SwitchContext( vout_thread_t * );
     "X11 hardware display to use. By default VLC will " \
     "use the value of the DISPLAY environment variable.")
 
+#define SHM_TEXT N_("Use shared memory")
+#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 " \
@@ -119,6 +123,9 @@ vlc_module_begin();
     add_string( "glx-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, VLC_TRUE );
     add_integer( "glx-adaptor", -1, NULL, ADAPTOR_TEXT, ADAPTOR_LONGTEXT, VLC_TRUE );
     add_bool( "glx-altfullscreen", 0, NULL, ALT_FS_TEXT, ALT_FS_LONGTEXT, VLC_TRUE );
+#ifdef HAVE_SYS_SHM_H
+    add_bool( "glx-shm", 1, NULL, SHM_TEXT, SHM_LONGTEXT, VLC_TRUE );
+#endif
 #ifdef HAVE_XINERAMA
     add_integer ( "glx-xineramascreen", 0, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, VLC_TRUE );
 #endif