[Libreoffice-commits] core.git: avmedia/Library_avmedia.mk avmedia/Module_avmedia.mk avmedia/source config_host.mk.in configure.ac

[jan Iversen]

 avmedia/Library_avmedia.mk      |    9 +++
 avmedia/Module_avmedia.mk       |    2 
 avmedia/source/avmediadummy.cxx |   96 ++++++++++++++++++++++++++++++++++++++++
 config_host.mk.in               |    1 
 configure.ac                    |    5 +-
 5 files changed, 112 insertions(+), 1 deletion(-)

New commits:
commit 6132e8d2868e26ffe079e540b23a408e6201d339
Author: jan Iversen <jani at libreoffice.org>
Date:   Sat Sep 23 14:49:55 2017 +0200

    iOS, dummy avmedia to satisty sdi files
    
    if disable_avmedia is defined, change avmedia
    to a dummy module.
    
    libreOfficeLight links !
    
    Change-Id: Ibb41ed3ba48cc3143f17000f1c6073611c798e53

diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index 4e3104681578..334ea70da3d2 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -19,6 +19,14 @@ $(eval $(call gb_Library_set_include,avmedia,\
 
 $(eval $(call gb_Library_use_sdk_api,avmedia,))
 
+ifeq ($(USE_AVMEDIA_DUMMY),TRUE)
+$(eval $(call gb_Library_add_exception_objects,avmedia,\
+	avmedia/source/avmediadummy \
+))
+
+else
+
+
 $(eval $(call gb_Library_add_defs,avmedia,\
 	-DAVMEDIA_DLLIMPLEMENTATION \
 ))
@@ -84,5 +92,6 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\
 	avmedia/source/viewer/mediawindow \
 	avmedia/source/viewer/mediawindow_impl \
 ))
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index deeae3979bef..8e1bd011d5e8 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_Module_add_targets,avmedia,\
 	Library_avmedia \
 ))
 
+ifneq ($(USE_AVMEDIA_DUMMY),TRUE)
 $(eval $(call gb_Module_add_l10n_targets,avmedia,\
     AllLangMoTarget_avmedia \
 ))
@@ -62,5 +63,6 @@ $(eval $(call gb_Module_add_targets,avmedia,\
 	Library_avmediaogl \
 ))
 endif
+endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/avmedia/source/avmediadummy.cxx b/avmedia/source/avmediadummy.cxx
new file mode 100644
index 000000000000..28f99d0a4dad
--- /dev/null
+++ b/avmedia/source/avmediadummy.cxx
@@ -0,0 +1,96 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include <avmedia/mediaitem.hxx>
+
+#include <com/sun/star/uno/Sequence.hxx>
+
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/embed/ElementModes.hpp>
+#include <com/sun/star/embed/XTransactedObject.hpp>
+#include <com/sun/star/document/XStorageBasedDocument.hpp>
+#include <com/sun/star/ucb/XCommandEnvironment.hpp>
+#include <com/sun/star/uri/UriReferenceFactory.hpp>
+#include <com/sun/star/uri/XUriReference.hpp>
+#include <com/sun/star/uri/XUriReferenceFactory.hpp>
+
+#include <rtl/ustrbuf.hxx>
+
+#include <ucbhelper/content.hxx>
+
+#include <comphelper/processfactory.hxx>
+#include <comphelper/storagehelper.hxx>
+#include "mediamisc.hxx"
+
+using namespace ::com::sun::star;
+
+namespace avmedia
+{
+MediaItem::MediaItem( sal_uInt16 i_nWhich, AVMediaSetMask )
+    : SfxPoolItem( i_nWhich )
+{
+}
+
+MediaItem::MediaItem( const MediaItem& rItem )
+    : SfxPoolItem( rItem )
+{
+}
+
+MediaItem::~MediaItem()
+{
+}
+
+struct MediaItem::Impl
+{
+};
+
+bool MediaItem::QueryValue( css::uno::Any&, sal_uInt8 ) const
+{
+    return false;
+}
+
+bool MediaItem::GetPresentation( SfxItemPresentation, MapUnit, MapUnit, OUString&, const IntlWrapper& ) const
+{
+    return false;
+}
+
+bool MediaItem::PutValue( const css::uno::Any&, sal_uInt8 )
+{
+  return false;
+}
+
+SfxPoolItem* MediaItem::CreateDefault()
+{
+    return new MediaItem;
+}
+
+
+SfxPoolItem* MediaItem::Clone( SfxItemPool*) const
+{
+  return nullptr;
+}
+
+bool MediaItem::operator==( const SfxPoolItem& ) const
+{
+  return false;
+}
+
+} // namespace avmedia
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/config_host.mk.in b/config_host.mk.in
index f660310b38f6..d8a7b9c14083 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -633,6 +633,7 @@ export ZLIB_CFLAGS=$(gb_SPACE)@ZLIB_CFLAGS@
 export ZLIB_LIBS=$(gb_SPACE)@ZLIB_LIBS@
 export ZMF_CFLAGS=$(gb_SPACE)@ZMF_CFLAGS@
 export ZMF_LIBS=$(gb_SPACE)@ZMF_LIBS@
+export USE_AVMEDIA_DUMMY=@USE_AVMEDIA_DUMMY@
 
 # lang-related stuff
 include $(BUILDDIR)/config_$(gb_Side)_lang.mk
diff --git a/configure.ac b/configure.ac
index 3626601363ec..77203d4b0944 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2388,10 +2388,13 @@ if test -z "$enable_avmedia"; then
     enable_avmedia=yes
 fi
 
+BUILD_TYPE="$BUILD_TYPE AVMEDIA"
 if test "$enable_avmedia" = yes; then
-    BUILD_TYPE="$BUILD_TYPE AVMEDIA"
     AC_DEFINE(HAVE_FEATURE_AVMEDIA)
+else
+    USE_AVMEDIA_DUMMY='TRUE'
 fi
+AC_SUBST(USE_AVMEDIA_DUMMY)
 
 # Decide whether to build database connectivity stuff (including
 # Base) or not. We probably don't want to on non-desktop OSes.