[MPlayer-cvslog] r31888 - trunk/libvo/vo_gl.c
reimar
subversion at mplayerhq.hu
Sun Aug 1 19:38:28 CEST 2010
Author: reimar
Date: Sun Aug 1 19:38:28 2010
New Revision: 31888
Log:
Reindent.
Modified:
trunk/libvo/vo_gl.c
Modified: trunk/libvo/vo_gl.c
==============================================================================
--- trunk/libvo/vo_gl.c Sun Aug 1 19:37:38 2010 (r31887)
+++ trunk/libvo/vo_gl.c Sun Aug 1 19:38:28 2010 (r31888)
@@ -762,33 +762,33 @@ static void do_render_osd(int type) {
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)
More information about the MPlayer-cvslog
mailing list