summaryrefslogtreecommitdiff
path: root/slideshow/source
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2014-04-18 00:05:44 +0300
committerTor Lillqvist <tml@collabora.com>2014-04-18 00:07:20 +0300
commitbe862ff4f7239497625125067c646bf5adab7741 (patch)
tree8d5b2ff0e038e20dbe00c32f0429e5b906f84401 /slideshow/source
parent629cc605a45e75d6896b524eada2354c1d4d33a8 (diff)
Try making it possible to use --disable-avmedia for desktop platforms too
Unfinished work in progress. Change-Id: I978755d73630b8653b169a53f937c1332799e22e
Diffstat (limited to 'slideshow/source')
-rw-r--r--slideshow/source/engine/shapes/viewmediashape.cxx11
1 files changed, 9 insertions, 2 deletions
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index 7f3c2e7c8f00..135a372959b3 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_features.h>
-// must be first
#include <canvas/debug.hxx>
#include <tools/diagnose_ex.h>
#include <canvas/verbosetrace.hxx>
@@ -180,6 +180,9 @@ namespace slideshow
bool ViewMediaShape::render( const ::basegfx::B2DRectangle& rBounds ) const
{
+#if !HAVE_FEATURE_AVMEDIA
+ (void) rBounds;
+#else
::cppcanvas::CanvasSharedPtr pCanvas = mpViewLayer->getCanvas();
if( !pCanvas )
@@ -216,7 +219,7 @@ namespace slideshow
aViewState,
aRenderState );
}
-
+#endif
return true;
}
@@ -401,6 +404,9 @@ namespace slideshow
void ViewMediaShape::implInitializeMediaPlayer( const OUString& rMediaURL )
{
+#if !HAVE_FEATURE_AVMEDIA
+ (void) rMediaURL;
+#else
if( !mxPlayer.is() )
{
try
@@ -422,6 +428,7 @@ namespace slideshow
uno::Reference<uno::XInterface>() );
}
}
+#endif
}