summaryrefslogtreecommitdiff
path: root/avmedia
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-05-16 22:07:16 +0200
committerZolnai Tamás <tamas.zolnai@collabora.com>2014-05-16 22:11:31 +0200
commitba9357b82ec5551d562f572074b064ccd6c808f0 (patch)
tree6363aaa133144dfb11a7014a5deffcce998e1e56 /avmedia
parent0ab5802eb0e530e930bed6d5dbed1a0317ae323b (diff)
OGLPlayer: set a timer which call redrawing to show animation
Change-Id: I7c98ba61be0510e9f86cb80fda73d18f7f7957cf
Diffstat (limited to 'avmedia')
-rw-r--r--avmedia/source/opengl/oglplayer.cxx21
-rw-r--r--avmedia/source/opengl/oglplayer.hxx7
2 files changed, 26 insertions, 2 deletions
diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx
index 217fd88d7c0a..5c3ede6eaedd 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -103,6 +103,10 @@ bool OGLPlayer::create( const OUString& rURL )
}
}
}
+
+ // Set timer
+ m_aTimer.SetTimeout(10);
+ m_aTimer.SetTimeoutHdl(LINK(this,OGLPlayer,TimerHandler));
return true;
}
@@ -110,12 +114,14 @@ void SAL_CALL OGLPlayer::start() throw ( uno::RuntimeException, std::exception )
{
osl::MutexGuard aGuard(m_aMutex);
gltf_animation_start(m_pHandle);
+ m_aTimer.Start();
}
void SAL_CALL OGLPlayer::stop() throw ( uno::RuntimeException, std::exception )
{
osl::MutexGuard aGuard(m_aMutex);
gltf_animation_stop(m_pHandle);
+ m_aTimer.Stop();
}
sal_Bool SAL_CALL OGLPlayer::isPlaying() throw ( uno::RuntimeException, std::exception )
@@ -212,8 +218,8 @@ uno::Reference< media::XPlayerWindow > SAL_CALL OGLPlayer::createPlayerWindow( c
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 );
+ m_pOGLWindow = new OGLWindow(m_pHandle, &m_aContext, pChildWindow);
+ return uno::Reference< media::XPlayerWindow >( m_pOGLWindow );
}
uno::Reference< media::XFrameGrabber > SAL_CALL OGLPlayer::createFrameGrabber()
@@ -256,6 +262,17 @@ uno::Sequence< OUString > SAL_CALL OGLPlayer::getSupportedServiceNames()
return aRet;
}
+IMPL_LINK(OGLPlayer,TimerHandler,Timer*,pTimer)
+{
+ if (pTimer == &m_aTimer)
+ {
+ m_pOGLWindow->update();
+ m_aTimer.Start();
+ }
+
+ return 0;
+}
+
} // namespace ogl
} // namespace avmedia
diff --git a/avmedia/source/opengl/oglplayer.hxx b/avmedia/source/opengl/oglplayer.hxx
index 86e8a6efee69..69f010ba8719 100644
--- a/avmedia/source/opengl/oglplayer.hxx
+++ b/avmedia/source/opengl/oglplayer.hxx
@@ -16,9 +16,12 @@
#include <com/sun/star/media/XPlayer.hpp>
#include <libgltf.h>
#include <vcl/opengl/OpenGLContext.hxx>
+#include <vcl/timer.hxx>
namespace avmedia { namespace ogl {
+class OGLWindow;
+
typedef ::cppu::WeakComponentImplHelper2< com::sun::star::media::XPlayer,
com::sun::star::lang::XServiceInfo > Player_BASE;
@@ -55,9 +58,13 @@ public:
virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
private:
+ DECL_LINK( TimerHandler, Timer* );
+
OUString m_sURL;
glTFHandle* m_pHandle;
OpenGLContext m_aContext;
+ Timer m_aTimer;
+ OGLWindow* m_pOGLWindow;
};
} // namespace ogl