summaryrefslogtreecommitdiff
path: root/slideshow/source
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-05-28 16:40:12 +0200
committerJan Holesovsky <kendy@collabora.com>2014-05-27 14:54:24 +0200
commit8d40fd2e0d7c264ce38c361fe7c9a20de9a81f0a (patch)
tree4694aa55dd8704a1de2bc6f30a8b18accfabf6da /slideshow/source
parent91fb0866cad2518e5f2cbc48af0e952282fee19d (diff)
slideshow: Don't assume anything about the duration.
Let the player decide what to do when the duration is zero, and start()/stop() was called. Change-Id: I17027349e8d61f7b114e193a769402c04a64f3f3
Diffstat (limited to 'slideshow/source')
-rw-r--r--slideshow/source/engine/shapes/viewmediashape.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index d5982379deb6..ce507174cb49 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -128,7 +128,7 @@ namespace slideshow
if( !mxPlayer.is() )
implInitialize( maBounds );
- if( mxPlayer.is() && ( mxPlayer->getDuration() > 0.0 ) )
+ if (mxPlayer.is())
mxPlayer->start();
return true;
@@ -170,7 +170,7 @@ namespace slideshow
void ViewMediaShape::pauseMedia()
{
- if( mxPlayer.is() && ( mxPlayer->getDuration() > 0.0 ) )
+ if (mxPlayer.is())
mxPlayer->stop();
}
@@ -178,7 +178,7 @@ namespace slideshow
void ViewMediaShape::setMediaTime(double fTime)
{
- if( mxPlayer.is() && ( mxPlayer->getDuration() > 0.0 ) )
+ if (mxPlayer.is())
mxPlayer->setMediaTime(fTime);
}