diff options
| author | Alexander Preisinger <alexander.preisinger@gmail.com> | 2013-03-04 22:41:27 +0100 |
|---|---|---|
| committer | Alexander Preisinger <alexander.preisinger@gmail.com> | 2013-03-04 23:32:47 +0100 |
| commit | 1198c031e4233a0cff5aa7d24aab986163f6903a (patch) | |
| tree | bff49197908452f3ad1363edcf4c527db9bf1fe0 /video/out/vo_x11.c | |
| parent | 4949992264d78d6dd22c0f6c611850402fd6eb30 (diff) | |
| download | mpv-1198c031e4233a0cff5aa7d24aab986163f6903a.tar.bz2 mpv-1198c031e4233a0cff5aa7d24aab986163f6903a.tar.xz | |
vo: Separate vo options from MPOpts
Separate the video output options from the big MPOpts structure and also only
pass the new mp_vo_opts structure to the vo backend.
Move video_driver_list into mp_vo_opts
Diffstat (limited to 'video/out/vo_x11.c')
| -rw-r--r-- | video/out/vo_x11.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/video/out/vo_x11.c b/video/out/vo_x11.c index 9e5f4dc64d..8d8c87f343 100644 --- a/video/out/vo_x11.c +++ b/video/out/vo_x11.c @@ -349,7 +349,7 @@ static int config(struct vo *vo, uint32_t width, uint32_t height, } if (!XMatchVisualInfo(vo->x11->display, vo->x11->screen, p->depth, DirectColor, &p->vinfo) - || (vo->opts->vo.WinID > 0 + || (vo->opts->WinID > 0 && p->vinfo.visualid != XVisualIDFromVisual(p->attribs.visual))) { XMatchVisualInfo(vo->x11->display, vo->x11->screen, p->depth, TrueColor, @@ -366,7 +366,7 @@ static int config(struct vo *vo, uint32_t width, uint32_t height, vo_x11_config_vo_window(vo, &p->vinfo, vo->dx, vo->dy, vo->dwidth, vo->dheight, flags, "x11"); - if (vo->opts->vo.WinID > 0) { + if (vo->opts->WinID > 0) { unsigned depth, dummy_uint; int dummy_int; Window dummy_win; @@ -445,7 +445,7 @@ static void Display_Image(struct priv *p, XImage *myximage, uint8_t *ImageData) p->old_vo_dheight != vo->dheight) && p->zoomFlag) return; - if (vo->opts->vo.WinID == 0) { + if (vo->opts->WinID == 0) { x = vo->dx; y = vo->dy; } @@ -539,7 +539,7 @@ static void flip_page(struct vo *vo) static void draw_image(struct vo *vo, mp_image_t *mpi) { struct priv *p = vo->priv; - struct MPOpts *opts = vo->opts; + struct mp_vo_opts *opts = vo->opts; uint8_t *dst[MP_MAX_PLANES] = {NULL}; int dstStride[MP_MAX_PLANES] = {0}; @@ -555,7 +555,7 @@ static void draw_image(struct vo *vo, mp_image_t *mpi) p->old_vo_dwidth = vo->dwidth; p->old_vo_dheight = vo->dheight; - if (opts->vo.fs) + if (opts->fs) aspect(vo, &newW, &newH, A_ZOOM); if (sws_flags == 0) newW &= (~31); // not needed but, if the user wants the FAST_BILINEAR SCALER, then its needed |