RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-17 20:48:46 +00:00
Code Issues Releases Wiki Activity

vo_dxr3: Fix indentation

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32466 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2010-10-09 13:31:03 +00:00 committed by Uoti Urpala
parent ffb69180bb
commit 26108aa19a
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libvo/vo_dxr3.c
View File

@ -477,21 +477,19 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_
vo_dy = (vo_screenheight - d_height) / 2; vo_dy = (vo_screenheight - d_height) / 2;
vo_dwidth = d_width; vo_dwidth = d_width;
vo_dheight = d_height; vo_dheight = d_height;
{ XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &xwin_attribs);
XGetWindowAttributes(mDisplay, DefaultRootWindow(mDisplay), &xwin_attribs); depth = xwin_attribs.depth;
depth = xwin_attribs.depth; if (depth != 15 && depth != 16 && depth != 24 && depth != 32) {
if (depth != 15 && depth != 16 && depth != 24 && depth != 32) { depth = 24;
depth = 24;
}
XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo);
vo_x11_create_vo_window(&vinfo, vo_dx, vo_dy,
d_width, d_height, flags,
CopyFromParent, "Viewing Window", title);
xswa.background_pixel = KEY_COLOR;
xswa.border_pixel = 0;
xswamask = CWBackPixel | CWBorderPixel;
XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa);
} }
XMatchVisualInfo(mDisplay, mScreen, depth, TrueColor, &vinfo);
vo_x11_create_vo_window(&vinfo, vo_dx, vo_dy,
d_width, d_height, flags,
CopyFromParent, "Viewing Window", title);
xswa.background_pixel = KEY_COLOR;
xswa.border_pixel = 0;
xswamask = CWBackPixel | CWBorderPixel;
XChangeWindowAttributes(mDisplay, vo_window, xswamask, &xswa);
/* Start setting up overlay */ /* Start setting up overlay */
XGetWindowAttributes(mDisplay, mRootWin, &xwin_attribs); XGetWindowAttributes(mDisplay, mRootWin, &xwin_attribs);
@ -675,8 +673,7 @@ static void uninit(void)
overlay_set_mode(overlay_data, EM8300_OVERLAY_MODE_OFF); overlay_set_mode(overlay_data, EM8300_OVERLAY_MODE_OFF);
overlay_release(overlay_data); overlay_release(overlay_data);
vo_x11_uninit(); vo_x11_uninit();
} }
#endif #endif
if (old_vmode != -1) { if (old_vmode != -1) {
@ -851,10 +848,10 @@ static int preinit(const char *arg)
/* Initialize overlay and X11 */ /* Initialize overlay and X11 */
overlay_data = overlay_init(fd_control); overlay_data = overlay_init(fd_control);
if (!vo_init()) { if (!vo_init()) {
mp_tmsg(MSGT_VO,MSGL_ERR, "[VO_DXR3] Unable to init X11!\n"); mp_tmsg(MSGT_VO,MSGL_ERR, "[VO_DXR3] Unable to init X11!\n");
return -1; return -1;
} }
} }
#endif #endif