diff options
| author | wm4 <wm4@nowhere> | 2014-12-31 20:31:19 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-12-31 20:31:19 +0100 |
| commit | a850bf786e3bea2ce9969d6794835a0724f29b0d (patch) | |
| tree | 9e58453886384f98824d3885bf8a5281d07ccfc7 /player | |
| parent | 65f2c6c71676e4359d313ecf27744e525b662134 (diff) | |
| download | mpv-a850bf786e3bea2ce9969d6794835a0724f29b0d.tar.bz2 mpv-a850bf786e3bea2ce9969d6794835a0724f29b0d.tar.xz | |
vo_opengl_cb: simplify API uninitialization
Until now, calling mpv_opengl_cb_uninit_gl() at a "bad moment" could
make the whole thing to explode. The API user was asked to avoid such
situations by calling it only in "good moments". But this was probably a
bit too subtle and could easily be overlooked.
Integrate the approach the qml example uses directly into the
implementation. If the OpenGL context is to be unitialized, forcefully
disable video, and block until this is done.
Diffstat (limited to 'player')
| -rw-r--r-- | player/client.c | 11 | ||||
| -rw-r--r-- | player/client.h | 4 |
2 files changed, 13 insertions, 2 deletions
diff --git a/player/client.c b/player/client.c index e83f3568f8..7d75b22256 100644 --- a/player/client.c +++ b/player/client.c @@ -1613,6 +1613,15 @@ int64_t mpv_get_time_us(mpv_handle *ctx) return mp_time_us(); } +// Used by vo_opengl_cb to synchronously uninitialize video. +void kill_video(struct mp_client_api *client_api) +{ + struct MPContext *mpctx = client_api->mpctx; + mp_dispatch_lock(mpctx->dispatch); + mp_switch_track(mpctx, STREAM_VIDEO, NULL); + mp_dispatch_unlock(mpctx->dispatch); +} + #include "libmpv/opengl_cb.h" #if HAVE_GL @@ -1620,7 +1629,7 @@ static mpv_opengl_cb_context *opengl_cb_get_context(mpv_handle *ctx) { mpv_opengl_cb_context *cb = ctx->mpctx->gl_cb_ctx; if (!cb) { - cb = mp_opengl_create(ctx->mpctx->global, ctx->mpctx->osd); + cb = mp_opengl_create(ctx->mpctx->global, ctx->mpctx->osd, ctx->clients); ctx->mpctx->gl_cb_ctx = cb; } return cb; diff --git a/player/client.h b/player/client.h index aeb2e886e7..656e3601cb 100644 --- a/player/client.h +++ b/player/client.h @@ -42,6 +42,8 @@ struct mpv_opengl_cb_context; struct mpv_global; struct osd_state; struct mpv_opengl_cb_context *mp_opengl_create(struct mpv_global *g, - struct osd_state *osd); + struct osd_state *osd, + struct mp_client_api *client_api); +void kill_video(struct mp_client_api *client_api); #endif |