summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-05-28 16:40:12 +0200
committerZolnai Tamás <tamas.zolnai@collabora.com>2014-06-11 19:27:29 +0200
commit034a4c50b2aaac22caeea9a70d20d5e007b1d0cc (patch)
tree743f851d34767e929d56bb82aaa5a8916668be7a /slideshow
parent5d0ede279d68bbb1dee2a5bfe9651e605f2a62cc (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')
-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 f91be0be3c55..344062d5a00d 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);
}