Mercurial > mplayer.hg
annotate libvo/vo_x11.c @ 18678:62effd918835
Add pre7try3, final pre8 update
author | rtogni |
---|---|
date | Sun, 11 Jun 2006 18:35:14 +0000 |
parents | a107276371a8 |
children | 30d7ddf08889 |
rev | line source |
---|---|
1 | 1 |
2 #include <stdio.h> | |
3 #include <stdlib.h> | |
4 #include <string.h> | |
5 #include <signal.h> | |
6 | |
7 #include "config.h" | |
8 #include "video_out.h" | |
9 #include "video_out_internal.h" | |
10 | |
11 | |
12 #include <X11/Xlib.h> | |
13 #include <X11/Xutil.h> | |
4036 | 14 |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
15 #ifdef HAVE_XF86VM |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
16 #include <X11/extensions/xf86vmode.h> |
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
17 #endif |
1 | 18 #include <errno.h> |
19 | |
31 | 20 #include "x11_common.h" |
21 | |
11690
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
22 #ifdef HAVE_SHM |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
23 #include <sys/ipc.h> |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
24 #include <sys/shm.h> |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
25 #include <X11/extensions/XShm.h> |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
26 |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
27 static int Shmem_Flag; |
12582 | 28 |
11690
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
29 //static int Quiet_Flag; Here also what is this for. It's used but isn't inited ? |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
30 static XShmSegmentInfo Shminfo[1]; |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
31 static int gXErrorFlag; |
12582 | 32 static int CompletionType = -1; |
11690
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
33 |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
34 /* since it doesn't seem to be defined on some platforms */ |
12582 | 35 int XShmGetEventBase(Display *); |
11690
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
36 #endif |
860bc06f32ca
just the same include reordering as in vo_xv (codemetics :)
alex
parents:
11542
diff
changeset
|
37 |
354 | 38 #include "fastmemcpy.h" |
616 | 39 #include "sub.h" |
350 | 40 |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
13056
diff
changeset
|
41 #include "postproc/swscale.h" |
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
13056
diff
changeset
|
42 #include "postproc/swscale_internal.h" //FIXME |
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
13056
diff
changeset
|
43 #include "postproc/rgb2rgb.h" |
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
13056
diff
changeset
|
44 #include "libmpcodecs/vf_scale.h" |
2218 | 45 |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
13056
diff
changeset
|
46 #include "mp_msg.h" |
18234
a107276371a8
Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents:
18116
diff
changeset
|
47 #include "help_mp.h" |
4734 | 48 |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
49 #ifdef HAVE_NEW_GUI |
13787
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
13056
diff
changeset
|
50 #include "Gui/interface.h" |
e047e70a9767
Handle "xxx.h" vs "../xxx.h" include paths in a consistent way.
diego
parents:
13056
diff
changeset
|
51 #include "mplayer.h" |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
52 #endif |
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
53 |
12582 | 54 static vo_info_t info = { |
55 "X11 ( XImage/Shm )", | |
56 "x11", | |
57 "Aaron Holtzman <aholtzma@ess.engr.uvic.ca>", | |
58 "" | |
1 | 59 }; |
60 | |
12582 | 61 LIBVO_EXTERN(x11) |
1 | 62 /* private prototypes */ |
12582 | 63 static void Display_Image(XImage * myximage, unsigned char *ImageData); |
64 static void (*draw_alpha_fnc) (int x0, int y0, int w, int h, | |
65 unsigned char *src, unsigned char *srca, | |
66 int stride); | |
1 | 67 |
68 /* local data */ | |
69 static unsigned char *ImageData; | |
70 | |
71 /* X11 related variables */ | |
7764 | 72 static XImage *myximage = NULL; |
12582 | 73 static int depth, bpp, mode; |
1 | 74 static XWindowAttributes attribs; |
75 | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
76 static int int_pause; |
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
77 |
2969 | 78 static int Flip_Flag; |
4661
4df2400b0527
-fs and or -vm default is nozoom, -zoom does the expected thing
michael
parents:
4658
diff
changeset
|
79 static int zoomFlag; |
2969 | 80 |
1 | 81 |
82 static uint32_t image_width; | |
83 static uint32_t image_height; | |
4641 | 84 static uint32_t in_format; |
12582 | 85 static uint32_t out_format = 0; |
86 static int srcW = -1; | |
87 static int srcH = -1; | |
88 static int aspect; // 1<<16 based fixed point aspect, so that the aspect stays correct during resizing | |
1 | 89 |
12582 | 90 static int old_vo_dwidth = -1; |
91 static int old_vo_dheight = -1; | |
92 | |
93 static void check_events() | |
94 { | |
95 int ret = vo_x11_check_events(mDisplay); | |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
96 |
12582 | 97 /* clear left over borders and redraw frame if we are paused */ |
98 if (ret & VO_EVENT_EXPOSE && int_pause) | |
99 { | |
100 vo_x11_clearwindow_part(mDisplay, vo_window, myximage->width, | |
101 myximage->height, 0); | |
102 flip_page(); | |
103 } else if ((ret & VO_EVENT_RESIZE) || (ret & VO_EVENT_EXPOSE)) | |
104 vo_x11_clearwindow_part(mDisplay, vo_window, myximage->width, | |
105 myximage->height, 0); | |
106 | |
107 } | |
108 | |
109 static void draw_alpha_32(int x0, int y0, int w, int h, unsigned char *src, | |
110 unsigned char *srca, int stride) | |
111 { | |
112 vo_draw_alpha_rgb32(w, h, src, srca, stride, | |
113 ImageData + 4 * (y0 * image_width + x0), | |
114 4 * image_width); | |
1 | 115 } |
116 | |
12582 | 117 static void draw_alpha_24(int x0, int y0, int w, int h, unsigned char *src, |
118 unsigned char *srca, int stride) | |
119 { | |
120 vo_draw_alpha_rgb24(w, h, src, srca, stride, | |
121 ImageData + 3 * (y0 * image_width + x0), | |
122 3 * image_width); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
123 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
124 |
12582 | 125 static void draw_alpha_16(int x0, int y0, int w, int h, unsigned char *src, |
126 unsigned char *srca, int stride) | |
127 { | |
128 vo_draw_alpha_rgb16(w, h, src, srca, stride, | |
129 ImageData + 2 * (y0 * image_width + x0), | |
130 2 * image_width); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
131 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
132 |
12582 | 133 static void draw_alpha_15(int x0, int y0, int w, int h, unsigned char *src, |
134 unsigned char *srca, int stride) | |
135 { | |
136 vo_draw_alpha_rgb15(w, h, src, srca, stride, | |
137 ImageData + 2 * (y0 * image_width + x0), | |
138 2 * image_width); | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
139 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
140 |
12582 | 141 static void draw_alpha_null(int x0, int y0, int w, int h, |
142 unsigned char *src, unsigned char *srca, | |
143 int stride) | |
144 { | |
1647
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
145 } |
22480104ddfd
added draw_alpha_XXXX functions, draw_alpha_func<=correct one in init
atlka
parents:
1501
diff
changeset
|
146 |
12582 | 147 static SwsContext *swsContext = NULL; |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
148 extern int sws_flags; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
149 |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
150 static XVisualInfo vinfo; |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
151 |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
16171
diff
changeset
|
152 static void getMyXImage(void) |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
153 { |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
154 #ifdef HAVE_SHM |
12582 | 155 if (mLocalDisplay && XShmQueryExtension(mDisplay)) |
156 Shmem_Flag = 1; | |
157 else | |
158 { | |
159 Shmem_Flag = 0; | |
160 mp_msg(MSGT_VO, MSGL_WARN, | |
161 "Shared memory not supported\nReverting to normal Xlib\n"); | |
162 } | |
163 if (Shmem_Flag) | |
164 CompletionType = XShmGetEventBase(mDisplay) + ShmCompletion; | |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
165 |
12582 | 166 if (Shmem_Flag) |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
167 { |
12582 | 168 myximage = |
169 XShmCreateImage(mDisplay, vinfo.visual, depth, ZPixmap, NULL, | |
170 &Shminfo[0], image_width, image_height); | |
171 if (myximage == NULL) | |
172 { | |
173 if (myximage != NULL) | |
174 XDestroyImage(myximage); | |
175 mp_msg(MSGT_VO, MSGL_WARN, | |
176 "Shared memory error,disabling ( Ximage error )\n"); | |
177 goto shmemerror; | |
178 } | |
179 Shminfo[0].shmid = shmget(IPC_PRIVATE, | |
180 myximage->bytes_per_line * | |
181 myximage->height, IPC_CREAT | 0777); | |
182 if (Shminfo[0].shmid < 0) | |
183 { | |
184 XDestroyImage(myximage); | |
185 mp_msg(MSGT_VO, MSGL_V, "%s\n", strerror(errno)); | |
186 //perror( strerror( errno ) ); | |
187 mp_msg(MSGT_VO, MSGL_WARN, | |
188 "Shared memory error,disabling ( seg id error )\n"); | |
189 goto shmemerror; | |
190 } | |
191 Shminfo[0].shmaddr = (char *) shmat(Shminfo[0].shmid, 0, 0); | |
3209 | 192 |
12582 | 193 if (Shminfo[0].shmaddr == ((char *) -1)) |
194 { | |
195 XDestroyImage(myximage); | |
196 if (Shminfo[0].shmaddr != ((char *) -1)) | |
197 shmdt(Shminfo[0].shmaddr); | |
198 mp_msg(MSGT_VO, MSGL_WARN, | |
199 "Shared memory error,disabling ( address error )\n"); | |
200 goto shmemerror; | |
201 } | |
202 myximage->data = Shminfo[0].shmaddr; | |
203 ImageData = (unsigned char *) myximage->data; | |
204 Shminfo[0].readOnly = False; | |
205 XShmAttach(mDisplay, &Shminfo[0]); | |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
206 |
12582 | 207 XSync(mDisplay, False); |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
208 |
12582 | 209 if (gXErrorFlag) |
210 { | |
211 XDestroyImage(myximage); | |
212 shmdt(Shminfo[0].shmaddr); | |
213 mp_msg(MSGT_VO, MSGL_WARN, "Shared memory error,disabling.\n"); | |
214 gXErrorFlag = 0; | |
215 goto shmemerror; | |
216 } else | |
217 shmctl(Shminfo[0].shmid, IPC_RMID, 0); | |
218 | |
219 { | |
220 static int firstTime = 1; | |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
221 |
12582 | 222 if (firstTime) |
223 { | |
224 mp_msg(MSGT_VO, MSGL_V, "Sharing memory.\n"); | |
225 firstTime = 0; | |
226 } | |
227 } | |
228 } else | |
229 { | |
230 shmemerror: | |
231 Shmem_Flag = 0; | |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
232 #endif |
12582 | 233 myximage = XGetImage(mDisplay, vo_window, 0, 0, |
234 image_width, image_height, AllPlanes, | |
235 ZPixmap); | |
236 ImageData = myximage->data; | |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
237 #ifdef HAVE_SHM |
12582 | 238 } |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
239 #endif |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
240 } |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
241 |
17566
f580a7755ac5
Patch by Stefan Huehner / stefan % huehner ! org \
rathann
parents:
16171
diff
changeset
|
242 static void freeMyXImage(void) |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
243 { |
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
244 #ifdef HAVE_SHM |
12582 | 245 if (Shmem_Flag) |
246 { | |
247 XShmDetach(mDisplay, &Shminfo[0]); | |
248 XDestroyImage(myximage); | |
249 shmdt(Shminfo[0].shmaddr); | |
250 } else | |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
251 #endif |
12582 | 252 { |
253 XDestroyImage(myximage); | |
254 } | |
255 myximage = NULL; | |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
256 } |
2218 | 257 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
258 static int config(uint32_t width, uint32_t height, uint32_t d_width, |
12582 | 259 uint32_t d_height, uint32_t flags, char *title, |
260 uint32_t format) | |
1 | 261 { |
1110 | 262 // int screen; |
12582 | 263 int fullscreen = 0; |
264 int vm = 0; | |
265 | |
1110 | 266 // int interval, prefer_blank, allow_exp, nothing; |
12582 | 267 unsigned int fg, bg; |
268 XEvent xev; | |
269 XGCValues xgcv; | |
270 Colormap theCmap; | |
271 XSetWindowAttributes xswa; | |
272 unsigned long xswamask; | |
273 | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
274 #ifdef HAVE_XF86VM |
12582 | 275 unsigned int modeline_width, modeline_height; |
276 static uint32_t vm_width; | |
277 static uint32_t vm_height; | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
278 #endif |
1 | 279 |
12582 | 280 vo_mouse_autohide = 1; |
281 old_vo_dwidth = -1; | |
282 old_vo_dheight = -1; | |
6013
7f6e02a16ac4
some bugfix, x[11|mga|v] ( fullscreen with more files )
pontscho
parents:
5999
diff
changeset
|
283 |
12582 | 284 if (!title) |
17787 | 285 title = "MPlayer X11 (XImage/Shm) render"; |
4813 | 286 |
12582 | 287 in_format = format; |
288 srcW = width; | |
289 srcH = height; | |
18116 | 290 update_xinerama_info(); |
12582 | 291 vo_dx = (vo_screenwidth - d_width) / 2; |
292 vo_dy = (vo_screenheight - d_height) / 2; | |
293 geometry(&vo_dx, &vo_dy, &d_width, &d_height, vo_screenwidth, | |
294 vo_screenheight); | |
18116 | 295 vo_dx += xinerama_x; |
296 vo_dy += xinerama_y; | |
12582 | 297 vo_dwidth = d_width; |
298 vo_dheight = d_height; | |
10757
3aea64e0d6d9
Avoid flickering during resizes. Keep video contents even when paused. Fix by Tomas Simonaitis <haden@homelan.lt>
mosu
parents:
10728
diff
changeset
|
299 |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
300 if (flags & (VOFLAG_FULLSCREEN|VOFLAG_MODESWITCHING)) |
12582 | 301 fullscreen = 1; |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
302 if (flags & VOFLAG_MODESWITCHING) |
12582 | 303 vm = 1; |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
304 if (flags & VOFLAG_FLIPPING) |
12582 | 305 Flip_Flag = 1; |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
306 zoomFlag = flags & VOFLAG_SWSCALE; |
12582 | 307 |
308 int_pause = 0; | |
4677
305a0c20bde4
default is allways nozoom again (specify -zoom if u want the sane behavior)
michael
parents:
4662
diff
changeset
|
309 // if(!fullscreen) zoomFlag=1; //it makes no sense to avoid zooming on windowd mode |
12582 | 310 |
2218 | 311 //printf( "w: %d h: %d\n\n",vo_dwidth,vo_dheight ); |
1746 | 312 |
12582 | 313 XGetWindowAttributes(mDisplay, mRootWin, &attribs); |
314 depth = attribs.depth; | |
315 | |
316 if (depth != 15 && depth != 16 && depth != 24 && depth != 32) | |
317 { | |
318 Visual *visual; | |
1746 | 319 |
12582 | 320 depth = vo_find_depth_from_visuals(mDisplay, mScreen, &visual); |
321 } | |
322 if (!XMatchVisualInfo(mDisplay, mScreen, depth, DirectColor, &vinfo) || | |
323 (WinID > 0 | |
324 && vinfo.visualid != XVisualIDFromVisual(attribs.visual))) | |
325 XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo); | |
1746 | 326 |
12582 | 327 /* set image size (which is indeed neither the input nor output size), |
328 if zoom is on it will be changed during draw_slice anyway so we don't duplicate the aspect code here | |
329 */ | |
330 image_width = (width + 7) & (~7); | |
331 image_height = height; | |
4661
4df2400b0527
-fs and or -vm default is nozoom, -zoom does the expected thing
michael
parents:
4658
diff
changeset
|
332 |
12582 | 333 aspect = ((1 << 16) * d_width + d_height / 2) / d_height; |
2218 | 334 |
1752 | 335 #ifdef HAVE_NEW_GUI |
12582 | 336 if (use_gui) |
337 guiGetEvent(guiSetShVideo, 0); // the GUI will set up / resize the window | |
338 else | |
339 #endif | |
340 { | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
341 #ifdef HAVE_XF86VM |
12582 | 342 if (vm) |
343 { | |
344 if ((d_width == 0) && (d_height == 0)) | |
345 { | |
346 vm_width = image_width; | |
347 vm_height = image_height; | |
348 } else | |
349 { | |
350 vm_width = d_width; | |
351 vm_height = d_height; | |
352 } | |
353 vo_vm_switch(vm_width, vm_height, &modeline_width, | |
354 &modeline_height); | |
355 vo_dx = (vo_screenwidth - modeline_width) / 2; | |
356 vo_dy = (vo_screenheight - modeline_height) / 2; | |
357 vo_dwidth = modeline_width; | |
358 vo_dheight = modeline_height; | |
359 } | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
360 #endif |
12582 | 361 bg = WhitePixel(mDisplay, mScreen); |
362 fg = BlackPixel(mDisplay, mScreen); | |
1 | 363 |
12582 | 364 theCmap = vo_x11_create_colormap(&vinfo); |
1 | 365 |
12582 | 366 xswa.background_pixel = 0; |
367 xswa.border_pixel = 0; | |
368 xswa.colormap = theCmap; | |
369 xswamask = CWBackPixel | CWBorderPixel | CWColormap; | |
1 | 370 |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
371 #ifdef HAVE_XF86VM |
12582 | 372 if (vm) |
373 { | |
374 xswa.override_redirect = True; | |
375 xswamask |= CWOverrideRedirect; | |
376 } | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
377 #endif |
12582 | 378 |
379 if (WinID >= 0) | |
380 { | |
381 vo_window = WinID ? ((Window) WinID) : mRootWin; | |
382 if (WinID) | |
383 { | |
15540 | 384 int border; |
385 Window win; | |
12582 | 386 XUnmapWindow(mDisplay, vo_window); |
387 XChangeWindowAttributes(mDisplay, vo_window, xswamask, | |
388 &xswa); | |
389 vo_x11_selectinput_witherr(mDisplay, vo_window, | |
390 StructureNotifyMask | | |
391 KeyPressMask | | |
392 PropertyChangeMask | | |
393 PointerMotionMask | | |
394 ButtonPressMask | | |
395 ButtonReleaseMask | | |
396 ExposureMask); | |
397 XMapWindow(mDisplay, vo_window); | |
15540 | 398 XGetGeometry(mDisplay, vo_window, &mRootWin, |
399 &vo_dx, &vo_dy, &vo_dwidth, &vo_dheight, | |
400 &border, &depth); | |
12582 | 401 } else |
402 XSelectInput(mDisplay, vo_window, ExposureMask); | |
403 } else | |
404 { | |
405 if (vo_window == None) | |
406 { | |
407 vo_window = | |
408 vo_x11_create_smooth_window(mDisplay, mRootWin, | |
409 vinfo.visual, vo_dx, vo_dy, | |
410 vo_dwidth, vo_dheight, | |
411 depth, theCmap); | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
412 |
12582 | 413 vo_x11_classhint(mDisplay, vo_window, "x11"); |
414 vo_hidecursor(mDisplay, vo_window); | |
415 vo_x11_sizehint(vo_dx, vo_dy, vo_dwidth, vo_dheight, 0); | |
416 XSelectInput(mDisplay, vo_window, StructureNotifyMask); | |
417 XStoreName(mDisplay, vo_window, title); | |
418 XMapWindow(mDisplay, vo_window); | |
7764 | 419 // if(WinID!=0) |
12582 | 420 do |
421 { | |
422 XNextEvent(mDisplay, &xev); | |
423 } | |
424 while (xev.type != MapNotify | |
425 || xev.xmap.event != vo_window); | |
426 | |
427 if (fullscreen) | |
428 vo_x11_fullscreen(); | |
429 } else if (!fullscreen) | |
430 XMoveResizeWindow(mDisplay, vo_window, vo_dx, vo_dy, | |
431 vo_dwidth, vo_dheight); | |
432 } | |
6043 | 433 |
12582 | 434 XSync(mDisplay, False); |
1 | 435 |
12582 | 436 // we cannot grab mouse events on root window :( |
437 vo_x11_selectinput_witherr(mDisplay, vo_window, | |
438 StructureNotifyMask | KeyPressMask | | |
439 PropertyChangeMask | ExposureMask | | |
440 ((WinID == | |
441 0) ? 0 : (ButtonPressMask | | |
442 ButtonReleaseMask | | |
443 PointerMotionMask))); | |
4805 | 444 |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
445 #ifdef HAVE_XF86VM |
12582 | 446 if (vm) |
447 { | |
448 /* Grab the mouse pointer in our window */ | |
449 if (vo_grabpointer) | |
450 XGrabPointer(mDisplay, vo_window, True, 0, | |
451 GrabModeAsync, GrabModeAsync, | |
452 vo_window, None, CurrentTime); | |
453 XSetInputFocus(mDisplay, vo_window, RevertToNone, CurrentTime); | |
454 } | |
2094
dc11de07b5e7
grabs mouse with -vm - patch by Uwe Reder <Uwe.Reder@3SOFT.de>
arpi
parents:
1924
diff
changeset
|
455 #endif |
12582 | 456 } |
1 | 457 |
12582 | 458 if (vo_gc != None) |
459 XFreeGC(mDisplay, vo_gc); | |
460 vo_gc = XCreateGC(mDisplay, vo_window, 0L, &xgcv); | |
461 | |
462 if (myximage) | |
463 { | |
464 freeMyXImage(); | |
465 sws_freeContext(swsContext); | |
466 } | |
467 getMyXImage(); | |
468 | |
469 if (!WinID) | |
470 { | |
471 vo_dwidth = vo_screenwidth; | |
472 vo_dheight = vo_screenheight; | |
473 } | |
1 | 474 |
12582 | 475 switch ((bpp = myximage->bits_per_pixel)) |
476 { | |
477 case 24: | |
478 draw_alpha_fnc = draw_alpha_24; | |
479 out_format = IMGFMT_BGR24; | |
480 break; | |
481 case 32: | |
482 draw_alpha_fnc = draw_alpha_32; | |
483 out_format = IMGFMT_BGR32; | |
484 break; | |
485 case 15: | |
486 case 16: | |
487 if (depth == 15) | |
488 { | |
489 draw_alpha_fnc = draw_alpha_15; | |
490 out_format = IMGFMT_BGR15; | |
491 } else | |
492 { | |
493 draw_alpha_fnc = draw_alpha_16; | |
494 out_format = IMGFMT_BGR16; | |
495 } | |
496 break; | |
497 case 8: | |
498 draw_alpha_fnc = draw_alpha_null; | |
499 out_format = IMGFMT_BGR8; | |
500 break; | |
501 default: | |
502 draw_alpha_fnc = draw_alpha_null; | |
503 } | |
1 | 504 |
12582 | 505 /* always allocate swsContext as size could change between frames */ |
506 swsContext = | |
507 sws_getContextFromCmdLine(width, height, in_format, width, height, | |
508 out_format); | |
509 if (!swsContext) | |
510 return -1; | |
1 | 511 |
12582 | 512 //printf( "X11 bpp: %d color mask: R:%lX G:%lX B:%lX\n",bpp,myximage->red_mask,myximage->green_mask,myximage->blue_mask ); |
1 | 513 |
12582 | 514 // If we have blue in the lowest bit then obviously RGB |
515 mode = ((myximage->blue_mask & 0x01) != 0) ? MODE_RGB : MODE_BGR; | |
1 | 516 #ifdef WORDS_BIGENDIAN |
12582 | 517 if (myximage->byte_order != MSBFirst) |
1 | 518 #else |
12582 | 519 if (myximage->byte_order != LSBFirst) |
1 | 520 #endif |
12582 | 521 { |
522 mode = ((myximage->blue_mask & 0x01) != 0) ? MODE_BGR : MODE_RGB; | |
4382 | 523 // printf( "No support for non-native XImage byte order!\n" ); |
1137
4c7b219e126c
patch: some X11 compliance fixed: set ClassHint and better fullscreen mode
arpi_esp
parents:
1110
diff
changeset
|
524 // return -1; |
12582 | 525 } |
5248
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
526 #ifdef WORDS_BIGENDIAN |
12582 | 527 if (mode == MODE_BGR && bpp != 32) |
528 { | |
529 mp_msg(MSGT_VO, MSGL_ERR, | |
530 "BGR%d not supported, please contact the developers\n", | |
531 bpp); | |
532 return -1; | |
533 } | |
5248
f23cea00d19c
print meaningfull error message instead of "hmm, arpi said that isnt used...
michael
parents:
5163
diff
changeset
|
534 #else |
12582 | 535 if (mode == MODE_BGR) |
536 { | |
537 mp_msg(MSGT_VO, MSGL_ERR, | |
538 "BGR not supported, please contact the developers\n"); | |
539 return -1; | |
540 } | |
541 #endif | |
1 | 542 |
12582 | 543 if (vo_ontop) |
544 vo_x11_setlayer(mDisplay, vo_window, vo_ontop); | |
11542 | 545 |
12582 | 546 return 0; |
1 | 547 } |
548 | |
12582 | 549 static void Display_Image(XImage * myximage, uint8_t * ImageData) |
1 | 550 { |
3003 | 551 #ifdef HAVE_SHM |
12582 | 552 if (Shmem_Flag) |
553 { | |
554 XShmPutImage(mDisplay, vo_window, vo_gc, myximage, | |
555 0, 0, | |
556 (vo_dwidth - swsContext->dstW) / 2, | |
557 (vo_dheight - myximage->height) / 2, swsContext->dstW, | |
558 myximage->height, True); | |
559 } else | |
1 | 560 #endif |
12582 | 561 { |
562 XPutImage(mDisplay, vo_window, vo_gc, myximage, | |
563 0, 0, | |
564 (vo_dwidth - swsContext->dstW) / 2, | |
565 (vo_dheight - myximage->height) / 2, swsContext->dstW, | |
566 myximage->height); | |
567 } | |
1 | 568 } |
569 | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
570 static void draw_osd(void) |
12582 | 571 { |
572 vo_draw_text(image_width, image_height, draw_alpha_fnc); | |
573 } | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
574 |
12582 | 575 static void flip_page(void) |
576 { | |
577 Display_Image(myximage, ImageData); | |
1501
d40f2b686846
changes according to -utf8 option, draw_osd() function added
atlka
parents:
1137
diff
changeset
|
578 XSync(mDisplay, False); |
31 | 579 } |
1 | 580 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
581 static int draw_slice(uint8_t * src[], int stride[], int w, int h, |
12582 | 582 int x, int y) |
1 | 583 { |
12582 | 584 uint8_t *dst[3]; |
585 int dstStride[3]; | |
6059 | 586 |
12582 | 587 if ((old_vo_dwidth != vo_dwidth |
588 || old_vo_dheight != vo_dheight) /*&& y==0 */ && zoomFlag) | |
589 { | |
590 int newW = vo_dwidth; | |
591 int newH = vo_dheight; | |
592 int newAspect = (newW * (1 << 16) + (newH >> 1)) / newH; | |
593 SwsContext *oldContext = swsContext; | |
4641 | 594 |
12582 | 595 if (newAspect > aspect) |
596 newW = (newH * aspect + (1 << 15)) >> 16; | |
597 else | |
598 newH = ((newW << 16) + (aspect >> 1)) / aspect; | |
4641 | 599 |
12582 | 600 old_vo_dwidth = vo_dwidth; |
601 old_vo_dheight = vo_dheight; | |
602 | |
603 if (sws_flags == 0) | |
604 newW &= (~31); // not needed but, if the user wants the FAST_BILINEAR SCALER, then its needed | |
4627 | 605 |
12582 | 606 swsContext = sws_getContextFromCmdLine(srcW, srcH, in_format, |
607 newW, newH, out_format); | |
608 if (swsContext) | |
609 { | |
610 image_width = (newW + 7) & (~7); | |
611 image_height = newH; | |
4420
a7bac05524a1
real window resizeing support (i know nearly nothing about x11 so feel free to fix / reverse it, if its broken)
michael
parents:
4382
diff
changeset
|
612 |
12582 | 613 freeMyXImage(); |
614 getMyXImage(); | |
615 sws_freeContext(oldContext); | |
616 } else | |
617 { | |
618 swsContext = oldContext; | |
619 } | |
620 } | |
621 dstStride[1] = dstStride[2] = 0; | |
622 dst[1] = dst[2] = NULL; | |
623 | |
624 if (Flip_Flag) | |
625 { | |
626 dstStride[0] = -image_width * ((bpp + 7) / 8); | |
627 dst[0] = ImageData - dstStride[0] * (image_height - 1); | |
628 sws_scale_ordered(swsContext, src, stride, y, h, dst, dstStride); | |
629 } else | |
630 { | |
631 dstStride[0] = image_width * ((bpp + 7) / 8); | |
632 dst[0] = ImageData; | |
633 sws_scale_ordered(swsContext, src, stride, y, h, dst, dstStride); | |
634 } | |
635 return 0; | |
1 | 636 } |
637 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
638 static int draw_frame(uint8_t * src[]) |
12582 | 639 { |
7683 | 640 #if 0 |
12582 | 641 int stride[3] = { 0, 0, 0 }; |
642 | |
643 if (in_format == IMGFMT_YUY2) | |
644 stride[0] = srcW * 2; | |
645 else if (in_format == IMGFMT_BGR8) | |
646 stride[0] = srcW; | |
647 else if (in_format == IMGFMT_BGR15) | |
648 stride[0] = srcW * 2; | |
649 else if (in_format == IMGFMT_BGR16) | |
650 stride[0] = srcW * 2; | |
651 else if (in_format == IMGFMT_BGR24) | |
652 stride[0] = srcW * 3; | |
653 else if (in_format == IMGFMT_BGR32) | |
654 stride[0] = srcW * 4; | |
655 | |
656 return draw_slice(src, stride, srcW, srcH, 0, 0); | |
7683 | 657 #else |
18234
a107276371a8
Part 5 and final of otvos attila's oattila AT chello-hu mp_msg changes, with lots of corrections
reynaldo
parents:
18116
diff
changeset
|
658 mp_msg(MSGT_VO,MSGL_INFO, MSGTR_LIBVO_X11_DrawFrameCalled); |
7683 | 659 return -1; |
660 #endif | |
661 } | |
662 | |
12582 | 663 static uint32_t get_image(mp_image_t * mpi) |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
664 { |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
665 if (zoomFlag || |
12582 | 666 !IMGFMT_IS_BGR(mpi->imgfmt) || |
667 (IMGFMT_BGR_DEPTH(mpi->imgfmt) != vo_depthonscreen) || | |
668 ((mpi->type != MP_IMGTYPE_STATIC) | |
669 && (mpi->type != MP_IMGTYPE_TEMP)) | |
670 || (mpi->flags & MP_IMGFLAG_PLANAR) | |
671 || (mpi->flags & MP_IMGFLAG_YUV) || (mpi->width != image_width) | |
672 || (mpi->height != image_height)) | |
673 return (VO_FALSE); | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
674 |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
675 if (Flip_Flag) |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
676 { |
12582 | 677 mpi->stride[0] = -image_width * ((bpp + 7) / 8); |
678 mpi->planes[0] = ImageData - mpi->stride[0] * (image_height - 1); | |
679 } else | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
680 { |
12582 | 681 mpi->stride[0] = image_width * ((bpp + 7) / 8); |
682 mpi->planes[0] = ImageData; | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
683 } |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
684 mpi->flags |= MP_IMGFLAG_DIRECT; |
12582 | 685 |
686 return (VO_TRUE); | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
687 } |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
688 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
689 static int query_format(uint32_t format) |
1 | 690 { |
12582 | 691 mp_msg(MSGT_VO, MSGL_DBG2, |
692 "vo_x11: query_format was called: %x (%s)\n", format, | |
693 vo_format_name(format)); | |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
694 if (IMGFMT_IS_BGR(format)) |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
695 { |
12582 | 696 if (IMGFMT_BGR_DEPTH(format) <= 8) |
697 return 0; // TODO 8bpp not yet fully implemented | |
698 if (IMGFMT_BGR_DEPTH(format) == vo_depthonscreen) | |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
699 return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_FLIP | |
12582 | 700 VFCAP_ACCEPT_STRIDE; |
701 else | |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
702 return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_FLIP | |
12582 | 703 VFCAP_ACCEPT_STRIDE; |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
704 } |
325 | 705 |
12582 | 706 switch (format) |
707 { | |
6692
ad521fb49a5e
-vm -fs -zoom fix, set correct vm screenres in aspect code (similar to xv fix).
atmos4
parents:
6180
diff
changeset
|
708 // case IMGFMT_BGR8: |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
709 // case IMGFMT_BGR15: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
710 // case IMGFMT_BGR16: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
711 // case IMGFMT_BGR24: |
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
712 // case IMGFMT_BGR32: |
6694
9291268a3603
1000l, back out hack-n-slay 8bpp code from my local tree.
atmos4
parents:
6693
diff
changeset
|
713 // return 0x2; |
4905
eb1a28f1236a
yuy2 support disabled to workaround stupid colorspace selection
michael
parents:
4889
diff
changeset
|
714 // case IMGFMT_YUY2: |
12582 | 715 case IMGFMT_I420: |
716 case IMGFMT_IYUV: | |
717 case IMGFMT_YV12: | |
15212
05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
henry
parents:
13787
diff
changeset
|
718 return VFCAP_CSP_SUPPORTED | VFCAP_OSD | VFCAP_SWSCALE | VFCAP_ACCEPT_STRIDE; |
12582 | 719 } |
720 return 0; | |
1 | 721 } |
722 | |
723 | |
7683 | 724 static void uninit(void) |
1 | 725 { |
12582 | 726 if (!myximage) |
727 return; | |
728 | |
729 freeMyXImage(); | |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
730 |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
731 #ifdef HAVE_XF86VM |
12582 | 732 vo_vm_close(mDisplay); |
206
82b5ae8ceaf4
adds XF86VidMode support to vo_x11.c to do "pseudo-scaling"
mgraffam
parents:
202
diff
changeset
|
733 #endif |
4426
1ceadec3ea67
using the common -vm code, patch by Santi Bjar <tiarda@yahoo.es>
arpi
parents:
4420
diff
changeset
|
734 |
12582 | 735 zoomFlag = 0; |
736 vo_x11_uninit(); | |
4677
305a0c20bde4
default is allways nozoom again (specify -zoom if u want the sane behavior)
michael
parents:
4662
diff
changeset
|
737 |
12582 | 738 sws_freeContext(swsContext); |
1 | 739 } |
740 | |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
741 static int preinit(const char *arg) |
4352 | 742 { |
12582 | 743 if (arg) |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4734
diff
changeset
|
744 { |
12582 | 745 mp_msg(MSGT_VO, MSGL_ERR, "vo_x11: Unknown subdevice: %s\n", arg); |
746 return ENOSYS; | |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4734
diff
changeset
|
747 } |
5130
305b1fbde890
added directrendering support and better query_format
alex
parents:
4993
diff
changeset
|
748 |
12582 | 749 if (!vo_init()) |
750 return -1; // Can't open X11 | |
4737
32e1f5042f65
I don't like such reports: '-vo dga:vidix or -vo x11:vidix works fine for me'
nick
parents:
4734
diff
changeset
|
751 return 0; |
4352 | 752 } |
1 | 753 |
16171
fd51fd1ff231
Fix the return types of all (six) libvo API functions. Used to be uint32_t, but
ivo
parents:
15540
diff
changeset
|
754 static int control(uint32_t request, void *data, ...) |
4352 | 755 { |
12582 | 756 switch (request) |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
757 { |
12582 | 758 case VOCTRL_PAUSE: |
759 return (int_pause = 1); | |
760 case VOCTRL_RESUME: | |
761 return (int_pause = 0); | |
762 case VOCTRL_QUERY_FORMAT: | |
763 return query_format(*((uint32_t *) data)); | |
764 case VOCTRL_GUISUPPORT: | |
765 return VO_TRUE; | |
766 case VOCTRL_GET_IMAGE: | |
767 return get_image(data); | |
768 case VOCTRL_SET_EQUALIZER: | |
769 { | |
770 va_list ap; | |
771 int value; | |
772 | |
773 va_start(ap, data); | |
774 value = va_arg(ap, int); | |
775 | |
776 va_end(ap); | |
777 return vo_x11_set_equalizer(data, value); | |
778 } | |
779 case VOCTRL_GET_EQUALIZER: | |
780 { | |
781 va_list ap; | |
782 int *value; | |
783 | |
784 va_start(ap, data); | |
785 value = va_arg(ap, int *); | |
786 | |
787 va_end(ap); | |
788 return vo_x11_get_equalizer(data, value); | |
789 } | |
790 case VOCTRL_ONTOP: | |
791 vo_x11_ontop(); | |
792 return VO_TRUE; | |
793 case VOCTRL_FULLSCREEN: | |
794 { | |
795 vo_x11_fullscreen(); | |
796 vo_x11_clearwindow(mDisplay, vo_window); | |
797 } | |
798 return VO_TRUE; | |
7964
143d730908ae
here is a somewhat generic equalizer implementation for the X11 vo drivers
arpi
parents:
7765
diff
changeset
|
799 } |
12582 | 800 return VO_NOTIMPL; |
4352 | 801 } |