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 /core/mplayer.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 'core/mplayer.c')
-rw-r--r-- | core/mplayer.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/mplayer.c b/core/mplayer.c index a4c9c09960..b56415151d 100644 --- a/core/mplayer.c +++ b/core/mplayer.c @@ -2309,7 +2309,7 @@ static void vo_update_window_title(struct MPContext *mpctx) { if (!mpctx->video_out) return; - char *title = mp_property_expand_string(mpctx, mpctx->opts.vo_wintitle); + char *title = mp_property_expand_string(mpctx, mpctx->opts.wintitle); talloc_free(mpctx->video_out->window_title); mpctx->video_out->window_title = talloc_steal(mpctx, title); } @@ -3215,7 +3215,6 @@ static void run_playloop(struct MPContext *mpctx) double buffered_audio = -1; while (mpctx->sh_video) { // never loops, for "break;" only struct vo *vo = mpctx->video_out; - vo_pts = mpctx->sh_video->timer * 90000.0; vo_fps = mpctx->sh_video->fps; video_left = vo->hasframe || vo->frame_loaded; @@ -4262,7 +4261,7 @@ static bool handle_help_options(struct MPContext *mpctx) opt_exit = 1; } #ifdef CONFIG_X11 - if (opts->vo_fstype_list && strcmp(opts->vo_fstype_list[0], "help") == 0) { + if (opts->vo.fstype_list && strcmp(opts->vo.fstype_list[0], "help") == 0) { fstype_help(); mp_msg(MSGT_FIXME, MSGL_FIXME, "\n"); opt_exit = 1; |