Mercurial > mplayer.hg

comparison libvo/vo_xvidix.c @ 15212:05aa13cdf92f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replace VO and VF numeric flags with #defined identifiers
author henry
date Mon, 18 Apr 2005 15:52:38 +0000
parents e632b43f0598
children 91d210e8a19c
comparison
equal deleted inserted replaced
15211:d42f22a1503b 15212:05aa13cdf92f
299 else 299 else
300 { 300 {
301 #endif 301 #endif
302 302
303 #ifdef X11_FULLSCREEN 303 #ifdef X11_FULLSCREEN
304 if ((flags & 1) || (flags & 0x04)) 304 if ((flags & VOFLAG_FULLSCREEN) || (flags & VOFLAG_SWSCALE))
305 aspect(&d_width, &d_height, A_ZOOM); 305 aspect(&d_width, &d_height, A_ZOOM);
306 #endif 306 #endif
307 dwidth = d_width; 307 dwidth = d_width;
308 dheight = d_height; 308 dheight = d_height;
309 /* Make the window */ 309 /* Make the window */
365 vo_x11_sizehint(vo_dx, vo_dy, vo_dwidth, vo_dheight, 0); 365 vo_x11_sizehint(vo_dx, vo_dy, vo_dwidth, vo_dheight, 0);
366 366
367 XStoreName(mDisplay, vo_window, title); 367 XStoreName(mDisplay, vo_window, title);
368 XMapWindow(mDisplay, vo_window); 368 XMapWindow(mDisplay, vo_window);
369 369
370 if (flags & 1) 370 if (flags & VOFLAG_FULLSCREEN)
371 vo_x11_fullscreen(); 371 vo_x11_fullscreen();
372 372
373 #ifdef HAVE_XINERAMA 373 #ifdef HAVE_XINERAMA
374 vo_x11_xinerama_move(mDisplay, vo_window); 374 vo_x11_xinerama_move(mDisplay, vo_window);
375 #endif 375 #endif
376 } else if (!(flags & 1)) 376 } else if (!(flags & VOFLAG_FULLSCREEN))
377 XMoveResizeWindow(mDisplay, vo_window, vo_dx, vo_dy, 377 XMoveResizeWindow(mDisplay, vo_window, vo_dx, vo_dy,
378 vo_dwidth, vo_dheight); 378 vo_dwidth, vo_dheight);
379 } 379 }
380 380
381 if (vo_gc != None) 381 if (vo_gc != None)
383 vo_gc = XCreateGC(mDisplay, vo_window, GCForeground, &mGCV); 383 vo_gc = XCreateGC(mDisplay, vo_window, GCForeground, &mGCV);
384 #ifdef HAVE_NEW_GUI 384 #ifdef HAVE_NEW_GUI
385 } 385 }
386 #endif 386 #endif
387 387
388 if ((!WinID) && (flags & 1)) 388 if ((!WinID) && (flags & VOFLAG_FULLSCREEN))
389 { 389 {
390 vo_dx = 0; 390 vo_dx = 0;
391 vo_dy = 0; 391 vo_dy = 0;
392 vo_dwidth = vo_screenwidth; 392 vo_dwidth = vo_screenwidth;
393 vo_dheight = vo_screenheight; 393 vo_dheight = vo_screenheight;