Mercurial > mplayer.hg

comparison libvo/vo_gl.c @ 8148:5b39e79af5fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
removed get_info, using the same sheme as in libmpcodecs instead
author alex
date Mon, 11 Nov 2002 15:22:10 +0000
parents 48c71b6c7389
children 2c4cebb8637d
comparison
equal deleted inserted replaced
8147:538f88a49b50 8148:5b39e79af5fe
12 #include <errno.h> 12 #include <errno.h>
13 13
14 #include "config.h" 14 #include "config.h"
15 #include "video_out.h" 15 #include "video_out.h"
16 #include "video_out_internal.h" 16 #include "video_out_internal.h"
17
18
19 LIBVO_EXTERN(gl)
20 17
21 #include <X11/Xlib.h> 18 #include <X11/Xlib.h>
22 #include <X11/Xutil.h> 19 #include <X11/Xutil.h>
23 //#include <X11/keysym.h> 20 //#include <X11/keysym.h>
24 #include <GL/glx.h> 21 #include <GL/glx.h>
28 #include <GL/gl.h> 25 #include <GL/gl.h>
29 26
30 #include "x11_common.h" 27 #include "x11_common.h"
31 #include "aspect.h" 28 #include "aspect.h"
32 29
33 static vo_info_t vo_info = 30 static vo_info_t info =
34 { 31 {
35 "X11 (OpenGL)", 32 "X11 (OpenGL)",
36 "gl", 33 "gl",
37 "Arpad Gereoffy <arpi@esp-team.scene.hu>", 34 "Arpad Gereoffy <arpi@esp-team.scene.hu>",
38 "" 35 ""
39 }; 36 };
37
38 LIBVO_EXTERN(gl)
40 39
41 /* local data */ 40 /* local data */
42 static unsigned char *ImageData=NULL; 41 static unsigned char *ImageData=NULL;
43 42
44 static GLXContext wsGLXContext; 43 static GLXContext wsGLXContext;
241 // printf("OpenGL setup OK!\n"); 240 // printf("OpenGL setup OK!\n");
242 241
243 saver_off(mDisplay); // turning off screen saver 242 saver_off(mDisplay); // turning off screen saver
244 243
245 return 0; 244 return 0;
246 }
247
248 static const vo_info_t*
249 get_info(void)
250 {
251 return &vo_info;
252 } 245 }
253 246
254 static void check_events(void) 247 static void check_events(void)
255 { 248 {
256 int e=vo_x11_check_events(mDisplay); 249 int e=vo_x11_check_events(mDisplay);