Mercurial > mplayer.hg
comparison libvo/vo_xv.c @ 15212:05aa13cdf92f
replace VO and VF numeric flags with #defined identifiers
author | henry |
---|---|
date | Mon, 18 Apr 2005 15:52:38 +0000 |
parents | 6b17eed33bdc |
children | 91d210e8a19c |
comparison
equal
deleted
inserted
replaced
15211:d42f22a1503b | 15212:05aa13cdf92f |
---|---|
186 vo_screenheight); | 186 vo_screenheight); |
187 vo_dwidth = d_width; | 187 vo_dwidth = d_width; |
188 vo_dheight = d_height; | 188 vo_dheight = d_height; |
189 | 189 |
190 #ifdef HAVE_XF86VM | 190 #ifdef HAVE_XF86VM |
191 if (flags & 0x02) | 191 if (flags & VOFLAG_MODESWITCHING) |
192 vm = 1; | 192 vm = 1; |
193 #endif | 193 #endif |
194 flip_flag = flags & 8; | 194 flip_flag = flags & VOFLAG_FLIPPING; |
195 num_buffers = | 195 num_buffers = |
196 vo_doublebuffering ? (vo_directrendering ? NUM_BUFFERS : 2) : 1; | 196 vo_doublebuffering ? (vo_directrendering ? NUM_BUFFERS : 2) : 1; |
197 | 197 |
198 /* check image formats */ | 198 /* check image formats */ |
199 { | 199 { |
329 ExposureMask))); | 329 ExposureMask))); |
330 XSetStandardProperties(mDisplay, vo_window, hello, hello, None, | 330 XSetStandardProperties(mDisplay, vo_window, hello, hello, None, |
331 NULL, 0, &hint); | 331 NULL, 0, &hint); |
332 vo_x11_sizehint(hint.x, hint.y, hint.width, hint.height, 0); | 332 vo_x11_sizehint(hint.x, hint.y, hint.width, hint.height, 0); |
333 XMapWindow(mDisplay, vo_window); | 333 XMapWindow(mDisplay, vo_window); |
334 if (flags & 1) | 334 if (flags & VOFLAG_FULLSCREEN) |
335 vo_x11_fullscreen(); | 335 vo_x11_fullscreen(); |
336 else | 336 else |
337 { | 337 { |
338 #ifdef HAVE_XINERAMA | 338 #ifdef HAVE_XINERAMA |
339 vo_x11_xinerama_move(mDisplay, vo_window); | 339 vo_x11_xinerama_move(mDisplay, vo_window); |
344 // vo_fs set means we were already at fullscreen | 344 // vo_fs set means we were already at fullscreen |
345 vo_x11_sizehint(hint.x, hint.y, hint.width, hint.height, 0); | 345 vo_x11_sizehint(hint.x, hint.y, hint.width, hint.height, 0); |
346 if (!vo_fs) | 346 if (!vo_fs) |
347 XMoveResizeWindow(mDisplay, vo_window, hint.x, hint.y, | 347 XMoveResizeWindow(mDisplay, vo_window, hint.x, hint.y, |
348 hint.width, hint.height); | 348 hint.width, hint.height); |
349 if (flags & 1 && !vo_fs) | 349 if (flags & VOFLAG_FULLSCREEN && !vo_fs) |
350 vo_x11_fullscreen(); // handle -fs on non-first file | 350 vo_x11_fullscreen(); // handle -fs on non-first file |
351 } | 351 } |
352 | 352 |
353 // vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 ); | 353 // vo_x11_sizehint( hint.x, hint.y, hint.width, hint.height,0 ); |
354 | 354 |
403 #if 0 | 403 #if 0 |
404 set_gamma_correction(); | 404 set_gamma_correction(); |
405 #endif | 405 #endif |
406 | 406 |
407 aspect(&vo_dwidth, &vo_dheight, A_NOZOOM); | 407 aspect(&vo_dwidth, &vo_dheight, A_NOZOOM); |
408 if (((flags & 1) && (WinID <= 0)) || vo_fs) | 408 if (((flags & VOFLAG_FULLSCREEN) && (WinID <= 0)) || vo_fs) |
409 { | 409 { |
410 aspect(&vo_dwidth, &vo_dheight, A_ZOOM); | 410 aspect(&vo_dwidth, &vo_dheight, A_ZOOM); |
411 drwX = | 411 drwX = |
412 (vo_screenwidth - | 412 (vo_screenwidth - |
413 (vo_dwidth > | 413 (vo_dwidth > |