diff options
author | wm4 <wm4@nowhere> | 2012-10-24 22:38:45 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-10-24 22:38:45 +0200 |
commit | 0e81d62c53a205ce5a4a5b201c283a1f9aba7316 (patch) | |
tree | 9ce8f4b0444a765c6a5dce3cb84c528a0e4ca3df /libvo/vo_corevideo.m | |
parent | bcf447d7e82af814ccc07c852543be38e58d69c8 (diff) | |
parent | 60cbc9461b86b13c68cc9537bc9a124ddc07a399 (diff) |
Merge branch 'master' into osd_changes
Conflicts:
libvo/vo_xv.c
Diffstat (limited to 'libvo/vo_corevideo.m')
-rw-r--r-- | libvo/vo_corevideo.m | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/libvo/vo_corevideo.m b/libvo/vo_corevideo.m index fb9350cc47..c05863145c 100644 --- a/libvo/vo_corevideo.m +++ b/libvo/vo_corevideo.m @@ -226,8 +226,8 @@ static uint32_t draw_image(struct vo *vo, mp_image_t *mpi) CVReturn error; if (!p->textureCache || !p->pixelBuffer) { - error = CVOpenGLTextureCacheCreate(NULL, 0, vo_cocoa_cgl_context(), - vo_cocoa_cgl_pixel_format(), 0, &p->textureCache); + error = CVOpenGLTextureCacheCreate(NULL, 0, vo_cocoa_cgl_context(vo), + vo_cocoa_cgl_pixel_format(vo), 0, &p->textureCache); if(error != kCVReturnSuccess) mp_msg(MSGT_VO, MSGL_ERR,"[vo_corevideo] Failed to create OpenGL" " texture Cache(%d)\n", error); @@ -395,6 +395,16 @@ static int control(struct vo *vo, uint32_t request, void *data) case VOCTRL_ONTOP: p->mpglctx->ontop(vo); return VO_TRUE; + case VOCTRL_PAUSE: + if (!p->mpglctx->pause) + break; + p->mpglctx->pause(vo); + return VO_TRUE; + case VOCTRL_RESUME: + if (!p->mpglctx->resume) + break; + p->mpglctx->resume(vo); + return VO_TRUE; case VOCTRL_FULLSCREEN: p->mpglctx->fullscreen(vo); resize(vo, vo->dwidth, vo->dheight); |