diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-18 01:11:41 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-01 16:50:23 +0100 |
| commit | f9e79a91f15e10ededad0f103c4ffe0ca38fcb31 (patch) | |
| tree | 6bd058d7bc28fa48d2ae510f958beb617d1b2bb5 /slideshow | |
| parent | b8084b0dee7d28f4fc8fa92eae6171880ac3a9c8 (diff) | |
Fix --disable-avmedia for DESKTOP build
Probably additional bits can be removed, but this now passes.
Change-Id: I366bec43cfd6fb02e914c85c711b3b19586d534d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126161
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/slideshowimpl.cxx | 5 | ||||
| -rw-r--r-- | slideshow/source/engine/soundplayer.cxx | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx index 2cd77518bb19..75b15e5c7e8f 100644 --- a/slideshow/source/engine/slideshowimpl.cxx +++ b/slideshow/source/engine/slideshowimpl.cxx @@ -18,6 +18,7 @@ */ +#include <config_features.h> #include <tools/diagnose_ex.h> #include <cppuhelper/basemutex.hxx> @@ -2350,6 +2351,9 @@ std::shared_ptr<avmedia::MediaTempFile> SlideShowImpl::getMediaTempFile(const OU { std::shared_ptr<avmedia::MediaTempFile> aRet; +#if !HAVE_FEATURE_AVMEDIA + (void)aUrl; +#else if (!mxSBD.is()) return aRet; @@ -2373,6 +2377,7 @@ std::shared_ptr<avmedia::MediaTempFile> SlideShowImpl::getMediaTempFile(const OU xInStream->closeInput(); } +#endif return aRet; } diff --git a/slideshow/source/engine/soundplayer.cxx b/slideshow/source/engine/soundplayer.cxx index c9386192e8d6..c0ae300c1e78 100644 --- a/slideshow/source/engine/soundplayer.cxx +++ b/slideshow/source/engine/soundplayer.cxx @@ -18,6 +18,7 @@ */ +#include <config_features.h> #include <tools/diagnose_ex.h> #include <com/sun/star/lang/NoSupportException.hpp> @@ -90,6 +91,9 @@ namespace slideshow::internal ENSURE_OR_THROW( rComponentContext.is(), "SoundPlayer::SoundPlayer(): Invalid component context" ); +#if !HAVE_FEATURE_AVMEDIA + (void) rMediaFileManager; +#else try { if (rSoundURL.startsWithIgnoreAsciiCase("vnd.sun.star.Package:")) @@ -107,6 +111,7 @@ namespace slideshow::internal catch( uno::Exception& ) { } +#endif if( !mxPlayer.is() ) throw lang::NoSupportException( |