summaryrefslogtreecommitdiff
path: root/slideshow/source/engine/shapes/viewmediashape.cxx
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2011-12-12 19:40:38 +0100
committerMichael Stahl <mstahl@redhat.com>2011-12-12 21:53:46 +0100
commit5924454a867bd500fdc696bb9939c84425c5e025 (patch)
treeab99a45ad189265259385d68a089a5de62004b7c /slideshow/source/engine/shapes/viewmediashape.cxx
parent41927a4f2fe824dd1588c4ed0e14de0f2220c039 (diff)
slideshow: play back embedded media:
The slideshow uses the UNO API to access the drawing objects, so add a property to get the temp file URL from the media object.
Diffstat (limited to 'slideshow/source/engine/shapes/viewmediashape.cxx')
-rw-r--r--slideshow/source/engine/shapes/viewmediashape.cxx18
1 files changed, 14 insertions, 4 deletions
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index ebd4343d4ed9..5957cf6bf097 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -286,11 +286,21 @@ namespace slideshow
xPropSet.set( mxShape, uno::UNO_QUERY );
// create Player
- if( xPropSet.is() &&
- ( xPropSet->getPropertyValue(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MediaURL" ) ) ) >>=aURL ) )
+ if (xPropSet.is())
{
- implInitializeMediaPlayer( aURL );
+ if ((xPropSet->getPropertyValue(
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "PrivateTempFileURL"))) >>= aURL)
+ && aURL.getLength())
+ {
+ implInitializeMediaPlayer( aURL );
+ }
+ else if (xPropSet->getPropertyValue(
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
+ "MediaURL"))) >>= aURL)
+ {
+ implInitializeMediaPlayer( aURL );
+ }
}
// create visible object