diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-04-17 22:09:44 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-04-17 22:18:02 +0300 |
| commit | 262aa2c2e540c803196d53779fb72226a8efeb5f (patch) | |
| tree | 6e27c452faa73094b0590f493945b55ab3483f18 /svx/source/gallery2 | |
| parent | f5ccbfdc561c68099872d1abe07ac72fcddedd35 (diff) | |
More generic way to disable avmedia
Introduce a configure option --disable-avmedia. For non-desktop,
avmedia is always disabled (for now), and for desktop enabled by
default. Add AVMEDIA to BUILD_TYPE when enabled. Don't build avmedia
when disabled. Add HAVE_FEATURE_AVMEDIA to <config_features.h>. Bypass
avmedia-related code when disabled.
Change-Id: I919c6e199bff87d9f142d55dff6373f0ed217f39
Diffstat (limited to 'svx/source/gallery2')
| -rw-r--r-- | svx/source/gallery2/galtheme.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 50ec15a2178a..7352b101ef49 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> + #include "sal/config.h" #include <algorithm> @@ -1111,9 +1113,10 @@ bool GalleryTheme::InsertURL( const INetURLObject& rURL, sal_uIntPtr nInsertPos else pNewObj = (SgaObject*) new SgaObjectBmp( aGraphic, rURL, aFormat ); } +#if HAVE_FEATURE_AVMEDIA else if( ::avmedia::MediaWindow::isMediaURL( rURL.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ), ""/*TODO?*/ ) ) pNewObj = (SgaObject*) new SgaObjectSound( rURL ); - +#endif if( pNewObj && InsertObject( *pNewObj, nInsertPos ) ) bRet = true; |