diff options
| author | Alexander Preisinger <alexander.preisinger@gmail.com> | 2013-03-04 17:40:21 +0100 |
|---|---|---|
| committer | Alexander Preisinger <alexander.preisinger@gmail.com> | 2013-03-04 17:40:21 +0100 |
| commit | 7686cd7f043ef5b42ade64db21ec01c8c8d6281e (patch) | |
| tree | b8f2f3b73e2a7e19e6e999aa6ece03b381c87d14 /video/out/vo_opengl_old.c | |
| parent | dc226bb846f037e992ae4a9fa12aa2196e804e6d (diff) | |
| download | mpv-7686cd7f043ef5b42ade64db21ec01c8c8d6281e.tar.bz2 mpv-7686cd7f043ef5b42ade64db21ec01c8c8d6281e.tar.xz | |
vo: remove and cleanup globals
Removes almost every global variabel in vo.h and puts them in a special struct
in MPOpts for video output related options.
Also we completly remove the options/globals pts and refresh rate because
they were unused.
Diffstat (limited to 'video/out/vo_opengl_old.c')
| -rw-r--r-- | video/out/vo_opengl_old.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/video/out/vo_opengl_old.c b/video/out/vo_opengl_old.c index 30a0467d46..d41a547847 100644 --- a/video/out/vo_opengl_old.c +++ b/video/out/vo_opengl_old.c @@ -1361,7 +1361,7 @@ static void resize(struct vo *vo, int x, int y) gl->MatrixMode(GL_PROJECTION); gl->LoadIdentity(); p->ass_border_x = p->ass_border_y = 0; - if (aspect_scaling()) { + if (aspect_scaling(vo)) { int new_w, new_h; GLdouble scale_x, scale_y; aspect(vo, &new_w, &new_h, A_WINZOOM); @@ -1490,7 +1490,7 @@ static void draw_osd(struct vo *vo, struct osd_state *osd) if (p->scaled_osd) { res.w = p->image_width; res.h = p->image_height; - } else if (aspect_scaling()) { + } else if (aspect_scaling(vo)) { res.ml = res.mr = p->ass_border_x; res.mt = res.mb = p->ass_border_y; } @@ -1821,7 +1821,7 @@ static void flip_page(struct vo *vo) if (p->use_glFinish) gl->Finish(); p->glctx->swapGlBuffers(p->glctx); - if (aspect_scaling()) + if (aspect_scaling(vo)) gl->Clear(GL_COLOR_BUFFER_BIT); } @@ -2113,7 +2113,7 @@ static int preinit(struct vo *vo, const char *arg) .use_rectangle = -1, .ati_hack = -1, .force_pbo = -1, - .swap_interval = vo_vsync, + .swap_interval = vo->opts->vo.vsync, .custom_prog = NULL, .custom_tex = NULL, .custom_tlin = 1, |