summaryrefslogtreecommitdiffstats
path: root/avmedia/source
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-05-13 14:05:13 +0200
committerZolnai Tamás <tamas.zolnai@collabora.com>2014-05-15 14:23:41 +0200
commit8099056f50f4587cb03b76cf6bac7e876f6ff967 (patch)
tree2a9b25c94676e19ffc17c2593449044e28cc3215 /avmedia/source
parentslideshow: update log messages (diff)
downloadcore-8099056f50f4587cb03b76cf6bac7e876f6ff967.tar.gz
core-8099056f50f4587cb03b76cf6bac7e876f6ff967.zip
avmediaogl: call gltf_renderer_set_content() only once
Change-Id: Ic4c4b886f5a60508e4f62eb3396850d09ae5d0a0
Diffstat (limited to 'avmedia/source')
-rw-r--r--avmedia/source/opengl/oglplayer.cxx1
-rw-r--r--avmedia/source/opengl/oglwindow.cxx1
2 files changed, 1 insertions, 1 deletions
diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx
index 43b8a71ef4ba..217fd88d7c0a 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -211,6 +211,7 @@ uno::Reference< media::XPlayerWindow > SAL_CALL OGLPlayer::createPlayerWindow( c
m_pHandle->viewport.y = 0;
m_pHandle->viewport.width = aSize.Width();
m_pHandle->viewport.height = aSize.Height();
+ gltf_renderer_set_content(m_pHandle);
OGLWindow* pWindow = new OGLWindow(m_pHandle, &m_aContext, pChildWindow);
return uno::Reference< media::XPlayerWindow >( pWindow );
}
diff --git a/avmedia/source/opengl/oglwindow.cxx b/avmedia/source/opengl/oglwindow.cxx
index 35b1ab4d4a4f..7bef3b4a5ed9 100644
--- a/avmedia/source/opengl/oglwindow.cxx
+++ b/avmedia/source/opengl/oglwindow.cxx
@@ -30,7 +30,6 @@ OGLWindow::~OGLWindow()
void SAL_CALL OGLWindow::update() throw (css::uno::RuntimeException, std::exception)
{
m_pContext->makeCurrent();
- gltf_renderer_set_content(m_pHandle);
gltf_prepare_renderer(m_pHandle);
gltf_renderer(m_pHandle);
gltf_complete_renderer();