[Libreoffice-commits] .: 2 commits - avmedia/AllLangResTarget_avmedia.mk avmedia/inc avmedia/Library_avmediagst.mk avmedia/Library_avmedia.mk avmedia/Library_avmediaQuickTime.mk avmedia/Library_avmediawin.mk avmedia/Makefile avmedia/Module_avmedia.mk avmedia/Package_inc.mk avmedia/prj avmedia/source avmedia/util postprocess/packcomponents RepositoryExternal.mk Repository.mk scp2/source
Matus Kukan
mkukan at kemper.freedesktop.org
Mon Aug 22 06:19:12 PDT 2011
Repository.mk | 3
RepositoryExternal.mk | 7
avmedia/AllLangResTarget_avmedia.mk | 49 +
avmedia/Library_avmedia.mk | 77 ++
avmedia/Library_avmediaQuickTime.mk | 71 ++
avmedia/Library_avmediagst.mk | 72 ++
avmedia/Library_avmediawin.mk | 70 ++
avmedia/Makefile | 39 +
avmedia/Module_avmedia.mk | 57 ++
avmedia/Package_inc.mk | 37 +
avmedia/inc/avmedia/avmediadllapi.h | 16
avmedia/inc/avmedia/mediaitem.hxx | 3
avmedia/inc/avmedia/mediaplayer.hxx | 7
avmedia/inc/avmedia/mediatoolbox.hxx | 7
avmedia/inc/avmedia/mediawindow.hxx | 7
avmedia/prj/build.lst | 11
avmedia/prj/d.lst | 23
avmedia/prj/makefile.mk | 40 +
avmedia/source/framework/makefile.mk | 57 --
avmedia/source/gstreamer/exports.dxp | 1
avmedia/source/gstreamer/makefile.mk | 90 ---
avmedia/source/java/FrameGrabber.java | 190 -------
avmedia/source/java/Manager.java | 148 -----
avmedia/source/java/MediaUno.java | 67 --
avmedia/source/java/Player.java | 325 ------------
avmedia/source/java/PlayerWindow.java | 600 -----------------------
avmedia/source/java/WindowAdapter.java | 496 -------------------
avmedia/source/java/avmedia.jar.component | 34 -
avmedia/source/java/makefile.mk | 69 --
avmedia/source/java/manifest | 2
avmedia/source/java/win/SystemWindowAdapter.java | 53 --
avmedia/source/java/x11/SystemWindowAdapter.java | 123 ----
avmedia/source/quicktime/makefile.mk | 93 ---
avmedia/source/viewer/makefile.mk | 55 --
avmedia/source/win/exports.dxp | 1
avmedia/source/win/makefile.mk | 88 ---
avmedia/util/hidother.src | 41 -
avmedia/util/makefile.mk | 91 ---
dev/null |binary
postprocess/packcomponents/makefile.mk | 15
scp2/source/ooo/file_library_ooo.scp | 6
scp2/source/ooo/module_hidden_ooo.scp | 1
42 files changed, 560 insertions(+), 2682 deletions(-)
New commits:
commit e85875b9018cc7c286ff9d40789d15e003ca9845
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Wed Aug 3 15:08:56 2011 +0200
convert avmedia to gbuild
diff --git a/Repository.mk b/Repository.mk
index f58d9f1..6892ecc 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 08c34dc..03ad711 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 0000000..c66f8da
--- /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 at 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 0000000..9f6bd52
--- /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 at 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 0000000..6c25594
--- /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 at 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 0000000..4c014e6
--- /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 at 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 0000000..bf09a03
--- /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 at 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/Makefile b/avmedia/Makefile
new file mode 100644
index 0000000..a1b344d
--- /dev/null
+++ b/avmedia/Makefile
@@ -0,0 +1,39 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.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 0000000..729c24f
--- /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 at 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 0000000..c245ba3
--- /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 at 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 0000000..93bcdf9
--- /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 4ae504f..a535040 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 2d49f80..f11f4c0 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 3b5023a..2f406ca 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 aee3397..9de4ab6 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 78397f2..4cc76ad 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 12fea55..e69de29 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/prj/makefile.mk b/avmedia/prj/makefile.mk
new file mode 100644
index 0000000..d30ff8a
--- /dev/null
+++ b/avmedia/prj/makefile.mk
@@ -0,0 +1,40 @@
+#*************************************************************************
+#
+# 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=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/avmedia/source/framework/makefile.mk b/avmedia/source/framework/makefile.mk
deleted file mode 100755
index 4c814c5..0000000
--- a/avmedia/source/framework/makefile.mk
+++ /dev/null
@@ -1,57 +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=framework
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Resources ---------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =\
- mediacontrol.src
-
-# --- Files -------------------------------------
-
-SLOFILES= \
- $(EXCEPTIONSFILES) \
- $(SLO)$/mediaitem.obj \
-
-EXCEPTIONSFILES = \
- $(SLO)$/mediacontrol.obj \
- $(SLO)$/mediamisc.obj \
- $(SLO)$/mediaplayer.obj \
- $(SLO)$/mediatoolbox.obj \
- $(SLO)$/soundhandler.obj
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
diff --git a/avmedia/source/gstreamer/exports.dxp b/avmedia/source/gstreamer/exports.dxp
deleted file mode 100755
index 7003307..0000000
--- 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 c87d43a..0000000
--- 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 358fce4..0000000
--- 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/viewer/makefile.mk b/avmedia/source/viewer/makefile.mk
deleted file mode 100755
index 7771d1e..0000000
--- a/avmedia/source/viewer/makefile.mk
+++ /dev/null
@@ -1,55 +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=viewer
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Resources ---------------------------------
-
-SRS1NAME=$(TARGET)
-SRC1FILES =\
- mediawindow.src
-
-# --- Files -------------------------------------
-
-SLOFILES= \
- $(EXCEPTIONSFILES)
-
-EXCEPTIONSFILES= \
- $(SLO)$/mediaevent_impl.obj \
- $(SLO)$/mediawindow.obj \
- $(SLO)$/mediawindow_impl.obj \
- $(SLO)$/mediawindowbase_impl.obj \
-
-# --- Targets ----------------------------------
-
-.INCLUDE : target.mk
diff --git a/avmedia/source/win/exports.dxp b/avmedia/source/win/exports.dxp
deleted file mode 100755
index 7003307..0000000
--- 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 7c6c9e1..0000000
--- 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 c6d5dc0..0000000
--- 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 06882dd..0000000
--- 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 fb54852..b5f50a0 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
commit fee5ca25dcb18cbdcfb9406905ece5d65d21b88e
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Mon Aug 22 13:08:07 2011 +0200
remove Java piece from avmedia
diff --git a/avmedia/source/java/FrameGrabber.java b/avmedia/source/java/FrameGrabber.java
deleted file mode 100755
index 1a0deda..0000000
--- a/avmedia/source/java/FrameGrabber.java
+++ /dev/null
@@ -1,190 +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.
- *
- ************************************************************************/
-
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XComponentContext;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.IQueryInterface;
-import com.sun.star.lang.XInitialization;
-import com.sun.star.lang.XEventListener;
-import com.sun.star.awt.*;
-import com.sun.star.media.*;
-import com.sun.star.graphic.*;
-
-// -----------------
-// - Player Window -
-// -----------------
-
-public class FrameGrabber implements com.sun.star.lang.XServiceInfo,
- com.sun.star.media.XFrameGrabber
-{
- private com.sun.star.lang.XMultiServiceFactory maFactory = null;
- private javax.media.Player maPlayer = null;
- private javax.media.control.FrameGrabbingControl maFrameGrabbingControl = null;
-
- // -------------------------------------------------------------------------
-
- public FrameGrabber( com.sun.star.lang.XMultiServiceFactory aFactory, String aURL )
- {
- maFactory = aFactory;
-
- try
- {
- maPlayer = javax.media.Manager.createRealizedPlayer( new java.net.URL( aURL ) );
- }
- catch( java.net.MalformedURLException e )
- {
- }
- catch( java.io.IOException e )
- {
- }
- catch( javax.media.NoPlayerException e )
- {
- }
- catch( javax.media.CannotRealizeException e )
- {
- }
- catch( java.lang.Exception e )
- {
- }
-
- if( maPlayer != null )
- {
- maFrameGrabbingControl = (javax.media.control.FrameGrabbingControl) maPlayer.getControl(
- "javax.media.control.FrameGrabbingControl" );
- }
- }
-
- // -------------------------------------------------------------------------
-
- public com.sun.star.graphic.XGraphic implImageToXGraphic( java.awt.Image aImage )
- {
- com.sun.star.graphic.XGraphic aRet = null;
-
- if( maFactory != null && aImage != null )
- {
- if( aImage instanceof java.awt.image.BufferedImage )
- {
- java.io.File aTempFile = null;
-
- try
- {
- aTempFile = java.io.File.createTempFile( "sv0", ".png" );
-
- if( aTempFile.canWrite() )
- {
- javax.imageio.ImageIO.write( (java.awt.image.BufferedImage) aImage, "png", aTempFile );
-
- com.sun.star.graphic.XGraphicProvider aProvider =
- (com.sun.star.graphic.XGraphicProvider) UnoRuntime.queryInterface(
- com.sun.star.graphic.XGraphicProvider.class,
- maFactory.createInstance("com.sun.star.graphic.GraphicProvider") );
-
- if( aProvider != null )
- {
- com.sun.star.beans.PropertyValue[] aArgs = new com.sun.star.beans.PropertyValue[ 1 ];
-
- aArgs[ 0 ] = new com.sun.star.beans.PropertyValue();
- aArgs[ 0 ].Name = "URL";
- aArgs[ 0 ].Value = "file://" + aTempFile.toString();
-
- aRet = aProvider.queryGraphic( aArgs );
- }
- }
- }
- catch( java.lang.IllegalArgumentException aExcp )
- {
- }
- catch( java.io.IOException aExcp )
- {
- }
- catch( com.sun.star.uno.Exception aExcp )
- {
- }
-
- if( aTempFile != null )
- aTempFile.delete();
- }
- }
-
- return aRet;
- }
-
- // -----------------
- // - XFrameGrabber -
- // -----------------
-
- public synchronized com.sun.star.graphic.XGraphic grabFrame( double fMediaTime )
- {
- com.sun.star.graphic.XGraphic aRet = null;
-
- if( maFrameGrabbingControl != null )
- {
- if( fMediaTime >= 0.0 && fMediaTime <= maPlayer.getDuration().getSeconds() )
- {
- maPlayer.setMediaTime( new javax.media.Time( fMediaTime ) );
-
- javax.media.Buffer aBuffer = maFrameGrabbingControl.grabFrame();
-
- if( aBuffer != null && aBuffer.getFormat() instanceof javax.media.format.VideoFormat )
- {
- aRet = implImageToXGraphic( new javax.media.util.BufferToImage(
- (javax.media.format.VideoFormat) aBuffer.getFormat() ).
- createImage( aBuffer ) );
- }
- }
- }
-
- return aRet;
- }
-
- // ----------------
- // - XServiceInfo -
- // ----------------
-
- private static final String s_implName = "com.sun.star.comp.FrameGrabber_Java";
- private static final String s_serviceName = "com.sun.star.media.FrameGrabber_Java";
-
- public synchronized String getImplementationName()
- {
- return s_implName;
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized String [] getSupportedServiceNames()
- {
- return new String [] { s_serviceName };
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized boolean supportsService( String serviceName )
- {
- return serviceName.equals( s_serviceName );
- }
-}
diff --git a/avmedia/source/java/Manager.java b/avmedia/source/java/Manager.java
deleted file mode 100755
index 4770747..0000000
--- a/avmedia/source/java/Manager.java
+++ /dev/null
@@ -1,148 +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.
- *
- ************************************************************************/
-
-// UNO
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XComponentContext;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.IQueryInterface;
-import com.sun.star.lang.XInitialization;
-
-// media
-import com.sun.star.media.*;
-
-public class Manager implements com.sun.star.lang.XServiceInfo,
- com.sun.star.lang.XTypeProvider,
- com.sun.star.media.XManager
-
-{
- private com.sun.star.lang.XMultiServiceFactory maFactory;
-
- // -------------------------------------------------------------------------
-
- public Manager( com.sun.star.lang.XMultiServiceFactory aFactory )
- {
- maFactory = aFactory;
- }
-
- // ------------
- // - XManager -
- // ------------
-
- public com.sun.star.media.XPlayer createPlayer( String aURL )
- {
- javax.media.Player aPlayer = null;
-
- try
- {
- aPlayer = javax.media.Manager.createRealizedPlayer( new java.net.URL( aURL ) );
- }
- catch( java.net.MalformedURLException e )
- {
- }
- catch( java.io.IOException e )
- {
- }
- catch( javax.media.NoPlayerException e )
- {
- }
- catch( javax.media.CannotRealizeException e )
- {
- }
- catch( java.lang.Exception e )
- {
- }
-
- if( aPlayer != null )
- {
- return new Player( maFactory, aPlayer, aURL );
- }
- else
- return null;
- }
-
- // ----------------
- // - XServiceInfo -
- // ----------------
-
- private static final String s_implName = "com.sun.star.comp.media.Manager_Java";
- private static final String s_serviceName = "com.sun.star.media.Manager_Java";
-
- public synchronized String getImplementationName()
- {
- return s_implName;
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized String [] getSupportedServiceNames()
- {
- return new String [] { s_serviceName };
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized boolean supportsService( String serviceName )
- {
- return serviceName.equals( s_serviceName );
- }
-
- // -----------------
- // - XTypeProvider -
- // -----------------
- protected byte[] maImplementationId;
-
- public com.sun.star.uno.Type[] getTypes()
- {
- com.sun.star.uno.Type[] retValue = new com.sun.star.uno.Type[ 3 ];
-
- retValue[ 0 ]= new com.sun.star.uno.Type( com.sun.star.lang.XServiceInfo.class );
- retValue[ 1 ]= new com.sun.star.uno.Type( com.sun.star.lang.XTypeProvider.class );
- retValue[ 2 ]= new com.sun.star.uno.Type( com.sun.star.media.XManager.class );
-
- return retValue;
- }
-
- // -------------------------------------------------------------------------
-
- synchronized public byte[] getImplementationId()
- {
- if( maImplementationId == null)
- {
- maImplementationId = new byte[ 16 ];
-
- int hash = hashCode();
-
- maImplementationId[ 0 ] = (byte)(hash & 0xff);
- maImplementationId[ 1 ] = (byte)((hash >>> 8) & 0xff);
- maImplementationId[ 2 ] = (byte)((hash >>> 16) & 0xff);
- maImplementationId[ 3 ] = (byte)((hash >>>24) & 0xff);
- }
-
- return maImplementationId;
- }
-}
diff --git a/avmedia/source/java/MediaUno.java b/avmedia/source/java/MediaUno.java
deleted file mode 100755
index 3e43878..0000000
--- a/avmedia/source/java/MediaUno.java
+++ /dev/null
@@ -1,67 +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.
- *
- ************************************************************************/
-
-// UNO
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XComponentContext;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.IQueryInterface;
-import com.sun.star.lang.XInitialization;
-
-public class MediaUno
-{
- private static final String s_implName = "com.sun.star.comp.media.Manager_Java";
- private static final String s_serviceName = "com.sun.star.media.Manager_Java";
-
- // -------------------------------------------------------------------------
-
- public MediaUno()
- {
- }
-
- // -------------------------------------------------------------------------
-
- public static com.sun.star.lang.XSingleServiceFactory __getServiceFactory(
- String implName,
- com.sun.star.lang.XMultiServiceFactory multiFactory,
- com.sun.star.registry.XRegistryKey regKey )
- {
- if (implName.equals( s_implName ))
- {
- try
- {
- return com.sun.star.comp.loader.FactoryHelper.getServiceFactory(
- Class.forName( "Manager" ), s_serviceName, multiFactory, regKey );
- }
- catch( java.lang.ClassNotFoundException exception )
- {
- }
- }
-
- return null;
- }
-}
diff --git a/avmedia/source/java/Player.java b/avmedia/source/java/Player.java
deleted file mode 100755
index be3b3d6..0000000
--- a/avmedia/source/java/Player.java
+++ /dev/null
@@ -1,325 +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.
- *
- ************************************************************************/
-
-// UNO
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XComponentContext;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.IQueryInterface;
-import com.sun.star.lang.XInitialization;
-
-// awt
-import com.sun.star.awt.*;
-
-// media
-import com.sun.star.media.*;
-
-public class Player implements javax.media.ControllerListener,
- com.sun.star.lang.XServiceInfo,
- com.sun.star.media.XPlayer,
- com.sun.star.lang.XComponent
-
-
-{
- private com.sun.star.lang.XMultiServiceFactory maFactory;
- private String maURL;
- private javax.media.Player maPlayer;
- private javax.media.GainControl maGainControl;
- private boolean mbStarted = false;
- private boolean mbLooping = false;
-
- // -------------------------------------------------------------------------
-
- public Player( com.sun.star.lang.XMultiServiceFactory aFactory,
- javax.media.Player aPlayer, String aURL )
- {
- maFactory = aFactory;
- maURL = aURL;
- maPlayer = aPlayer;
- maPlayer.addControllerListener( this );
- maGainControl = maPlayer.getGainControl();
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void controllerUpdate( javax.media.ControllerEvent aEvt )
- {
- if( aEvt instanceof javax.media.EndOfMediaEvent ||
- aEvt instanceof javax.media.StopAtTimeEvent )
- {
- mbStarted = false;
-
- if( mbLooping )
- {
- setMediaTime( 0.0 );
- start();
- }
- else if( aEvt instanceof javax.media.EndOfMediaEvent )
- setMediaTime( getDuration() );
- }
- }
-
- // -----------
- // - XPlayer -
- // -----------
-
- public synchronized void start()
- {
- if( !mbStarted )
- {
- maPlayer.start();
- mbStarted = true;
- }
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void stop()
- {
- if( mbStarted )
- {
- maPlayer.stop();
- mbStarted = false;
- }
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized boolean isPlaying()
- {
- return mbStarted;
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized double getDuration()
- {
- return maPlayer.getDuration().getSeconds();
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void setMediaTime( double fTime )
- {
- if( fTime >= 0.0 && fTime <= getDuration() )
- maPlayer.setMediaTime( new javax.media.Time( fTime ) );
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized double getMediaTime()
- {
- return maPlayer.getMediaTime().getSeconds();
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void setStopTime( double fTime )
- {
- boolean bOldStarted = mbStarted;
-
- if( mbStarted )
- stop();
-
- maPlayer.setStopTime( new javax.media.Time( fTime ) );
-
- if( bOldStarted )
- start();
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized double getStopTime()
- {
- return maPlayer.getStopTime().getSeconds();
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void setRate( double fRate )
- {
- boolean bOldStarted = mbStarted;
-
- if( mbStarted )
- stop();
-
- maPlayer.setRate( (float) fRate );
-
- if( bOldStarted )
- start();
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized double getRate()
- {
- return (double) maPlayer.getRate();
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void setPlaybackLoop( boolean bSet )
- {
- mbLooping = bSet;
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized boolean isPlaybackLoop()
- {
- return mbLooping;
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void setVolumeDB( short nVolumeDB )
- {
- if( maGainControl != null )
- maGainControl.setDB( nVolumeDB );
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized short getVolumeDB()
- {
- return( maGainControl != null ? (short) maGainControl.getDB() : 0 );
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void setMute( boolean bSet )
- {
- if( maGainControl != null )
- maGainControl.setMute( bSet );
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized boolean isMute()
- {
- return( maGainControl != null ? maGainControl.getMute() : false );
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized com.sun.star.awt.Size getPreferredPlayerWindowSize()
- {
- java.awt.Component aVisualComponent = maPlayer.getVisualComponent();
- com.sun.star.awt.Size aSize = new com.sun.star.awt.Size( 0, 0 );
-
- if( aVisualComponent != null )
- {
- java.awt.Dimension aDim = aVisualComponent.getPreferredSize();
-
- aSize.Width = Math.max( aDim.width, 0 );
- aSize.Height = Math.max( aDim.height, 0 );
- }
-
- return aSize;
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized com.sun.star.media.XPlayerWindow createPlayerWindow( java.lang.Object[] aArgs )
- {
- try
- {
- com.sun.star.media.XPlayerWindow xPlayerWindow = ( ( ( aArgs.length > 1 ) && ( AnyConverter.toInt( aArgs[ 0 ] ) > 0 ) ) ?
- new PlayerWindow( maFactory, aArgs, maPlayer ) :
- null );
-
- // check if it is a real player window (video window)
- if( xPlayerWindow != null && xPlayerWindow.getZoomLevel() == com.sun.star.media.ZoomLevel.NOT_AVAILABLE )
- xPlayerWindow = null;
-
- return xPlayerWindow;
- }
- catch( com.sun.star.lang.IllegalArgumentException e )
- {
- return null;
- }
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized com.sun.star.media.XFrameGrabber createFrameGrabber()
- {
- return( (com.sun.star.media.XFrameGrabber) new FrameGrabber( maFactory, maURL ) );
- }
-
- // --------------
- // - XComponent -
- // --------------
-
- public synchronized void addEventListener( com.sun.star.lang.XEventListener xListener )
- {
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void removeEventListener( com.sun.star.lang.XEventListener xListener )
- {
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void dispose()
- {
- if( maPlayer != null )
- {
- maPlayer.stop();
- maPlayer.close();
- maPlayer = null;
- }
- }
-
- // ----------------
- // - XServiceInfo -
- // ----------------
-
- private static final String s_implName = "com.sun.star.comp.Player_Java";
- private static final String s_serviceName = "com.sun.star.media.Player_Java";
-
- public synchronized String getImplementationName()
- {
- return s_implName;
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized String [] getSupportedServiceNames()
- {
- return new String [] { s_serviceName };
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized boolean supportsService( String serviceName )
- {
- return serviceName.equals( s_serviceName );
- }
-}
diff --git a/avmedia/source/java/PlayerWindow.java b/avmedia/source/java/PlayerWindow.java
deleted file mode 100755
index 2229e4f..0000000
--- a/avmedia/source/java/PlayerWindow.java
+++ /dev/null
@@ -1,600 +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.
- *
- ************************************************************************/
-
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XComponentContext;
-import com.sun.star.uno.AnyConverter;
-import com.sun.star.uno.IQueryInterface;
-import com.sun.star.lang.XInitialization;
-import com.sun.star.lang.XEventListener;
-import com.sun.star.awt.*;
-import com.sun.star.media.*;
-
-// -----------------
-// - Player Window -
-// -----------------
-
-public class PlayerWindow implements java.awt.event.KeyListener,
- java.awt.event.MouseListener,
- java.awt.event.MouseMotionListener,
- java.awt.event.FocusListener,
- com.sun.star.lang.XServiceInfo,
- com.sun.star.media.XPlayerWindow
-{
- private com.sun.star.lang.XMultiServiceFactory maFactory;
- private WindowAdapter maFrame;
- private javax.media.Player maPlayer;
- private com.sun.star.media.ZoomLevel meZoomLevel = com.sun.star.media.ZoomLevel.ORIGINAL;
- private boolean mbShowControls = false;
-
-
- // -------------------------------------------------------------------------
-
- public PlayerWindow( com.sun.star.lang.XMultiServiceFactory aFactory,
- java.lang.Object[] aArgs, javax.media.Player aPlayer )
- {
- maFactory = aFactory;
-
- try
- {
- if( aArgs.length > 1 )
- {
- com.sun.star.awt.Rectangle aBoundRect = (com.sun.star.awt.Rectangle) aArgs[ 1 ];
-
- maFrame = new WindowAdapter( AnyConverter.toInt( aArgs[ 0 ] ) );
- maFrame.setPosSize( aBoundRect.X, aBoundRect.Y, aBoundRect.Width, aBoundRect.Height, (short) 0 );
- mbShowControls = false;
-
- java.awt.Panel aPanel = new java.awt.Panel( new java.awt.BorderLayout() );
-
- aPanel.setLayout( null );
- aPanel.setBackground( java.awt.Color.black );
- aPanel.addKeyListener( this );
- aPanel.addMouseListener( this );
- aPanel.addMouseMotionListener( this );
-
- if( mbShowControls )
- {
- java.awt.Component aControlComponent = aPlayer.getControlPanelComponent();
-
- if( aControlComponent != null )
- aPanel.add( aControlComponent );
- else
- mbShowControls = false;
- }
-
- java.awt.Component aVisualComponent = aPlayer.getVisualComponent();
-
- if( aVisualComponent != null )
- {
- aVisualComponent.addKeyListener( this );
- aVisualComponent.addMouseListener( this );
- aVisualComponent.addMouseMotionListener( this );
- aVisualComponent.addFocusListener( this );
- aPanel.add( aVisualComponent );
- }
- else
- meZoomLevel = com.sun.star.media.ZoomLevel.NOT_AVAILABLE;
-
- if( maFrame.getJavaFrame() != null )
- maFrame.getJavaFrame().add( aPanel );
-
- LayoutComponents();
- }
- }
- catch( com.sun.star.lang.IllegalArgumentException e )
- {
- }
- }
-
- // -------------------------------------------------------------------------
-
- protected synchronized void LayoutComponents()
- {
- if( maFrame.getJavaFrame() != null )
- {
- java.awt.Panel aPanel = (java.awt.Panel) maFrame.getJavaFrame().getComponent( 0 );
- int nW = maFrame.getJavaFrame().getWidth();
- int nH = maFrame.getJavaFrame().getHeight();
- int nControlH = 0;
-
- aPanel.setBounds( 0, 0, nW, nH );
-
- if( mbShowControls )
- {
- java.awt.Component aControlComponent = aPanel.getComponent( 0 );
-
- if( aControlComponent != null )
- {
- java.awt.Dimension aControlDimension = aControlComponent.getPreferredSize();
-
- nControlH = Math.min( nH, aControlDimension.height );
- aControlComponent.setBounds( 0, nH - nControlH, nW, nControlH );
- }
- }
-
- if( com.sun.star.media.ZoomLevel.NOT_AVAILABLE != meZoomLevel )
- {
- java.awt.Component aVisualComponent = aPanel.getComponent( mbShowControls ? 1 : 0 );
-
- if( aVisualComponent != null )
- {
- java.awt.Dimension aPrefDim = aVisualComponent.getPreferredSize();
- int nVideoW = nW, nVideoH = ( nH - nControlH );
- int nX = 0, nY = 0, nWidth = 0, nHeight = 0;
- boolean bDone = false, bZoom = false;
-
- if( com.sun.star.media.ZoomLevel.ORIGINAL == meZoomLevel )
- {
- bZoom = true;
- }
- else if( com.sun.star.media.ZoomLevel.ZOOM_1_TO_4 == meZoomLevel )
- {
- aPrefDim.width >>= 2;
- aPrefDim.height >>= 2;
- bZoom = true;
- }
- else if( com.sun.star.media.ZoomLevel.ZOOM_1_TO_2 == meZoomLevel )
- {
- aPrefDim.width >>= 1;
- aPrefDim.height >>= 1;
- bZoom = true;
- }
- else if( com.sun.star.media.ZoomLevel.ZOOM_2_TO_1 == meZoomLevel )
- {
- aPrefDim.width <<= 1;
- aPrefDim.height <<= 1;
- bZoom = true;
- }
- else if( com.sun.star.media.ZoomLevel.ZOOM_4_TO_1 == meZoomLevel )
- {
- aPrefDim.width <<= 2;
- aPrefDim.height <<= 2;
- bZoom = true;
- }
- else if( com.sun.star.media.ZoomLevel.FIT_TO_WINDOW == meZoomLevel )
- {
- nWidth = nVideoW;
- nHeight = nVideoH;
- bDone = true;
- }
-
- if( bZoom )
- {
- if( ( aPrefDim.width <= nVideoW ) && ( aPrefDim.height <= nVideoH ) )
- {
- nX = ( nVideoW - aPrefDim.width ) >> 1;
- nY = ( nVideoH - aPrefDim.height ) >> 1;
- nWidth = aPrefDim.width;
- nHeight = aPrefDim.height;
- bDone = true;
- }
- }
-
- if( !bDone )
- {
- if( aPrefDim.width > 0 && aPrefDim.height > 0 && nVideoW > 0 && nVideoH > 0 )
- {
- double fPrefWH = (double) aPrefDim.width / aPrefDim.height;
-
- if( fPrefWH < ( (double) nVideoW / nVideoH ) )
- nVideoW = (int)( nVideoH * fPrefWH );
- else
- nVideoH = (int)( nVideoW / fPrefWH );
-
- nX = ( nW - nVideoW ) >> 1;
- nY = ( nH - nControlH - nVideoH ) >> 1;
- nWidth = nVideoW;
- nHeight = nVideoH;
- }
- else
- nX = nY = nWidth = nHeight = 0;
- }
-
- aVisualComponent.setBounds( nX, nY, nWidth, nHeight );
- aVisualComponent.requestFocus();
- }
- else
- aPanel.requestFocus();
- }
- else
- aPanel.requestFocus();
- }
- }
-
- // -------------------------------------------------------------------------
-
- private void implFireMouseEvent( java.awt.event.MouseEvent aEvt )
- {
- if( aEvt.getSource() != null &&
- aEvt.getSource() instanceof java.awt.Component )
- {
- aEvt.translatePoint( ( (java.awt.Component) aEvt.getSource() ).getX(),
- ( (java.awt.Component) aEvt.getSource() ).getY() );
- }
-
- maFrame.fireMouseEvent( aEvt );
- }
-
- // ---------------
- // - KeyListener -
- // ---------------
-
- public void keyPressed( java.awt.event.KeyEvent aEvt )
- {
- maFrame.fireKeyEvent( aEvt );
- }
-
- // -------------------------------------------------------------------------
-
- public void keyReleased( java.awt.event.KeyEvent aEvt )
- {
- maFrame.fireKeyEvent( aEvt );
- }
-
- // -------------------------------------------------------------------------
-
- public void keyTyped( java.awt.event.KeyEvent aEvt )
- {
- maFrame.fireKeyEvent( aEvt );
- }
-
- // -----------------
- // - MouseListener -
- // -----------------
-
- public void mousePressed( java.awt.event.MouseEvent aEvt )
- {
- implFireMouseEvent( aEvt );
- }
-
- // -------------------------------------------------------------------------
-
- public void mouseClicked( java.awt.event.MouseEvent aEvt )
- {
- implFireMouseEvent( aEvt );
- }
-
- // -------------------------------------------------------------------------
-
- public void mouseEntered( java.awt.event.MouseEvent aEvt )
- {
- implFireMouseEvent( aEvt );
- }
-
- // -------------------------------------------------------------------------
-
- public void mouseExited( java.awt.event.MouseEvent aEvt )
- {
- implFireMouseEvent( aEvt );
- }
-
- // -------------------------------------------------------------------------
-
- public void mouseReleased( java.awt.event.MouseEvent aEvt )
- {
- implFireMouseEvent( aEvt );
- }
-
- // -----------------------
- // - MouseMotionListener -
- // -----------------------
-
- public void mouseDragged( java.awt.event.MouseEvent aEvt )
- {
- implFireMouseEvent( aEvt );
- }
-
- // -------------------------------------------------------------------------
-
- public void mouseMoved( java.awt.event.MouseEvent aEvt )
- {
- implFireMouseEvent( aEvt );
- }
-
- // -----------------------
- // - FocusListener -
- // -----------------------
-
- public void focusGained( java.awt.event.FocusEvent aEvt )
- {
- if( maFrame.getJavaFrame() != null )
- maFrame.fireFocusEvent( aEvt );
- }
-
- // -------------------------------------------------------------------------
-
- public void focusLost( java.awt.event.FocusEvent aEvt )
- {
- if( maFrame.getJavaFrame() != null )
- maFrame.fireFocusEvent( aEvt );
- }
-
- // -----------------
- // - XPlayerWindow -
- // -----------------
-
- public synchronized void update()
- {
- if( maFrame.getJavaFrame() != null )
- maFrame.getJavaFrame().repaint();
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized boolean setZoomLevel( com.sun.star.media.ZoomLevel eZoomLevel )
- {
- boolean bRet = false;
-
- if( com.sun.star.media.ZoomLevel.NOT_AVAILABLE != meZoomLevel &&
- com.sun.star.media.ZoomLevel.NOT_AVAILABLE != eZoomLevel )
- {
- if( eZoomLevel != meZoomLevel )
- {
- meZoomLevel = eZoomLevel;
- LayoutComponents();
- }
-
- bRet = true;
- }
-
- return bRet;
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized com.sun.star.media.ZoomLevel getZoomLevel()
- {
- return meZoomLevel;
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void setPointerType( int nPointerType )
- {
- if( maFrame.getJavaFrame() != null )
- {
- int nCursor;
-
- switch( nPointerType )
- {
- case( com.sun.star.awt.SystemPointer.CROSS ): nCursor = java.awt.Cursor.CROSSHAIR_CURSOR; break;
- case( com.sun.star.awt.SystemPointer.HAND ): nCursor = java.awt.Cursor.HAND_CURSOR; break;
- case( com.sun.star.awt.SystemPointer.MOVE ): nCursor = java.awt.Cursor.MOVE_CURSOR; break;
- case( com.sun.star.awt.SystemPointer.WAIT ): nCursor = java.awt.Cursor.WAIT_CURSOR; break;
-
- default: nCursor = java.awt.Cursor.DEFAULT_CURSOR; break;
- }
-
- maFrame.getJavaFrame().setCursor( java.awt.Cursor.getPredefinedCursor( nCursor ) );
- }
- }
-
- // --------------
- // - XComponent -
- // --------------
-
- public synchronized void dispose()
- {
- if( maFrame != null )
- {
- java.awt.Panel aPanel = (java.awt.Panel) maFrame.getJavaFrame().getComponent( 0 );
-
- if( aPanel != null && aPanel.getComponent( 0 ) != null )
- aPanel.getComponent( 0 ).removeFocusListener( this );
-
- if( maFrame.getJavaFrame() != null )
- maFrame.getJavaFrame().dispose();
-
- maFrame.fireDisposingEvent();
- }
-
- maFrame = null;
- }
-
- // -----------
- // - XWindow -
- // -----------
-
- public synchronized void setPosSize( int X, int Y, int Width, int Height, short Flags )
- {
- if( maFrame != null )
- {
- maFrame.setPosSize( X, Y, Width, Height, Flags );
- LayoutComponents();
- }
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized com.sun.star.awt.Rectangle getPosSize()
- {
- return( ( maFrame != null ) ? maFrame.getPosSize() : new com.sun.star.awt.Rectangle() );
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void setVisible( boolean visible )
- {
- if( maFrame != null )
- maFrame.setVisible( visible );
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void setEnable( boolean enable )
- {
- if( maFrame != null )
- maFrame.setEnable( enable );
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void setFocus()
- {
- if( maFrame != null )
- maFrame.setFocus();
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void addEventListener( com.sun.star.lang.XEventListener xListener )
- {
- if( maFrame != null )
- maFrame.addEventListener( xListener );
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void removeEventListener( com.sun.star.lang.XEventListener xListener )
- {
- if( maFrame != null )
- maFrame.removeEventListener( xListener );
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void addWindowListener( XWindowListener xListener )
- {
- if( maFrame != null )
- maFrame.addWindowListener( xListener );
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void removeWindowListener( XWindowListener xListener )
- {
- if( maFrame != null )
- maFrame.removeWindowListener( xListener );
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void addFocusListener( XFocusListener xListener )
- {
- if( maFrame != null )
- maFrame.addFocusListener( xListener );
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void removeFocusListener( XFocusListener xListener )
- {
- if( maFrame != null )
- maFrame.removeFocusListener( xListener );
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void addKeyListener( XKeyListener xListener )
- {
- if( maFrame != null )
- maFrame.addKeyListener( xListener );
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void removeKeyListener( XKeyListener xListener )
- {
- if( maFrame != null )
- maFrame.removeKeyListener( xListener );
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void addMouseListener( XMouseListener xListener )
- {
- if( maFrame != null )
- maFrame.addMouseListener( xListener );
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void removeMouseListener( XMouseListener xListener )
- {
- if( maFrame != null )
- maFrame.removeMouseListener( xListener );
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void addMouseMotionListener( XMouseMotionListener xListener )
- {
- if( maFrame != null )
- maFrame.addMouseMotionListener( xListener );
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void removeMouseMotionListener( XMouseMotionListener xListener )
- {
- if( maFrame != null )
- maFrame.removeMouseMotionListener( xListener );
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void addPaintListener( XPaintListener xListener )
- {
- if( maFrame != null )
- maFrame.addPaintListener( xListener );
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized void removePaintListener( XPaintListener xListener )
- {
- if( maFrame != null )
- maFrame.removePaintListener( xListener );
- }
-
- // ----------------
- // - XServiceInfo -
- // ----------------
-
- private static final String s_implName = "com.sun.star.comp.PlayerWindow_Java";
- private static final String s_serviceName = "com.sun.star.media.PlayerWindow_Java";
-
- public synchronized String getImplementationName()
- {
- return s_implName;
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized String [] getSupportedServiceNames()
- {
- return new String [] { s_serviceName };
- }
-
- // -------------------------------------------------------------------------
-
- public synchronized boolean supportsService( String serviceName )
- {
- return serviceName.equals( s_serviceName );
- }
-}
diff --git a/avmedia/source/java/WindowAdapter.java b/avmedia/source/java/WindowAdapter.java
deleted file mode 100755
index e44d9e4..0000000
--- a/avmedia/source/java/WindowAdapter.java
+++ /dev/null
@@ -1,496 +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.
- *
- ************************************************************************/
-
-import sun.awt.*;
-import com.sun.star.awt.*;
-import com.sun.star.lang.*;
-import java.util.*;
-import javax.swing.*;
-
-public class WindowAdapter
-{
- private java.awt.Frame maFrame;
- private LinkedList maEventListeners = new LinkedList();
- private LinkedList maWindowListeners = new LinkedList();
- private LinkedList maFocusListeners = new LinkedList();
- private LinkedList maKeyListeners = new LinkedList();
- private LinkedList maMouseListeners = new LinkedList();
- private LinkedList maMouseMotionListeners = new LinkedList();
- private LinkedList maPaintListeners = new LinkedList();
- private boolean mbShift = false, mbMod1 = false, mbMod2 = false;
-
- // -----------------
- // - WindowAdapter -
- // -----------------
-
- public WindowAdapter( int windowHandle )
- {
- maFrame = SystemWindowAdapter.createFrame( windowHandle );
- }
-
- //----------------------------------------------------------------------------------
-
- public java.awt.Frame getJavaFrame()
- {
- return maFrame;
- }
-
- //----------------------------------------------------------------------------------
-
- private short implGetUNOKeyCode( int nJavaKeyCode )
- {
- short nRet = 0;
-
- switch( nJavaKeyCode )
- {
- case( java.awt.event.KeyEvent.VK_NUMPAD0 ):
- case( java.awt.event.KeyEvent.VK_0 ): nRet = com.sun.star.awt.Key.NUM0; break;
- case( java.awt.event.KeyEvent.VK_NUMPAD1 ):
- case( java.awt.event.KeyEvent.VK_1 ): nRet = com.sun.star.awt.Key.NUM1; break;
- case( java.awt.event.KeyEvent.VK_NUMPAD2 ):
- case( java.awt.event.KeyEvent.VK_2 ): nRet = com.sun.star.awt.Key.NUM2; break;
- case( java.awt.event.KeyEvent.VK_NUMPAD3 ):
- case( java.awt.event.KeyEvent.VK_3 ): nRet = com.sun.star.awt.Key.NUM3; break;
- case( java.awt.event.KeyEvent.VK_NUMPAD4 ):
- case( java.awt.event.KeyEvent.VK_4 ): nRet = com.sun.star.awt.Key.NUM4; break;
- case( java.awt.event.KeyEvent.VK_NUMPAD5 ):
- case( java.awt.event.KeyEvent.VK_5 ): nRet = com.sun.star.awt.Key.NUM5; break;
- case( java.awt.event.KeyEvent.VK_NUMPAD6 ):
- case( java.awt.event.KeyEvent.VK_6 ): nRet = com.sun.star.awt.Key.NUM6; break;
- case( java.awt.event.KeyEvent.VK_NUMPAD7 ):
- case( java.awt.event.KeyEvent.VK_7 ): nRet = com.sun.star.awt.Key.NUM7; break;
- case( java.awt.event.KeyEvent.VK_NUMPAD8 ):
- case( java.awt.event.KeyEvent.VK_8 ): nRet = com.sun.star.awt.Key.NUM8; break;
- case( java.awt.event.KeyEvent.VK_NUMPAD9 ):
- case( java.awt.event.KeyEvent.VK_9 ): nRet = com.sun.star.awt.Key.NUM9; break;
-
- case( java.awt.event.KeyEvent.VK_A ): nRet = com.sun.star.awt.Key.A; break;
- case( java.awt.event.KeyEvent.VK_B ): nRet = com.sun.star.awt.Key.B; break;
- case( java.awt.event.KeyEvent.VK_C ): nRet = com.sun.star.awt.Key.C; break;
- case( java.awt.event.KeyEvent.VK_D ): nRet = com.sun.star.awt.Key.D; break;
- case( java.awt.event.KeyEvent.VK_E ): nRet = com.sun.star.awt.Key.E; break;
- case( java.awt.event.KeyEvent.VK_F ): nRet = com.sun.star.awt.Key.F; break;
- case( java.awt.event.KeyEvent.VK_G ): nRet = com.sun.star.awt.Key.G; break;
- case( java.awt.event.KeyEvent.VK_H ): nRet = com.sun.star.awt.Key.H; break;
- case( java.awt.event.KeyEvent.VK_I ): nRet = com.sun.star.awt.Key.I; break;
- case( java.awt.event.KeyEvent.VK_J ): nRet = com.sun.star.awt.Key.J; break;
- case( java.awt.event.KeyEvent.VK_K ): nRet = com.sun.star.awt.Key.K; break;
- case( java.awt.event.KeyEvent.VK_L ): nRet = com.sun.star.awt.Key.L; break;
- case( java.awt.event.KeyEvent.VK_M ): nRet = com.sun.star.awt.Key.M; break;
- case( java.awt.event.KeyEvent.VK_N ): nRet = com.sun.star.awt.Key.N; break;
- case( java.awt.event.KeyEvent.VK_O ): nRet = com.sun.star.awt.Key.O; break;
- case( java.awt.event.KeyEvent.VK_P ): nRet = com.sun.star.awt.Key.P; break;
- case( java.awt.event.KeyEvent.VK_Q ): nRet = com.sun.star.awt.Key.Q; break;
- case( java.awt.event.KeyEvent.VK_R ): nRet = com.sun.star.awt.Key.R; break;
- case( java.awt.event.KeyEvent.VK_S ): nRet = com.sun.star.awt.Key.S; break;
- case( java.awt.event.KeyEvent.VK_T ): nRet = com.sun.star.awt.Key.T; break;
- case( java.awt.event.KeyEvent.VK_U ): nRet = com.sun.star.awt.Key.U; break;
- case( java.awt.event.KeyEvent.VK_V ): nRet = com.sun.star.awt.Key.V; break;
- case( java.awt.event.KeyEvent.VK_W ): nRet = com.sun.star.awt.Key.W; break;
- case( java.awt.event.KeyEvent.VK_X ): nRet = com.sun.star.awt.Key.X; break;
- case( java.awt.event.KeyEvent.VK_Y ): nRet = com.sun.star.awt.Key.Y; break;
- case( java.awt.event.KeyEvent.VK_Z ): nRet = com.sun.star.awt.Key.Z; break;
-
- case( java.awt.event.KeyEvent.VK_F1 ): nRet = com.sun.star.awt.Key.F1; break;
- case( java.awt.event.KeyEvent.VK_F2 ): nRet = com.sun.star.awt.Key.F2; break;
- case( java.awt.event.KeyEvent.VK_F3 ): nRet = com.sun.star.awt.Key.F3; break;
- case( java.awt.event.KeyEvent.VK_F4 ): nRet = com.sun.star.awt.Key.F4; break;
- case( java.awt.event.KeyEvent.VK_F5 ): nRet = com.sun.star.awt.Key.F5; break;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list