diff options
26 files changed, 503 insertions, 507 deletions
diff --git a/Repository.mk b/Repository.mk index f58d9f115b83..6892ecceedfb 100644 --- a/Repository.mk +++ b/Repository.mk @@ -60,6 +60,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ sdbc \ AppleRemote \ avmedia \ + avmediaQuickTime \ basegfx \ chartcontroller \ chartmodel \ @@ -150,6 +151,8 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \ )) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ + avmediagst \ + avmediawin \ collator_data \ dict_ja \ dict_zh \ diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 08c34dc8f3f8..03ad711acd6f 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -661,6 +661,13 @@ $(call gb_LinkTarget_add_libs,$(1), \ endef +define gb_LinkTarget__use_qtkit +$(call gb_LinkTarget_add_libs,$(1), \ + -framework QTKit \ +) + +endef + define gb_LinkTarget__use_quicktime $(call gb_LinkTarget_add_libs,$(1), \ -framework QuickTime \ diff --git a/avmedia/AllLangResTarget_avmedia.mk b/avmedia/AllLangResTarget_avmedia.mk new file mode 100644 index 000000000000..c66f8da18e69 --- /dev/null +++ b/avmedia/AllLangResTarget_avmedia.mk @@ -0,0 +1,49 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Matúš Kukan <matus.kukan@gmail.com> +# Portions created by the Initial Developer are Copyright (C) 2011 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_AllLangResTarget_AllLangResTarget,avmedia)) + +$(eval $(call gb_AllLangResTarget_add_srs,avmedia,\ + avmedia/res \ +)) + +$(eval $(call gb_SrsTarget_SrsTarget,avmedia/res)) + +$(eval $(call gb_SrsTarget_set_include,avmedia/res,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/avmedia/inc) \ + -I$(realpath $(SRCDIR)/avmedia/source/framework) \ + -I$(realpath $(SRCDIR)/avmedia/source/viewer) \ +)) + +$(eval $(call gb_SrsTarget_add_files,avmedia/res,\ + avmedia/source/framework/mediacontrol.src \ + avmedia/source/viewer/mediawindow.src \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk new file mode 100644 index 000000000000..9f6bd523f1ed --- /dev/null +++ b/avmedia/Library_avmedia.mk @@ -0,0 +1,77 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Matúš Kukan <matus.kukan@gmail.com> +# Portions created by the Initial Developer are Copyright (C) 2011 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,avmedia)) + +$(eval $(call gb_Library_add_package_headers,avmedia,avmedia_inc)) + +$(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia)) + +$(eval $(call gb_Library_set_include,avmedia,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/avmedia/inc) \ + -I$(realpath $(SRCDIR)/avmedia/source/inc) \ +)) + +$(eval $(call gb_Library_add_api,avmedia,\ + udkapi \ + offapi \ +)) + +$(eval $(call gb_Library_add_defs,avmedia,\ + -DAVMEDIA_DLLIMPLEMENTATION \ +)) + +$(eval $(call gb_Library_add_linked_libs,avmedia,\ + comphelper \ + cppu \ + cppuhelper \ + sal \ + sfx \ + svl \ + svt \ + tl \ + utl \ + vcl \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_exception_objects,avmedia,\ + avmedia/source/framework/mediacontrol \ + avmedia/source/framework/mediaitem \ + avmedia/source/framework/mediamisc \ + avmedia/source/framework/mediaplayer \ + avmedia/source/framework/mediatoolbox \ + avmedia/source/framework/soundhandler \ + avmedia/source/viewer/mediaevent_impl \ + avmedia/source/viewer/mediawindowbase_impl \ + avmedia/source/viewer/mediawindow \ + avmedia/source/viewer/mediawindow_impl \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk new file mode 100644 index 000000000000..6c255945f855 --- /dev/null +++ b/avmedia/Library_avmediaQuickTime.mk @@ -0,0 +1,71 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Matúš Kukan <matus.kukan@gmail.com> +# Portions created by the Initial Developer are Copyright (C) 2011 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,avmediaQuickTime)) + +$(eval $(call gb_Library_set_componentfile,avmediaQuickTime,avmedia/source/quicktime/avmediaQuickTime)) + +$(eval $(call gb_Library_set_include,avmediaQuickTime,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/avmedia/source/inc) \ +)) + +$(eval $(call gb_Library_add_api,avmediaQuickTime,\ + udkapi \ + offapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,avmediaQuickTime,\ + comphelper \ + cppu \ + cppuhelper \ + sal \ + tl \ + vcl \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_use_externals,avmediaQuickTime,\ + cocoa \ + qtkit \ + quicktime \ +)) + +$(eval $(call gb_Library_add_exception_objects,avmediaQuickTime,\ + avmedia/source/quicktime/framegrabber \ + avmedia/source/quicktime/manager \ + avmedia/source/quicktime/player \ + avmedia/source/quicktime/quicktimeuno \ + avmedia/source/quicktime/window \ +)) + +$(eval $(call gb_Library_add_cxxflags,avmediaQuickTime,\ + $(gb_LinkTarget_OBJCXXFLAGS) \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk new file mode 100644 index 000000000000..4c014e626f42 --- /dev/null +++ b/avmedia/Library_avmediagst.mk @@ -0,0 +1,72 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Matúš Kukan <matus.kukan@gmail.com> +# Portions created by the Initial Developer are Copyright (C) 2011 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,avmediagst)) + +$(eval $(call gb_Library_set_componentfile,avmediagst,avmedia/source/gstreamer/avmediagstreamer)) + +$(eval $(call gb_Library_set_include,avmediagst,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/avmedia/source/inc) \ + $(shell pkg-config --cflags gstreamer-0.10, gstreamer-plugins-base-0.10) \ +)) + +$(eval $(call gb_Library_add_api,avmediagst,\ + udkapi \ + offapi \ +)) + +ifeq ($(GUI),WNT) +$(eval $(call gb_Library_add_defs,avmediagst,\ + -DWINNT +)) +endif + +$(eval $(call gb_Library_add_linked_libs,avmediagst,\ + comphelper \ + cppu \ + cppuhelper \ + sal \ + tl \ + vcl \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_libs,avmediagst,\ + $(shell pkg-config --libs gstreamer-0.10, gstreamer-plugins-base-0.10) \ + -lgstinterfaces-0.10 \ +)) + +$(eval $(call gb_Library_add_exception_objects,avmediagst,\ + avmedia/source/gstreamer/gstmanager \ + avmedia/source/gstreamer/gstplayer \ + avmedia/source/gstreamer/gstuno \ + avmedia/source/gstreamer/gstwindow \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk new file mode 100644 index 000000000000..bf09a03721ee --- /dev/null +++ b/avmedia/Library_avmediawin.mk @@ -0,0 +1,70 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Matúš Kukan <matus.kukan@gmail.com> +# Portions created by the Initial Developer are Copyright (C) 2011 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Library_Library,avmediawin)) + +$(eval $(call gb_Library_set_componentfile,avmediawin,avmedia/source/win/avmediawin)) + +$(eval $(call gb_Library_set_include,avmediawin,\ + $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/avmedia/source/inc) \ +)) + +$(eval $(call gb_Library_add_api,avmediawin,\ + udkapi \ + offapi \ +)) + +$(eval $(call gb_Library_add_linked_libs,avmediawin,\ + comphelper \ + cppu \ + cppuhelper \ + gdi32 \ + ole32 \ + oleaut32 \ + sal \ + tl \ + utl \ + vcl \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_Library_add_libs,avmediawin,\ + strmiids.lib \ + dxguid.lib \ +)) + +$(eval $(call gb_Library_add_exception_objects,avmediawin,\ + avmedia/source/win/framegrabber \ + avmedia/source/win/manager \ + avmedia/source/win/player \ + avmedia/source/win/window \ + avmedia/source/win/winuno \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/avmedia/source/framework/makefile.mk b/avmedia/Makefile index 4c814c534844..a1b344d72564 100755..100644 --- a/avmedia/source/framework/makefile.mk +++ b/avmedia/Makefile @@ -1,8 +1,9 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# Copyright 2000, 2011 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,33 +26,14 @@ # #************************************************************************* -PRJ=..$/.. -PRJNAME=avmedia -TARGET=framework - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Resources --------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES =\ - mediacontrol.src - -# --- Files ------------------------------------- - -SLOFILES= \ - $(EXCEPTIONSFILES) \ - $(SLO)$/mediaitem.obj \ +ifeq ($(strip $(SOLARENV)),) +$(error No environment set!) +endif -EXCEPTIONSFILES = \ - $(SLO)$/mediacontrol.obj \ - $(SLO)$/mediamisc.obj \ - $(SLO)$/mediaplayer.obj \ - $(SLO)$/mediatoolbox.obj \ - $(SLO)$/soundhandler.obj +gb_PARTIALBUILD := T +GBUILDDIR := $(SOLARENV)/gbuild +include $(GBUILDDIR)/gbuild.mk -# --- Targets ---------------------------------- +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) -.INCLUDE : target.mk +# vim: set noet sw=4 ts=4: diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk new file mode 100644 index 000000000000..729c24f0322a --- /dev/null +++ b/avmedia/Module_avmedia.mk @@ -0,0 +1,57 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Matúš Kukan <matus.kukan@gmail.com> +# Portions created by the Initial Developer are Copyright (C) 2011 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Module_Module,avmedia)) + +$(eval $(call gb_Module_add_targets,avmedia,\ + AllLangResTarget_avmedia \ + Library_avmedia \ + Package_inc \ +)) + +ifeq ($(ENABLE_GSTREAMER),TRUE) +$(eval $(call gb_Module_add_targets,avmedia,\ + Library_avmediagst \ +)) +endif + +ifeq ($(GUIBASE),aqua) +$(eval $(call gb_Module_add_targets,avmedia,\ + Library_avmediaQuickTime \ +)) +endif + +ifeq ($(OS),WNT) +ifneq ($(ENABLE_DIRECTX),) +$(eval $(call gb_Module_add_targets,avmedia,\ + Library_avmediawin \ +)) +endif +endif + +# vim: set noet sw=4 ts=4: diff --git a/avmedia/Package_inc.mk b/avmedia/Package_inc.mk new file mode 100644 index 000000000000..c245ba32cb64 --- /dev/null +++ b/avmedia/Package_inc.mk @@ -0,0 +1,37 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Matúš Kukan <matus.kukan@gmail.com> +# Portions created by the Initial Developer are Copyright (C) 2011 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_Package_Package,avmedia_inc,$(SRCDIR)/avmedia/inc)) + +$(eval $(call gb_Package_add_file,avmedia_inc,inc/avmedia/avmediadllapi.h,avmedia/avmediadllapi.h)) +$(eval $(call gb_Package_add_file,avmedia_inc,inc/avmedia/mediaitem.hxx,avmedia/mediaitem.hxx)) +$(eval $(call gb_Package_add_file,avmedia_inc,inc/avmedia/mediaplayer.hxx,avmedia/mediaplayer.hxx)) +$(eval $(call gb_Package_add_file,avmedia_inc,inc/avmedia/mediatoolbox.hxx,avmedia/mediatoolbox.hxx)) +$(eval $(call gb_Package_add_file,avmedia_inc,inc/avmedia/mediawindow.hxx,avmedia/mediawindow.hxx)) + +# vim: set noet sw=4 ts=4: diff --git a/avmedia/inc/avmedia/avmediadllapi.h b/avmedia/inc/avmedia/avmediadllapi.h new file mode 100644 index 000000000000..93bcdf920eef --- /dev/null +++ b/avmedia/inc/avmedia/avmediadllapi.h @@ -0,0 +1,16 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +#ifndef INCLUDED_AVMEDIADLLAPI_H +#define INCLUDED_AVMEDIADLLAPI_H + +#include "sal/types.h" + +#if defined(AVMEDIA_DLLIMPLEMENTATION) +#define AVMEDIA_DLLPUBLIC SAL_DLLPUBLIC_EXPORT +#else +#define AVMEDIA_DLLPUBLIC SAL_DLLPUBLIC_IMPORT +#endif +#define AVMEDIA_DLLPRIVATE SAL_DLLPRIVATE + +#endif /* INCLUDED_AVMEDIADLLAPI_H */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/avmedia/inc/avmedia/mediaitem.hxx b/avmedia/inc/avmedia/mediaitem.hxx index 4ae504fc58c9..a535040c0030 100644 --- a/avmedia/inc/avmedia/mediaitem.hxx +++ b/avmedia/inc/avmedia/mediaitem.hxx @@ -32,6 +32,7 @@ #include <tools/rtti.hxx> #include <svl/poolitem.hxx> #include <com/sun/star/media/ZoomLevel.hpp> +#include <avmedia/avmediadllapi.h> #define AVMEDIA_SETMASK_NONE ((sal_uInt32)(0x00000000)) #define AVMEDIA_SETMASK_STATE ((sal_uInt32)(0x00000001)) @@ -65,7 +66,7 @@ enum MediaState // - MediaItem - // ------------- -class MediaItem : public SfxPoolItem +class AVMEDIA_DLLPUBLIC MediaItem : public SfxPoolItem { public: TYPEINFO(); diff --git a/avmedia/inc/avmedia/mediaplayer.hxx b/avmedia/inc/avmedia/mediaplayer.hxx index 2d49f80e2af7..f11f4c070ba3 100644 --- a/avmedia/inc/avmedia/mediaplayer.hxx +++ b/avmedia/inc/avmedia/mediaplayer.hxx @@ -32,6 +32,7 @@ #include <sfx2/ctrlitem.hxx> #include <sfx2/dockwin.hxx> #include <tools/urlobj.hxx> +#include <avmedia/avmediadllapi.h> // ----------- // - Defines - @@ -50,7 +51,7 @@ namespace avmedia // - MediaPlayer - // --------------- -class MediaPlayer : public SfxChildWindow +class AVMEDIA_DLLPUBLIC MediaPlayer : public SfxChildWindow { public: MediaPlayer( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); @@ -65,7 +66,7 @@ public: class MediaWindow; -class MediaFloater : public SfxDockingWindow +class AVMEDIA_DLLPUBLIC MediaFloater : public SfxDockingWindow { public: @@ -89,7 +90,7 @@ private: long mnDummy1; long mnDummy2; - void implInit(); + AVMEDIA_DLLPRIVATE void implInit(); }; } diff --git a/avmedia/inc/avmedia/mediatoolbox.hxx b/avmedia/inc/avmedia/mediatoolbox.hxx index 3b5023a4c908..2f406ca591b2 100644 --- a/avmedia/inc/avmedia/mediatoolbox.hxx +++ b/avmedia/inc/avmedia/mediatoolbox.hxx @@ -31,6 +31,7 @@ #include <svl/lstner.hxx> #include <sfx2/tbxctrl.hxx> +#include <avmedia/avmediadllapi.h> namespace avmedia { @@ -41,7 +42,7 @@ namespace avmedia class MediaItem; -class MediaToolBoxControl : public SfxToolBoxControl +class AVMEDIA_DLLPUBLIC MediaToolBoxControl : public SfxToolBoxControl { friend class MediaToolBoxControl_Impl; @@ -57,8 +58,8 @@ public: private: - void implUpdateMediaControl(); - void implExecuteMediaControl( const MediaItem& rItem ); + AVMEDIA_DLLPUBLIC void implUpdateMediaControl(); + AVMEDIA_DLLPUBLIC void implExecuteMediaControl( const MediaItem& rItem ); }; } diff --git a/avmedia/inc/avmedia/mediawindow.hxx b/avmedia/inc/avmedia/mediawindow.hxx index aee3397c8a8f..9de4ab6bbfb0 100644 --- a/avmedia/inc/avmedia/mediawindow.hxx +++ b/avmedia/inc/avmedia/mediawindow.hxx @@ -36,6 +36,7 @@ #include <com/sun/star/media/XPlayer.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/uno/XInterface.hpp> +#include <avmedia/avmediadllapi.h> // ----------- // - Defines - @@ -72,7 +73,7 @@ namespace avmedia // - MediaWindow - // --------------- - class MediaWindow + class AVMEDIA_DLLPUBLIC MediaWindow { public: MediaWindow( Window* parent, bool bInternalMediaControl ); @@ -131,8 +132,8 @@ namespace avmedia private: // default: disabled copy/assignment - MediaWindow(const MediaWindow&); - MediaWindow& operator =( const MediaWindow& ); + AVMEDIA_DLLPRIVATE MediaWindow(const MediaWindow&); + AVMEDIA_DLLPRIVATE MediaWindow& operator =( const MediaWindow& ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxIFace; priv::MediaWindowImpl* mpImpl; diff --git a/avmedia/prj/build.lst b/avmedia/prj/build.lst index 78397f235b93..4cc76ade9f4f 100644 --- a/avmedia/prj/build.lst +++ b/avmedia/prj/build.lst @@ -1,11 +1,2 @@ av avmedia : TRANSLATIONS:translations tools sfx2 LIBXSLT:libxslt NULL -av avmedia usr1 - all av_mkout NULL -av avmedia\prj get - all av_prj NULL -av avmedia\inc get - all av_inv NULL -av avmedia\source\viewer nmake - all av_viewer NULL -av avmedia\source\framework nmake - all av_framework NULL -av avmedia\source\win nmake - all av_win NULL -av avmedia\source\java nmake - all av_java NULL -av avmedia\source\quicktime nmake - all av_quicktime NULL -av avmedia\source\gstreamer nmake - all av_gstreamer NULL -av avmedia\util nmake - all av_util av_viewer av_framework av_win av_java av_quicktime av_gstreamer NULL +av avmedia\prj nmake - all av_prj NULL diff --git a/avmedia/prj/d.lst b/avmedia/prj/d.lst index 12fea5524801..e69de29bb2d1 100644 --- a/avmedia/prj/d.lst +++ b/avmedia/prj/d.lst @@ -1,23 +0,0 @@ -mkdir: %COMMON_DEST%\bin\hid -mkdir: %COMMON_DEST%\res - -..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin\hid\*.hid -..\%__SRC%\bin\avmedia*.dll %_DEST%\bin\avmedia*.dll -..\source\java\avmedia.jar %_DEST%\bin\avmedia.jar -..\%__SRC%\lib\lib*.* %_DEST%\lib\lib*.* -..\%__SRC%\lib\*.lib %_DEST%\lib\*.lib -..\%__SRC%\bin\avmedia*.res %_DEST%\bin\avmedia*.res - -mkdir: %_DEST%\inc\avmedia - -..\inc\avmedia\mediawindow.hxx %_DEST%\inc\avmedia\mediawindow.hxx -..\inc\avmedia\mediaitem.hxx %_DEST%\inc\avmedia\mediaitem.hxx -..\inc\avmedia\mediaplayer.hxx %_DEST%\inc\avmedia\mediaplayer.hxx -..\inc\avmedia\mediatoolbox.hxx %_DEST%\inc\avmedia\mediatoolbox.hxx - -..\%__SRC%\class\avmedia.jar %_DEST%\bin\avmedia.jar -..\%__SRC%\misc\avmedia.component %_DEST%\xml\avmedia.component -..\%__SRC%\misc\avmedia.jar.component %_DEST%\xml\avmedia.jar.component -..\%__SRC%\misc\avmediaQuickTime.component %_DEST%\xml\avmediaQuickTime.component -..\%__SRC%\misc\avmediagstreamer.component %_DEST%\xml\avmediagstreamer.component -..\%__SRC%\misc\avmediawin.component %_DEST%\xml\avmediawin.component diff --git a/avmedia/source/viewer/makefile.mk b/avmedia/prj/makefile.mk index 7771d1eb0528..d30ff8a47e6b 100755..100644 --- a/avmedia/source/viewer/makefile.mk +++ b/avmedia/prj/makefile.mk @@ -1,7 +1,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -25,31 +25,16 @@ # #************************************************************************* -PRJ=..$/.. -PRJNAME=avmedia -TARGET=viewer - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Resources --------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES =\ - mediawindow.src - -# --- Files ------------------------------------- +PRJ=.. +TARGET=prj -SLOFILES= \ - $(EXCEPTIONSFILES) +.INCLUDE : settings.mk -EXCEPTIONSFILES= \ - $(SLO)$/mediaevent_impl.obj \ - $(SLO)$/mediawindow.obj \ - $(SLO)$/mediawindow_impl.obj \ - $(SLO)$/mediawindowbase_impl.obj \ - -# --- Targets ---------------------------------- +.IF "$(VERBOSE)"!="" +VERBOSEFLAG := +.ELSE +VERBOSEFLAG := -s +.ENDIF -.INCLUDE : target.mk +all: + cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog diff --git a/avmedia/source/gstreamer/exports.dxp b/avmedia/source/gstreamer/exports.dxp deleted file mode 100755 index 70033078921a..000000000000 --- a/avmedia/source/gstreamer/exports.dxp +++ /dev/null @@ -1 +0,0 @@ -component_getFactory diff --git a/avmedia/source/gstreamer/makefile.mk b/avmedia/source/gstreamer/makefile.mk deleted file mode 100755 index c87d43afb24a..000000000000 --- a/avmedia/source/gstreamer/makefile.mk +++ /dev/null @@ -1,90 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2010 Novell, Inc. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=avmedia -TARGET=avmediagst - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -.IF "$(ENABLE_GSTREAMER)" == "TRUE" - -.IF "$(verbose)"!="" || "$(VERBOSE)"!="" -CDEFS+= -DVERBOSE -.ENDIF - -PKGCONFIG_MODULES=gstreamer-0.10, gstreamer-plugins-base-0.10 -.INCLUDE: pkg_config.mk -PKGCONFIG_LIBS+=-lgstinterfaces-0.10 - -# --- Files ---------------------------------- - -.IF "$(GUI)" == "UNX" || "$(GUI)" == "WNT" - -.IF "$(GUI)" == "WNT" -CDEFS+= -DWINNT -.ENDIF - -SLOFILES= \ - $(SLO)$/gstuno.obj \ - $(SLO)$/gstmanager.obj \ - $(SLO)$/gstplayer.obj \ - $(SLO)$/gstwindow.obj - - -EXCEPTIONSFILES= \ - $(SLO)$/gstuno.obj \ - -SHL1TARGET=$(TARGET) -SHL1STDLIBS= $(CPPULIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(PKGCONFIG_LIBS) $(TOOLSLIB) $(VCLLIB) -SHL1IMPLIB=i$(TARGET) -SHL1LIBS=$(SLB)$/$(TARGET).lib -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -# on Solaris checkdll does not work: LD_LIBRARY_PATH breaks the 2 libxml2.so.2 -SHL1NOCHECK=t - -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp - -.ENDIF # UNX / WNT -.ENDIF # ENABLE_GSTREAMER - -.INCLUDE : target.mk - -.IF "$(ENABLE_GSTREAMER)" == "TRUE" -.IF "$(GUI)" == "UNX" || "$(GUI)" == "WNT" - -ALLTAR : $(MISC)/avmediagstreamer.component -$(MISC)/avmediagstreamer.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt avmediagstreamer.component - $(XSLTPROC) --nonet \ - --stringparam uri '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' \ - -o $@ $(SOLARENV)/bin/createcomponent.xslt avmediagstreamer.component - -.ENDIF # UNX / WNT -.ENDIF # ENABLE_GSTREAMER diff --git a/avmedia/source/quicktime/makefile.mk b/avmedia/source/quicktime/makefile.mk deleted file mode 100755 index 358fce491847..000000000000 --- a/avmedia/source/quicktime/makefile.mk +++ /dev/null @@ -1,93 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=avmedia -TARGET=avmediaQuickTime - -.IF "$(GUIBASE)"=="aqua" - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -.IF "$(verbose)"!="" || "$(VERBOSE)"!="" -CDEFS+= -DVERBOSE -.ENDIF - -# --- Files ---------------------------------- - -CFLAGSCXX+=$(OBJCXXFLAGS) - -SLOFILES= \ - $(SLO)$/quicktimeuno.obj \ - $(SLO)$/manager.obj \ - $(SLO)$/window.obj \ - $(SLO)$/framegrabber.obj \ - $(SLO)$/player.obj - -EXCEPTIONSFILES= \ - $(SLO)$/quicktimeuno.obj - -SHL1TARGET= $(TARGET)$(DLLPOSTFIX) - -SHL1STDLIBS= \ - $(CPPULIB) \ - $(SALLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(TOOLSLIB) \ - $(VCLLIB) - -SHL1STDLIBS+= \ - -framework Cocoa \ - -framework QTKit \ - -framework QuickTime - -# build DLL -SHL1LIBS=$(SLB)$/$(TARGET).lib -SHL1IMPLIB=i$(TARGET) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -SHL1VERSIONMAP=$(SOLARENV)/src/component.map - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.ELSE -dummy: - @echo " Nothing to build for GUIBASE=$(GUIBASE)" -.ENDIF - -ALLTAR : $(MISC)/avmediaQuickTime.component - -$(MISC)/avmediaQuickTime.component .ERRREMOVE : \ - $(SOLARENV)/bin/createcomponent.xslt avmediaQuickTime.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt avmediaQuickTime.component diff --git a/avmedia/source/win/exports.dxp b/avmedia/source/win/exports.dxp deleted file mode 100755 index 70033078921a..000000000000 --- a/avmedia/source/win/exports.dxp +++ /dev/null @@ -1 +0,0 @@ -component_getFactory diff --git a/avmedia/source/win/makefile.mk b/avmedia/source/win/makefile.mk deleted file mode 100755 index 7c6c9e14da6e..000000000000 --- a/avmedia/source/win/makefile.mk +++ /dev/null @@ -1,88 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/.. -PRJNAME=avmedia -TARGET=avmediawin - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -.IF "$(ENABLE_DIRECTX)" != "" - -.IF "$(verbose)"!="" || "$(VERBOSE)"!="" -CDEFS+= -DVERBOSE -.ENDIF - -# --- Files ---------------------------------- - -.IF "$(GUI)" == "WNT" - -SLOFILES= \ - $(SLO)$/winuno.obj \ - $(SLO)$/manager.obj \ - $(SLO)$/window.obj \ - $(SLO)$/player.obj \ - $(SLO)$/framegrabber.obj - -EXCEPTIONSFILES= \ - $(SLO)$/winuno.obj \ - $(SLO)$/framegrabber.obj - -SHL1TARGET=$(TARGET) -SHL1STDLIBS= $(CPPULIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(UNOTOOLSLIB) $(TOOLSLIB) $(VCLLIB) -SHL1IMPLIB=i$(TARGET) -SHL1LIBS=$(SLB)$/$(TARGET).lib -SHL1DEF=$(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) -DEF1EXPORTFILE=exports.dxp - -SHL1STDLIBS += $(OLE32LIB) -SHL1STDLIBS += $(OLEAUT32LIB) -SHL1STDLIBS += $(GDI32LIB) - -.IF "$(COM)"=="GCC" -SHL1STDLIBS += $(PSDK_HOME)$/lib$/strmiids.lib -.ELSE -SHL1STDLIBS += strmiids.lib -SHL1STDLIBS += dxguid.lib -.ENDIF - -.ENDIF -.ENDIF - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/avmediawin.component - -$(MISC)/avmediawin.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - avmediawin.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt avmediawin.component diff --git a/avmedia/util/hidother.src b/avmedia/util/hidother.src deleted file mode 100644 index c6d5dc07c9a5..000000000000 --- a/avmedia/util/hidother.src +++ /dev/null @@ -1,41 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "../inc/helpids.hrc" - -hidspecial HID_AVMEDIA_TOOLBOXITEM_PLAY { HelpId = HID_AVMEDIA_TOOLBOXITEM_PLAY; }; -hidspecial HID_AVMEDIA_TOOLBOXITEM_PAUSE { HelpId = HID_AVMEDIA_TOOLBOXITEM_PAUSE; }; -hidspecial HID_AVMEDIA_TOOLBOXITEM_STOP { HelpId = HID_AVMEDIA_TOOLBOXITEM_STOP; }; -hidspecial HID_AVMEDIA_TOOLBOXITEM_MUTE { HelpId = HID_AVMEDIA_TOOLBOXITEM_MUTE; }; -hidspecial HID_AVMEDIA_TOOLBOXITEM_LOOP { HelpId = HID_AVMEDIA_TOOLBOXITEM_LOOP; }; -hidspecial HID_AVMEDIA_TOOLBOXITEM_OPEN { HelpId = HID_AVMEDIA_TOOLBOXITEM_OPEN; }; -hidspecial HID_AVMEDIA_TOOLBOXITEM_INSERT { HelpId = HID_AVMEDIA_TOOLBOXITEM_INSERT; }; -hidspecial HID_AVMEDIA_ZOOMLISTBOX { HelpId = HID_AVMEDIA_ZOOMLISTBOX; }; -hidspecial HID_AVMEDIA_TIMESLIDER { HelpId = HID_AVMEDIA_TIMESLIDER; }; -hidspecial HID_AVMEDIA_TIMEEDIT { HelpId = HID_AVMEDIA_TIMEEDIT; }; -hidspecial HID_AVMEDIA_VOLUMESLIDER { HelpId = HID_AVMEDIA_VOLUMESLIDER; }; -hidspecial HID_AVMEDIA_PLAYERWINDOW { HelpId = HID_AVMEDIA_PLAYERWINDOW; }; diff --git a/avmedia/util/makefile.mk b/avmedia/util/makefile.mk deleted file mode 100755 index 06882dda3f46..000000000000 --- a/avmedia/util/makefile.mk +++ /dev/null @@ -1,91 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. -PRJNAME=avmedia -TARGET=avmedia -GEN_HID=TRUE -GEN_HID_OTHER=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Resources --------------------------------- - -RESLIB1NAME=$(TARGET) -RESLIB1IMAGES=$(PRJ)$/res -RESLIB1SRSFILES= \ - $(SRS)$/viewer.srs \ - $(SRS)$/framework.srs - -# --- Files ------------------------------------- - -LIB1TARGET=$(SLB)$/$(TARGET).lib -LIB1FILES=\ - $(SLB)$/viewer.lib \ - $(SLB)$/framework.lib - -# ========================================================================== - -SHL1TARGET=$(TARGET)$(DLLPOSTFIX) -.IF "$(COM)" == "MSC" -SHL1IMPLIB=i$(TARGET) -.ELSE -SHL1IMPLIB=$(TARGET)$(DLLPOSTFIX) -.ENDIF -SHL1STDLIBS=$(UNOTOOLSLIB) $(TOOLSLIB) $(CPPULIB) $(CPPUHELPERLIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(SVTOOLLIB) $(SVLLIB) $(SFXLIB) -SHL1DEF=$(MISC)$/$(SHL1TARGET).def -SHL1LIBS=$(SLB)$/$(TARGET).lib - -DEF1NAME=$(SHL1TARGET) -DEF1DEPN=$(MISC)$/$(SHL1TARGET).flt $(LIB1TARGET) -DEF1DES=Avmedia -DEFLIB1NAME =$(TARGET) - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - -.IF "$(depend)"=="" -$(MISC)$/$(SHL1TARGET).flt: makefile.mk - @echo ------------------------------ - @echo Making: $@ - @echo _Impl>$@ - @echo WEP>>$@ - @echo LIBMAIN>>$@ - @echo LibMain>>$@ - @echo CT>>$@ -.ENDIF - -ALLTAR : $(MISC)/avmedia.component - -$(MISC)/avmedia.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - avmedia.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt avmedia.component diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index fb54852c6e3d..b5f50a099cb6 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -40,12 +40,12 @@ GTK_TWO_FOUR=$(shell @+-$(PKG_CONFIG) --exists 'gtk+-2.0 >= 2.4.0' && echo YES) my_components = \ abp \ - avmedia \ basprov \ bib \ cached1 \ calc \ component/animations/source/animcore/animcore \ + component/avmedia/util/avmedia \ component/basctl/util/basctl \ component/basic/util/sb \ component/chart2/source/controller/chartcontroller \ @@ -290,13 +290,16 @@ my_components += component/xmlsecurity/util/xsec_xmlsec .IF "$(OS)" == "MACOSX" my_components += \ MacOSXSpell \ - avmediaQuickTime \ fps_aqua \ macab1 \ macbe1 \ component/vcl/vcl.macosx .END +.IF "$(GUIBASE)" == "aqua" +my_components += component/avmedia/source/quicktime/avmediaQuickTime +.END + .IF "$(OS)" == "WNT" my_components += \ ado \ @@ -326,7 +329,7 @@ my_components += \ .IF "$(OS)" == "WNT" && "$(ENABLE_DIRECTX)" != "" my_components += \ - avmediawin \ + component/avmedia/source/win/avmediawin \ component/canvas/source/directx/directx9canvas \ component/canvas/source/directx/gdipluscanvas .END @@ -359,7 +362,7 @@ my_components += evoab .END .IF "$(OS)" != "WNT" && "$(ENABLE_GSTREAMER)" != "" -my_components += avmediagstreamer +my_components += component/avmedia/source/gstreamer/avmediagstreamer .END my_ooo_components = mailmerge |