annotate libvo/vo_xmga.c @ 35556:970ae81f8aee

Change internal automatic audio CD track advancing. Don't call uiNext() if not playing. (Though it won't hurt calling it, it changes the track number.)
author ib
date Mon, 10 Dec 2012 11:30:54 +0000
parents a93891202051
children 5d3f93051de9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
28446
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27927
diff changeset
1 /*
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27927
diff changeset
2 * copyright (C) 2001 Zoltan Ponekker
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27927
diff changeset
3 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27927
diff changeset
4 * This file is part of MPlayer.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27927
diff changeset
5 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27927
diff changeset
6 * MPlayer is free software; you can redistribute it and/or modify
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27927
diff changeset
7 * it under the terms of the GNU General Public License as published by
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27927
diff changeset
8 * the Free Software Foundation; either version 2 of the License, or
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27927
diff changeset
9 * (at your option) any later version.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27927
diff changeset
10 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27927
diff changeset
11 * MPlayer is distributed in the hope that it will be useful,
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27927
diff changeset
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27927
diff changeset
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27927
diff changeset
14 * GNU General Public License for more details.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27927
diff changeset
15 *
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27927
diff changeset
16 * You should have received a copy of the GNU General Public License along
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27927
diff changeset
17 * with MPlayer; if not, write to the Free Software Foundation, Inc.,
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27927
diff changeset
18 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
7681eab10aea Add standard license headers, unify header formatting.
diego
parents: 27927
diff changeset
19 */
100
201c2f931497 added #define SHOW_TIME option... (debug)
arpi_esp
parents: 56
diff changeset
20
201c2f931497 added #define SHOW_TIME option... (debug)
arpi_esp
parents: 56
diff changeset
21 //#define SHOW_TIME
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
22
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
23 #include <stdio.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
24 #include <stdlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
25 #include <string.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
26
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
27 #include "config.h"
34174
a93891202051 Add missing mp_msg.h #includes, remove some unnecessary ones.
diego
parents: 32467
diff changeset
28 #include "mp_msg.h"
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
29 #include "video_out.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
30 #include "video_out_internal.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
31
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
32
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
33 #include <sys/ioctl.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
34 #include <unistd.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
35 #include <fcntl.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
36 #include <sys/mman.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
37
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
38 #include "drivers/mga_vid.h"
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
39
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
40 #include <X11/Xlib.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
41 #include <X11/Xutil.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
42 #include <errno.h>
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
43
27377
d58d06eafe83 Change a bunch of X11-specific preprocessor directives.
diego
parents: 27343
diff changeset
44 #ifdef CONFIG_XINERAMA
4017
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
45 #include <X11/extensions/Xinerama.h>
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
46 #endif
21a75ab24703 Xinerama patch number two by attila.
atmos4
parents: 3990
diff changeset
47
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
48 #include "x11_common.h"
32467
fbe5c829c69b Move libvo/sub.[ch] from libvo to sub.
cigaes
parents: 32372
diff changeset
49 #include "sub/sub.h"
2057
378aed6b232d Use aspect()
atmos4
parents: 2039
diff changeset
50 #include "aspect.h"
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
51
182
80a7b40f201a *** empty log message ***
pontscho
parents: 120
diff changeset
52 #ifdef SHOW_TIME
13787
e047e70a9767 Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents: 13056
diff changeset
53 #include "osdep/timer.h"
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
54 static unsigned int timer = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
55 static unsigned int timerd = 0;
100
201c2f931497 added #define SHOW_TIME option... (debug)
arpi_esp
parents: 56
diff changeset
56 #endif
201c2f931497 added #define SHOW_TIME option... (debug)
arpi_esp
parents: 56
diff changeset
57
25216
3aee342be929 Make vo info structs const
reimar
parents: 24348
diff changeset
58 static const vo_info_t info = {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
59 "Matrox G200/G4x0/G550 overlay in X11 window (using /dev/mga_vid)",
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
60 "xmga",
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
61 "Zoltan Ponekker <pontscho@makacs.poliod.hu>",
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
62 ""
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
63 };
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
64
25220
c9e9ac2008c2 Mark the vo_functions_t definitions as const where possible.
reimar
parents: 25216
diff changeset
65 const LIBVO_EXTERN(xmga)
8148
5b39e79af5fe removed get_info, using the same sheme as in libmpcodecs instead
alex
parents: 8017
diff changeset
66
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
67 static uint32_t mDepth;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
68 static XWindowAttributes attribs;
10988
c2bff70784d5 user settable colorkey
alex
parents: 10729
diff changeset
69 static int colorkey;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
70
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
71 static uint32_t mvHeight;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
72 static uint32_t mvWidth;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
73
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
74 static XSetWindowAttributes xWAttribs;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
75
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25220
diff changeset
76 static int initialized = 0;
6311
da2dda48b7ec add mute support ( step 1 ) and fixed panscan bugs (1000l for me)
pontscho
parents: 6307
diff changeset
77
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4970
diff changeset
78 #define VO_XMGA
31364
317649676214 Rename libvo/mga_common.c --> libvo/mga_template.c.
diego
parents: 28446
diff changeset
79 #include "mga_template.c"
4981
bfc652fc7f43 rewrite fullscreen support in some libvo driver
pontscho
parents: 4970
diff changeset
80 #undef VO_XMGA
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
81
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
82 static void mDrawColorKey(void)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
83 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
84 XSetBackground(mDisplay, vo_gc, 0);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
85 XClearWindow(mDisplay, vo_window);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
86 XSetForeground(mDisplay, vo_gc, colorkey);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
87 XFillRectangle(mDisplay, vo_window, vo_gc, drwX, drwY, drwWidth,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
88 (vo_fs ? drwHeight - 1 : drwHeight));
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
89 XFlush(mDisplay);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
90 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
91
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
92 static void check_events(void)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
93 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
94 int e = vo_x11_check_events(mDisplay);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
95
32370
79b1264388b3 Fix xmga event handling: Reconfigure hardware on move and resize,
reimar
parents: 32369
diff changeset
96 if (e & (VO_EVENT_RESIZE | VO_EVENT_MOVE))
79b1264388b3 Fix xmga event handling: Reconfigure hardware on move and resize,
reimar
parents: 32369
diff changeset
97 set_window();
79b1264388b3 Fix xmga event handling: Reconfigure hardware on move and resize,
reimar
parents: 32369
diff changeset
98 if (e & (VO_EVENT_RESIZE | VO_EVENT_EXPOSE))
79b1264388b3 Fix xmga event handling: Reconfigure hardware on move and resize,
reimar
parents: 32369
diff changeset
99 mDrawColorKey();
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
100 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
101
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
102 static void flip_page(void)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
103 {
182
80a7b40f201a *** empty log message ***
pontscho
parents: 120
diff changeset
104 #ifdef SHOW_TIME
100
201c2f931497 added #define SHOW_TIME option... (debug)
arpi_esp
parents: 56
diff changeset
105 unsigned int t;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
106
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
107 t = GetTimer();
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
108 mp_msg(MSGT_VO, MSGL_STATUS,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
109 " [timer: %08X diff: %6d dd: %6d ] \n", t, t - timer,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
110 (t - timer) - timerd);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
111 timerd = t - timer;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
112 timer = t;
182
80a7b40f201a *** empty log message ***
pontscho
parents: 120
diff changeset
113 #endif
100
201c2f931497 added #define SHOW_TIME option... (debug)
arpi_esp
parents: 56
diff changeset
114
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
115 vo_mga_flip_page();
31
1fc618eba830 added check_events() interface
arpi_esp
parents: 1
diff changeset
116 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
117
16171
fd51fd1ff231 Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents: 15540
diff changeset
118 static int config(uint32_t width, uint32_t height, uint32_t d_width,
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
119 uint32_t d_height, uint32_t flags, char *title,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
120 uint32_t format)
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
121 {
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
122 XVisualInfo vinfo;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
123 unsigned long xswamask;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
124 int r, g, b;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
125
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
126 if (mga_init(width, height, format))
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
127 return -1; // ioctl errors?
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
128
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
129 mvWidth = width;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
130 mvHeight = height;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
131
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
132 r = (vo_colorkey & 0x00ff0000) >> 16;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
133 g = (vo_colorkey & 0x0000ff00) >> 8;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
134 b = vo_colorkey & 0x000000ff;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
135 switch (vo_depthonscreen)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
136 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
137 case 32:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
138 colorkey = vo_colorkey;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
139 break;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
140 case 24:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
141 colorkey = vo_colorkey & 0x00ffffff;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
142 break;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
143 case 16:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
144 colorkey = ((r >> 3) << 11) | ((g >> 2) << 5) | (b >> 3);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
145 break;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
146 case 15:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
147 colorkey = ((r >> 3) << 10) | ((g >> 3) << 5) | (b >> 3);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
148 break;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
149 default:
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
150 mp_msg(MSGT_VO, MSGL_ERR,
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
151 "Sorry, this (%d) color depth not supported.\n",
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
152 vo_depthonscreen);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
153 return -1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
154 }
13946
e632b43f0598 Reduce excessive verbosity.
diego
parents: 13787
diff changeset
155 mp_msg(MSGT_VO, MSGL_V, "Using colorkey: %x\n", colorkey);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
156
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25220
diff changeset
157 initialized = 1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
158
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
159 XGetWindowAttributes(mDisplay, mRootWin, &attribs);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
160 mDepth = attribs.depth;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
161 if (mDepth != 15 && mDepth != 16 && mDepth != 24 && mDepth != 32)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
162 mDepth = 24;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
163 XMatchVisualInfo(mDisplay, mScreen, mDepth, TrueColor, &vinfo);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
164 xWAttribs.colormap =
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
165 XCreateColormap(mDisplay, mRootWin, vinfo.visual, AllocNone);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
166 xWAttribs.background_pixel = 0;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
167 xWAttribs.border_pixel = 0;
27927
6f199f065e15 Factor common code like -wid handling, vo_gc creation etc. out into
reimar
parents: 27903
diff changeset
168 xswamask = CWBackPixel | CWBorderPixel | CWColormap;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
169
23655
00aa61cde84a Make X11 window creation and (with -fixed-vo) management simpler and more
reimar
parents: 23077
diff changeset
170 vo_x11_create_vo_window(&vinfo, vo_dx, vo_dy, d_width, d_height,
23822
attila
parents: 23656
diff changeset
171 flags, xWAttribs.colormap, "xmga", title);
24348
f96e42d494f9 Fix borders for xmga broken by r23675. Tested by Diego.
reimar
parents: 23822
diff changeset
172 XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xWAttribs);
7679
e4e70b0e1786 some cleanup
arpi
parents: 7472
diff changeset
173
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
174 mga_vid_config.colkey_on = 1;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
175 mga_vid_config.colkey_red = r;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
176 mga_vid_config.colkey_green = g;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
177 mga_vid_config.colkey_blue = b;
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
178
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
179 set_window(); // set up mga_vid_config.dest_width etc
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
180
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
181 XSync(mDisplay, False);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
182
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
183 ioctl(f, MGA_VID_ON, 0);
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
184
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
185 return 0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
186 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
187
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
188 static void uninit(void)
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
189 {
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
190 mp_msg(MSGT_VO, MSGL_V, "vo: uninit!\n");
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
191 mga_uninit();
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25220
diff changeset
192 if (!initialized)
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
193 return; // no window?
25962
afa125da85cf typo fix: inited --> initialized
diego
parents: 25220
diff changeset
194 initialized = 0;
12582
162c80b2d432 major reindentation of x11 code try #2
attila
parents: 11542
diff changeset
195 vo_x11_uninit(); // destroy the window
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
196 }