[MPlayer-cvslog] r38176 - in trunk: gui/wm/ws.c libvo/gl_common.c libvo/gl_common.h libvo/vo_gl_tiled.c

[ib]

Author: ib
Date: Thu Feb  6 17:41:36 2020
New Revision: 38176

Log:
Rename gl_vinfo gui_vinfo.

This rather clarifies the purpose of the variable.

Modified:
   trunk/gui/wm/ws.c
   trunk/libvo/gl_common.c
   trunk/libvo/gl_common.h
   trunk/libvo/vo_gl_tiled.c

Modified: trunk/gui/wm/ws.c
==============================================================================
--- trunk/gui/wm/ws.c	Thu Feb  6 17:36:06 2020	(r38175)
+++ trunk/gui/wm/ws.c	Thu Feb  6 17:41:36 2020	(r38176)
@@ -64,7 +64,7 @@ int wsOrgX;                          //
 int wsOrgY;                          // Screen origin y.
 
 Display *wsDisplay;
-XVisualInfo *gl_vinfo;
+XVisualInfo *gui_vinfo;
 
 static int wsScreen;
 static Window wsRootWin;
@@ -830,7 +830,7 @@ void wsWindowCreate(wsWindow *win, int x
 
     XMatchVisualInfo(wsDisplay, wsScreen, depth, TrueColor, &win->VisualInfo);
 
-    gl_vinfo = &win->VisualInfo;
+    gui_vinfo = &win->VisualInfo;
 
     mp_msg(MSGT_GPLAYER, MSGL_DBG2, "[ws] visual: ID %#lx\n", win->VisualInfo.visualid);
 

Modified: trunk/libvo/gl_common.c
==============================================================================
--- trunk/libvo/gl_common.c	Thu Feb  6 17:36:06 2020	(r38175)
+++ trunk/libvo/gl_common.c	Thu Feb  6 17:41:36 2020	(r38176)
@@ -2781,8 +2781,8 @@ int mpglcontext_create_window(MPGLContex
 #ifdef CONFIG_GUI
     int value;
 
-    if (gl_vinfo && glXGetConfig(mDisplay, gl_vinfo, GLX_USE_GL, &value) == 0 && value == True)
-      vinfo = gl_vinfo;
+    if (gui_vinfo && glXGetConfig(mDisplay, gui_vinfo, GLX_USE_GL, &value) == 0 && value == True)
+      vinfo = gui_vinfo;
 #endif
     if (flags & VOFLAG_STEREO) {
 #ifdef CONFIG_GUI

Modified: trunk/libvo/gl_common.h
==============================================================================
--- trunk/libvo/gl_common.h	Thu Feb  6 17:36:06 2020	(r38175)
+++ trunk/libvo/gl_common.h	Thu Feb  6 17:41:36 2020	(r38176)
@@ -316,6 +316,6 @@ extern void (GLAPIENTRY *mpglTexImage3D)
 extern void* (GLAPIENTRY *mpglAllocateMemoryMESA)(void *, int, size_t, float, float, float);
 extern void (GLAPIENTRY *mpglFreeMemoryMESA)(void *, int, void *);
 
-extern XVisualInfo *gl_vinfo;
+extern XVisualInfo *gui_vinfo;
 
 #endif /* MPLAYER_GL_COMMON_H */

Modified: trunk/libvo/vo_gl_tiled.c
==============================================================================
--- trunk/libvo/vo_gl_tiled.c	Thu Feb  6 17:36:06 2020	(r38175)
+++ trunk/libvo/vo_gl_tiled.c	Thu Feb  6 17:41:36 2020	(r38176)
@@ -464,9 +464,9 @@ static int choose_glx_visual(Display *dp
 #ifdef CONFIG_GUI
   int value;
 
-  if (gl_vinfo) {
-    if (glXGetConfig(mDisplay, gl_vinfo, GLX_USE_GL, &value) == 0 && value == True) {
-      *res_vi = *gl_vinfo;
+  if (gui_vinfo) {
+    if (glXGetConfig(mDisplay, gui_vinfo, GLX_USE_GL, &value) == 0 && value == True) {
+      *res_vi = *gui_vinfo;
       return 0;
     } else
       return -1;