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>

3 files changed, 17 insertions, 112 deletions

diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index b27b9bae8c80..420bbded8178 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -9,15 +9,16 @@
 
 $(eval $(call gb_Library_Library,avmedia))
 
-$(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
-
 $(eval $(call gb_Library_set_include,avmedia,\
 	$$(INCLUDE) \
 	-I$(SRCDIR)/avmedia/inc \
 	-I$(SRCDIR)/avmedia/source/inc \
 ))
 
-$(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
+$(eval $(call gb_Library_use_libraries,avmedia,\
+    sal \
+    svl \
+))
 
 $(eval $(call gb_Library_use_sdk_api,avmedia,))
 
@@ -25,35 +26,30 @@ $(eval $(call gb_Library_use_externals,avmedia,\
 	boost_headers \
 ))
 
-ifeq ($(USE_AVMEDIA_DUMMY),TRUE)
-$(eval $(call gb_Library_add_exception_objects,avmedia,\
-	avmedia/source/avmediadummy \
+$(eval $(call gb_Library_add_defs,avmedia,\
+    -DAVMEDIA_DLLIMPLEMENTATION \
 ))
 
-
-else
-
-
-$(eval $(call gb_Library_add_defs,avmedia,\
-	-DAVMEDIA_DLLIMPLEMENTATION \
+$(eval $(call gb_Library_add_exception_objects,avmedia,\
+    avmedia/source/framework/mediaitem \
 ))
 
+ifneq (,$(filter AVMEDIA,$(BUILD_TYPE)))
+
 ifeq ($(DISABLE_GUI),)
 $(eval $(call gb_Library_use_externals,avmedia,\
     epoxy \
 ))
-endif
 
+$(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
 
 $(eval $(call gb_Library_use_libraries,avmedia,\
 	comphelper \
 	ucbhelper \
 	cppu \
 	cppuhelper \
-	sal \
 	i18nlangtag \
 	sfx \
-	svl \
 	svt \
 	tl \
 	utl \
@@ -63,7 +59,6 @@ $(eval $(call gb_Library_use_libraries,avmedia,\
 $(eval $(call gb_Library_add_exception_objects,avmedia,\
 	avmedia/source/framework/mediacontrol \
 	avmedia/source/framework/MediaControlBase \
-	avmedia/source/framework/mediaitem \
 	avmedia/source/framework/mediaplayer \
 	avmedia/source/framework/mediatoolbox \
 	avmedia/source/framework/soundhandler \
@@ -71,6 +66,8 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\
 	avmedia/source/viewer/mediawindow \
 	avmedia/source/viewer/mediawindow_impl \
 ))
-endif
+
+endif # !DISABLE_GUI
+endif # AVMEDIA
 
 # vim: set noet sw=4 ts=4:
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index aeb3176544bf..d01201582a78 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -13,7 +13,8 @@ $(eval $(call gb_Module_add_targets,avmedia,\
 	Library_avmedia \
 ))
 
-ifneq ($(USE_AVMEDIA_DUMMY),TRUE)
+ifneq (,$(filter AVMEDIA,$(BUILD_TYPE)))
+
 $(eval $(call gb_Module_add_l10n_targets,avmedia,\
     AllLangMoTarget_avmedia \
 ))
@@ -36,6 +37,6 @@ $(eval $(call gb_Module_add_targets,avmedia,\
 ))
 endif
 
-endif
+endif # AVMEDIA
 
 # vim: set noet sw=4 ts=4:
diff --git a/avmedia/source/avmediadummy.cxx b/avmedia/source/avmediadummy.cxx
deleted file mode 100644
index 823cc6ec9f80..000000000000
--- a/avmedia/source/avmediadummy.cxx
+++ /dev/null
@@ -1,93 +0,0 @@
-/* -*- 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/uno/XComponentContext.hpp>
-
-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;
-}
-
-AVMediaSetMask MediaItem::getMaskSet() const
-{
-    (void) this;                // Silence loplugin:staticmethods
-    return AVMediaSetMask::NONE;
-}
-
-SfxPoolItem* MediaItem::CreateDefault()
-{
-    return new MediaItem;
-}
-
-
-MediaItem* MediaItem::Clone( SfxItemPool*) const
-{
-  return nullptr;
-}
-
-bool MediaItem::operator==( const SfxPoolItem& rItem ) const
-{
-    assert(SfxPoolItem::operator==(rItem)); (void)rItem;
-    return false;
-}
-
-} // namespace avmedia
-
-extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
-com_sun_star_comp_framework_SoundHandler_get_implementation(css::uno::XComponentContext*,
-                                                            css::uno::Sequence<css::uno::Any> const &)
-{
-    return nullptr;
-}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */