[vlc-devel] commit: GLX: remove nonsensical glx-adaptor ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Nov 29 22:14:39 2009 +0200| [547c0f4035e21e817bad04ff2b33ec2d0e4fc66d] | committer: Rémi Denis-Courmont 

GLX: remove nonsensical glx-adaptor

This smells like fishy cut&paste from the former XV plugin.

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

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

diff --git a/modules/video_output/x11/glx.c b/modules/video_output/x11/glx.c
index 8a0ddfa..d010882 100644
--- a/modules/video_output/x11/glx.c
+++ b/modules/video_output/x11/glx.c
@@ -87,11 +87,6 @@ static void SwitchContext( vout_thread_t * );
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-#define ADAPTOR_TEXT N_("XVideo adaptor number")
-#define ADAPTOR_LONGTEXT N_( \
-    "If your graphics card provides several adaptors, you have " \
-    "to choose which one will be used (you shouldn't have to change this).")
-
 #define DISPLAY_TEXT N_("X11 display")
 #define DISPLAY_LONGTEXT N_( \
     "X11 hardware display to use. By default VLC will " \
@@ -110,7 +105,7 @@ vlc_module_begin ()
     set_callbacks( CreateOpenGL, DestroyOpenGL )
 
     add_string( "glx-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, true )
-    add_integer( "glx-adaptor", -1, NULL, ADAPTOR_TEXT, ADAPTOR_LONGTEXT, true )
+    add_obsolete_integer( "glx-adaptor" ) /* Deprecated since 1.0.4 */
 #ifdef HAVE_SYS_SHM_H
     add_bool( "glx-shm", true, NULL, SHM_TEXT, SHM_LONGTEXT, true )
 #endif