summaryrefslogtreecommitdiff
path: root/avmedia/source/opengl/oglplayer.cxx
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-05-06 17:10:59 +0200
committerZolnai Tamás <tamas.zolnai@collabora.com>2014-05-06 17:25:16 +0200
commitb4b10fc873ba38ea24da23d8a2235d3ab34d8c72 (patch)
tree6dba7a1d2a69403c3f0ea56d4e452f62a77080fe /avmedia/source/opengl/oglplayer.cxx
parent0ece50a4ce35d87b7402b201b2d099c37fdfc13e (diff)
Upgrade libgltf
Change-Id: Ib7bc9562602d1d8da4082987302834ac2486d78a
Diffstat (limited to 'avmedia/source/opengl/oglplayer.cxx')
-rw-r--r--avmedia/source/opengl/oglplayer.cxx11
1 files changed, 4 insertions, 7 deletions
diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx
index 08c9d30e9227..0bed52c9f182 100644
--- a/avmedia/source/opengl/oglplayer.cxx
+++ b/avmedia/source/opengl/oglplayer.cxx
@@ -25,7 +25,6 @@ namespace avmedia { namespace ogl {
OGLPlayer::OGLPlayer()
: Player_BASE(m_aMutex)
, m_pHandle(NULL)
- , m_bIsPlayingTmp(false)
{
}
@@ -102,20 +101,18 @@ void SAL_CALL OGLPlayer::start() throw ( uno::RuntimeException, std::exception )
{
osl::MutexGuard aGuard(m_aMutex);
gltf_animation_start(m_pHandle);
- m_bIsPlayingTmp = true;
}
void SAL_CALL OGLPlayer::stop() throw ( uno::RuntimeException, std::exception )
{
osl::MutexGuard aGuard(m_aMutex);
gltf_animation_stop(m_pHandle);
- m_bIsPlayingTmp = false;
}
sal_Bool SAL_CALL OGLPlayer::isPlaying() throw ( uno::RuntimeException, std::exception )
{
osl::MutexGuard aGuard(m_aMutex);
- return m_bIsPlayingTmp; //(sal_Bool)gltf_animation_is_playing(m_pHandle)
+ return (sal_Bool)gltf_animation_is_playing(m_pHandle);
}
double SAL_CALL OGLPlayer::getDuration() throw ( uno::RuntimeException, std::exception )
@@ -139,7 +136,7 @@ double SAL_CALL OGLPlayer::getMediaTime() throw ( ::com::sun::star::uno::Runtime
double SAL_CALL OGLPlayer::getRate() throw ( uno::RuntimeException, std::exception )
{
osl::MutexGuard aGuard(m_aMutex);
- // TODO: Get the speed of stream reading (see com::sun::star::media::XPlayer)
+ // Seems unused
return 1.0;
}
@@ -179,7 +176,7 @@ sal_Bool SAL_CALL OGLPlayer::isMute() throw ( uno::RuntimeException, std::except
awt::Size SAL_CALL OGLPlayer::getPreferredPlayerWindowSize() throw ( uno::RuntimeException, std::exception )
{
- return awt::Size( 480, 360 ); // TODO: It will be good for OpenGL too?
+ return awt::Size( 480, 360 );
}
uno::Reference< media::XPlayerWindow > SAL_CALL OGLPlayer::createPlayerWindow( const uno::Sequence< uno::Any >& rArguments )
@@ -215,7 +212,7 @@ uno::Reference< media::XFrameGrabber > SAL_CALL OGLPlayer::createFrameGrabber()
m_pHandle->viewport.height = getPreferredPlayerWindowSize().Height;
gltf_renderer_set_content(m_pHandle);
OGLFrameGrabber *pFrameGrabber = new OGLFrameGrabber( m_pHandle );
- return uno::Reference< media::XFrameGrabber >( pFrameGrabber );;
+ return uno::Reference< media::XFrameGrabber >( pFrameGrabber );
}
OUString SAL_CALL OGLPlayer::getImplementationName()