# HG changeset patch # User reimar # Date 1280684308 0 # Node ID 96494594ddea0f77323a544a453161ba809cd997 # Parent 41241a72f4d83c1536def213cc35de3b6fccc446 Reindent. diff -r 41241a72f4d8 -r 96494594ddea libvo/vo_gl.c --- a/libvo/vo_gl.c Sun Aug 01 17:37:38 2010 +0000 +++ b/libvo/vo_gl.c Sun Aug 01 17:38:28 2010 +0000 @@ -762,33 +762,33 @@ int draw_eosd = (type & RENDER_EOSD) && eosdDispList; if (!draw_osd && !draw_eosd) return; - // set special rendering parameters - if (!scaled_osd) { - mpglMatrixMode(GL_PROJECTION); - mpglPushMatrix(); - mpglLoadIdentity(); - mpglOrtho(0, vo_dwidth, vo_dheight, 0, -1, 1); - } - mpglEnable(GL_BLEND); - if (draw_eosd) { - mpglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - mpglCallList(eosdDispList); - } - if (draw_osd) { - mpglColor4ub((osd_color >> 16) & 0xff, (osd_color >> 8) & 0xff, osd_color & 0xff, 0xff - (osd_color >> 24)); - // draw OSD + // set special rendering parameters + if (!scaled_osd) { + mpglMatrixMode(GL_PROJECTION); + mpglPushMatrix(); + mpglLoadIdentity(); + mpglOrtho(0, vo_dwidth, vo_dheight, 0, -1, 1); + } + mpglEnable(GL_BLEND); + if (draw_eosd) { + mpglBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + mpglCallList(eosdDispList); + } + if (draw_osd) { + mpglColor4ub((osd_color >> 16) & 0xff, (osd_color >> 8) & 0xff, osd_color & 0xff, 0xff - (osd_color >> 24)); + // draw OSD #ifndef FAST_OSD - mpglBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_ALPHA); - mpglCallLists(osdtexCnt, GL_UNSIGNED_INT, osdaDispList); + mpglBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_ALPHA); + mpglCallLists(osdtexCnt, GL_UNSIGNED_INT, osdaDispList); #endif - mpglBlendFunc(GL_SRC_ALPHA, GL_ONE); - mpglCallLists(osdtexCnt, GL_UNSIGNED_INT, osdDispList); - } - // set rendering parameters back to defaults - mpglDisable(GL_BLEND); - if (!scaled_osd) - mpglPopMatrix(); - mpglBindTexture(gl_target, 0); + mpglBlendFunc(GL_SRC_ALPHA, GL_ONE); + mpglCallLists(osdtexCnt, GL_UNSIGNED_INT, osdDispList); + } + // set rendering parameters back to defaults + mpglDisable(GL_BLEND); + if (!scaled_osd) + mpglPopMatrix(); + mpglBindTexture(gl_target, 0); } static void draw_osd(void)