[vlc-devel] commit: GLX: remove silly --glx-shm option ( Rémi Denis-Courmont )

[git version control]

vlc | branch: 1.0-bugfix | Rémi Denis-Courmont <remi at remlab.net> | Sun Nov 29 22:44:14 2009 +0200| [5fd887766ace1724f84b24de1839f2e3e56c7194] | committer: Rémi Denis-Courmont 

GLX: remove silly --glx-shm option

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

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

diff --git a/modules/video_output/x11/glx.c b/modules/video_output/x11/glx.c
index 93c11f6..b82984a 100644
--- a/modules/video_output/x11/glx.c
+++ b/modules/video_output/x11/glx.c
@@ -101,10 +101,6 @@ 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 " \
@@ -122,7 +118,7 @@ vlc_module_begin ()
     add_obsolete_integer( "glx-adaptor" ) /* Deprecated since 1.0.4 */
     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 )
+    add_obsolete_bool( "glx-shm" ) /* Deprecated since 1.0.4 */
 #endif
 #ifdef HAVE_XINERAMA
     add_integer ( "glx-xineramascreen", -1, NULL, SCREEN_TEXT, SCREEN_LONGTEXT, true )