Try making it possible to use --disable-avmedia for desktop platforms too

Unfinished work in progress.

Change-Id: I978755d73630b8653b169a53f937c1332799e22e

chart2/CppunitTest_chart2_export.mk

@@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,chart2_export, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,chart2_export, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

chart2/CppunitTest_chart2_import.mk

@@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,chart2_import, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,chart2_import, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

chart2/CppunitTest_chart2_xshape.mk

@@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,chart2_xshape, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,chart2_xshape, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

dbaccess/CppunitTest_dbaccess_dialog_save.mk

@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_use_externals,dbaccess_dialog_save,\
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,dbaccess_dialog_save, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

dbaccess/CppunitTest_dbaccess_macros_test.mk

@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_use_externals,dbaccess_macros_test,\
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

postprocess/Rdb_services.mk

@@ -218,7 +218,7 @@ $(eval $(call gb_Rdb_add_components,services,\
 	) \
 	$(if $(ENABLE_OPENGL), \
 		slideshow/source/engine/OGLTrans/ogltrans \
-		avmedia/source/opengl/avmediaogl \
+		$(call gb_Helper_optional,AVMEDIA,avmedia/source/opengl/avmediaogl) \
 	) \
 	$(if $(ENABLE_TDE), \
 		shell/source/backends/kdebe/tdebe1 \

sc/CppunitTest_sc_annotationobj.mk

@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_annotationobj, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_annotationobj, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sc/CppunitTest_sc_annotationshapeobj.mk

@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_annonationshapeobj, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_annonationshapeobj, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sc/CppunitTest_sc_annotationsobj.mk

@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_annotationsobj, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_annotationsobj, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sc/CppunitTest_sc_cellrangeobj.mk

@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_cellrangeobj, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_cellrangeobj, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sc/CppunitTest_sc_chart_regression_test.mk

@@ -14,7 +14,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_chart_regression_test, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_chart_regression_test, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sc/CppunitTest_sc_databaserangeobj.mk

@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_databaserangeobj, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_databaserangeobj, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sc/CppunitTest_sc_datapilotfieldobj.mk

@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilotfieldobj, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_datapilotfieldobj, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sc/CppunitTest_sc_datapilottableobj.mk

@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_datapilottableobj, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_datapilottableobj, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sc/CppunitTest_sc_editfieldobj_cell.mk

@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_editfieldobj_cell, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_cell, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sc/CppunitTest_sc_editfieldobj_header.mk

@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_editfieldobj_header, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_editfieldobj_header, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sc/CppunitTest_sc_filters_test.mk

@@ -27,7 +27,6 @@ $(eval $(call gb_CppunitTest_use_externals,sc_filters_test, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_filters_test, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sc/CppunitTest_sc_macros_test.mk

@@ -19,7 +19,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_macros_test, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_macros_test, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sc/CppunitTest_sc_modelobj.mk

@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_modelobj, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_modelobj, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sc/CppunitTest_sc_namedrangeobj.mk

@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_namedrangeobj, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangeobj, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sc/CppunitTest_sc_namedrangesobj.mk

@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_namedrangesobj, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_namedrangesobj, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sc/CppunitTest_sc_opencl_test.mk

@@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_use_externals,sc_opencl_test, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_opencl_test, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sc/CppunitTest_sc_outlineobj.mk

@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_outlineobj, \
 $(eval $(call gb_CppunitTest_use_external,sc_outlineobj,boost_headers))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_outlineobj, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sc/CppunitTest_sc_rangelst_test.mk

@@ -29,7 +29,6 @@ $(eval $(call gb_CppunitTest_use_library_objects,sc_rangelst_test, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_rangelst_test, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sc/CppunitTest_sc_subsequent_export_test.mk

@@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_use_externals,sc_subsequent_export_test, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_export_test, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sc/CppunitTest_sc_subsequent_filters_test.mk

@@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_use_externals,sc_subsequent_filters_test, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_subsequent_filters_test, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sc/CppunitTest_sc_tableautoformatfield.mk

@@ -16,7 +16,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_tableautoformatfield, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_tableautoformatfield, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sc/CppunitTest_sc_tablesheetobj.mk

@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_tablesheetobj, \
 $(eval $(call gb_CppunitTest_use_external,sc_tablesheetobj,boost_headers))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_tablesheetobj, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sc/CppunitTest_sc_tablesheetsobj.mk

@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sc_tablesheetsobj, \
 $(eval $(call gb_CppunitTest_use_external,sc_tablesheetsobj,boost_headers))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_tablesheetsobj, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sc/CppunitTest_sc_ucalc.mk

@@ -40,7 +40,7 @@ $(eval $(call gb_CppunitTest_use_externals,sc_ucalc,\
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sc_ucalc, \
-    avmedia \
+	$(call gb_Helper_optional,AVMEDIA,avmedia) \
     basegfx \
     comphelper \
     cppu \

sd/CppunitTest_sd_filters_test.mk

@@ -24,7 +24,6 @@ $(eval $(call gb_CppunitTest_add_defs,sd_filters_test,\
 endif
 
 $(eval $(call gb_CppunitTest_use_libraries,sd_filters_test, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sd/CppunitTest_sd_html_export_tests.mk

@@ -21,7 +21,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sd_html_export_tests, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sd_html_export_tests, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sd/CppunitTest_sd_import_tests.mk

@@ -18,7 +18,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sd_import_tests, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sd_import_tests, \
-    avmedia \
+	$(call gb_Helper_optional,AVMEDIA,avmedia) \
     basegfx \
     comphelper \
     cppu \

sd/CppunitTest_sd_uimpress.mk

@@ -22,7 +22,7 @@ $(eval $(call gb_CppunitTest_use_api,sd_uimpress,\
 $(eval $(call gb_CppunitTest_use_library_objects,sd_uimpress,sd))
 
 $(eval $(call gb_CppunitTest_use_libraries,sd_uimpress,\
-    avmedia \
+	$(call gb_Helper_optional,AVMEDIA,avmedia) \
     basegfx \
     canvastools \
     comphelper \

slideshow/CppunitTest_slideshow.mk

@@ -36,7 +36,6 @@ $(eval $(call gb_CppunitTest_use_api,slideshow,\
 $(eval $(call gb_CppunitTest_use_library_objects,slideshow,slideshow))
 
 $(eval $(call gb_CppunitTest_use_libraries,slideshow,\
-    avmedia \
     basegfx \
     canvastools \
     comphelper \

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
         }
 
 

sw/CppunitTest_sw_layout_test.mk

@@ -16,7 +16,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_layout_test, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sw_layout_test, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sw/CppunitTest_sw_macros_test.mk

@@ -18,7 +18,6 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_macros_test, \
 ))
 
 $(eval $(call gb_CppunitTest_use_libraries,sw_macros_test, \
-    avmedia \
     basegfx \
     comphelper \
     cppu \

sw/CppunitTest_sw_uwriter.mk

@@ -19,7 +19,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,sw_uwriter, \
 $(eval $(call gb_CppunitTest_use_library_objects,sw_uwriter,sw))
 
 $(eval $(call gb_CppunitTest_use_libraries,sw_uwriter, \
-    avmedia \
+	$(call gb_Helper_optional,AVMEDIA,avmedia) \
     basegfx \
     comphelper \
     cppu \