RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-28 18:12:22 +00:00
Code Issues Releases Wiki Activity

DOCS/client_api_examples: qml_direct: QWindow::size() is not thread-safe

Browse Source 
We still keep the window pointer, because we want to call
QQuickWindow::resetOpenGLState() (which runs on the rendering thread
only). Interesting mess...
This commit is contained in:
wm4 2015-01-09 15:59:59 +01:00
parent 803e579ff5
commit 3c3883ebe1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DOCS/client_api_examples/qml_direct/main.cpp
View File

@ -19,7 +19,7 @@ static void *get_proc_address(void *ctx, const char *name) {
}
MpvRenderer::MpvRenderer(mpv::qt::Handle a_mpv, mpv_opengl_cb_context *a_mpv_gl)
: mpv(a_mpv), mpv_gl(a_mpv_gl), window(0)
: mpv(a_mpv), mpv_gl(a_mpv_gl), window(0), size()
{
int r = mpv_opengl_cb_init_gl(mpv_gl, NULL, get_proc_address, NULL);
if (r < 0)
@ -39,8 +39,7 @@ void MpvRenderer::paint()
window->resetOpenGLState();
// Render to the whole window.
QSize s = window->size() * window->devicePixelRatio();
int vp[4] = {0, 0, s.width(), -s.height()};
int vp[4] = {0, 0, size.width(), -size.height()};
// This uses 0 as framebuffer, which indicates that mpv will render directly
// to the frontbuffer. Note that mpv will always switch framebuffers
@ -107,6 +106,7 @@ void MpvObject::sync()
renderer, &MpvRenderer::paint, Qt::DirectConnection);
}
renderer->window = window();
renderer->size = window()->size() * window()->devicePixelRatio();
}
void MpvObject::cleanup()

1
DOCS/client_api_examples/qml_direct/main.h
View File

@ -13,6 +13,7 @@ class MpvRenderer : public QObject
mpv::qt::Handle mpv;
mpv_opengl_cb_context *mpv_gl;
QQuickWindow *window;
QSize size;
friend class MpvObject;
public: