This is an automated email from the ASF dual-hosted git repository. arielch pushed a commit to branch AOO418 in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 4ba1660956c80eb18b1e904dd49c2cd0d4b9c49e Author: Herbert Dürr <[email protected]> AuthorDate: Mon May 12 15:50:40 2014 +0000 #i124875# avoid avmedia build problems with multiple active backends in the dmake build environment active header and source files with the same name result in problems when in the same project. The Quicktime and MacAVF files have been renamed so that both can be active concurrently. git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1594013 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit e8649ecd8d3aee033309e0ffbb2c2bd3e80b6302) --- .../source/macavf/{macavfcommon.hxx => macavf_common.hxx} | 0 .../macavf/{framegrabber.cxx => macavf_framegrabber.cxx} | 4 ++-- .../macavf/{framegrabber.hxx => macavf_framegrabber.hxx} | 9 ++++----- .../macavf/{macavfcommon.hxx => macavf_macavfcommon.hxx} | 0 .../source/macavf/{macavfuno.cxx => macavf_macavfuno.cxx} | 3 +-- .../source/macavf/{manager.cxx => macavf_manager.cxx} | 5 +++-- .../source/macavf/{manager.hxx => macavf_manager.hxx} | 8 ++++---- .../source/macavf/{player.cxx => macavf_player.cxx} | 6 +++--- .../source/macavf/{player.hxx => macavf_player.hxx} | 10 +++++----- .../source/macavf/{macavfuno.cxx => macavf_uno.cxx} | 3 +-- .../source/macavf/{window.cxx => macavf_window.cxx} | 5 ++--- .../source/macavf/{window.hxx => macavf_window.hxx} | 7 ++++--- main/avmedia/source/macavf/makefile.mk | 14 +++++++------- main/avmedia/source/quicktime/makefile.mk | 14 +++++++------- .../quicktime/{quicktimecommon.hxx => qt_common.hxx} | 7 +++---- .../quicktime/{framegrabber.cxx => qt_framegrabber.cxx} | 5 ++--- .../quicktime/{framegrabber.hxx => qt_framegrabber.hxx} | 12 +++++------- .../source/quicktime/{manager.cxx => qt_manager.cxx} | 4 ++-- .../source/quicktime/{manager.hxx => qt_manager.hxx} | 12 +++++------- .../avmedia/source/quicktime/{player.cxx => qt_player.cxx} | 7 +++---- .../avmedia/source/quicktime/{player.hxx => qt_player.hxx} | 12 +++++------- .../source/quicktime/{quicktimeuno.cxx => qt_uno.cxx} | 6 ++---- .../avmedia/source/quicktime/{window.cxx => qt_window.cxx} | 5 ++--- .../avmedia/source/quicktime/{window.hxx => qt_window.hxx} | 12 +++++------- 24 files changed, 77 insertions(+), 93 deletions(-) diff --git a/main/avmedia/source/macavf/macavfcommon.hxx b/main/avmedia/source/macavf/macavf_common.hxx similarity index 100% copy from main/avmedia/source/macavf/macavfcommon.hxx copy to main/avmedia/source/macavf/macavf_common.hxx diff --git a/main/avmedia/source/macavf/framegrabber.cxx b/main/avmedia/source/macavf/macavf_framegrabber.cxx similarity index 98% rename from main/avmedia/source/macavf/framegrabber.cxx rename to main/avmedia/source/macavf/macavf_framegrabber.cxx index 1129b90..f9fb5a6 100644 --- a/main/avmedia/source/macavf/framegrabber.cxx +++ b/main/avmedia/source/macavf/macavf_framegrabber.cxx @@ -19,8 +19,8 @@ * *************************************************************/ -#include "framegrabber.hxx" -#include "player.hxx" +#include "macavf_framegrabber.hxx" +#include "macavf_player.hxx" #include <tools/stream.hxx> #include <vcl/graph.hxx> diff --git a/main/avmedia/source/macavf/framegrabber.hxx b/main/avmedia/source/macavf/macavf_framegrabber.hxx similarity index 94% rename from main/avmedia/source/macavf/framegrabber.hxx rename to main/avmedia/source/macavf/macavf_framegrabber.hxx index bcc095d..c483eda 100644 --- a/main/avmedia/source/macavf/framegrabber.hxx +++ b/main/avmedia/source/macavf/macavf_framegrabber.hxx @@ -20,11 +20,10 @@ *************************************************************/ +#ifndef MACAVF_FRAMEGRABBER_HXX +#define MACAVF_FRAMEGRABBER_HXX -#ifndef _FRAMEGRABBER_HXX -#define _FRAMEGRABBER_HXX - -#include "macavfcommon.hxx" +#include "macavf_common.hxx" #include "com/sun/star/media/XFrameGrabber.hdl" @@ -62,5 +61,5 @@ private: } // namespace macavf } // namespace avmedia -#endif // _FRAMEGRABBER_HXX +#endif // MACAVF_FRAMEGRABBER_HXX diff --git a/main/avmedia/source/macavf/macavfcommon.hxx b/main/avmedia/source/macavf/macavf_macavfcommon.hxx similarity index 100% rename from main/avmedia/source/macavf/macavfcommon.hxx rename to main/avmedia/source/macavf/macavf_macavfcommon.hxx diff --git a/main/avmedia/source/macavf/macavfuno.cxx b/main/avmedia/source/macavf/macavf_macavfuno.cxx similarity index 98% copy from main/avmedia/source/macavf/macavfuno.cxx copy to main/avmedia/source/macavf/macavf_macavfuno.cxx index acc0d93..6d936eb 100644 --- a/main/avmedia/source/macavf/macavfuno.cxx +++ b/main/avmedia/source/macavf/macavf_macavfuno.cxx @@ -19,8 +19,7 @@ * *************************************************************/ -#include "macavfcommon.hxx" -#include "manager.hxx" +#include "macavf_manager.hxx" using namespace ::com::sun::star; diff --git a/main/avmedia/source/macavf/manager.cxx b/main/avmedia/source/macavf/macavf_manager.cxx similarity index 98% rename from main/avmedia/source/macavf/manager.cxx rename to main/avmedia/source/macavf/macavf_manager.cxx index c11eb19..8edc6af 100644 --- a/main/avmedia/source/macavf/manager.cxx +++ b/main/avmedia/source/macavf/macavf_manager.cxx @@ -19,8 +19,9 @@ * *************************************************************/ -#include "manager.hxx" -#include "player.hxx" +#include "macavf_manager.hxx" +#include "macavf_player.hxx" + #include <tools/urlobj.hxx> using namespace ::com::sun::star; diff --git a/main/avmedia/source/macavf/manager.hxx b/main/avmedia/source/macavf/macavf_manager.hxx similarity index 95% rename from main/avmedia/source/macavf/manager.hxx rename to main/avmedia/source/macavf/macavf_manager.hxx index f8f6ea9..3397b0e 100644 --- a/main/avmedia/source/macavf/manager.hxx +++ b/main/avmedia/source/macavf/macavf_manager.hxx @@ -19,10 +19,10 @@ * *************************************************************/ -#ifndef _MANAGER_HXX -#define _MANAGER_HXX +#ifndef MACAVF_MANAGER_HXX +#define MACAVF_MANAGER_HXX -#include "macavfcommon.hxx" +#include "macavf_common.hxx" #include "com/sun/star/media/XManager.hdl" @@ -55,5 +55,5 @@ private: } // namespace macavf } // namespace avmedia -#endif // _MANAGER_HXX +#endif // MACAVF_MANAGER_HXX diff --git a/main/avmedia/source/macavf/player.cxx b/main/avmedia/source/macavf/macavf_player.cxx similarity index 99% rename from main/avmedia/source/macavf/player.cxx rename to main/avmedia/source/macavf/macavf_player.cxx index 46a8397..27fd644 100644 --- a/main/avmedia/source/macavf/player.cxx +++ b/main/avmedia/source/macavf/macavf_player.cxx @@ -20,9 +20,9 @@ *************************************************************/ -#include "player.hxx" -#include "framegrabber.hxx" -#include "window.hxx" +#include "macavf_player.hxx" +#include "macavf_framegrabber.hxx" +#include "macavf_window.hxx" #include <cmath> // for log10() diff --git a/main/avmedia/source/macavf/player.hxx b/main/avmedia/source/macavf/macavf_player.hxx similarity index 97% rename from main/avmedia/source/macavf/player.hxx rename to main/avmedia/source/macavf/macavf_player.hxx index 10ff013..45f6f86 100644 --- a/main/avmedia/source/macavf/player.hxx +++ b/main/avmedia/source/macavf/macavf_player.hxx @@ -20,12 +20,11 @@ *************************************************************/ - -#ifndef _PLAYER_HXX -#define _PLAYER_HXX +#ifndef MACAVF_PLAYER_HXX +#define MACAVF_PLAYER_HXX #include <osl/conditn.h> -#include "macavfcommon.hxx" +#include "macavf_common.hxx" #include "com/sun/star/media/XPlayer.hdl" @@ -94,4 +93,5 @@ private: } // namespace macavf } // namespace avmedia -#endif // _PLAYER_HXX +#endif // MACAVF_PLAYER_HXX + diff --git a/main/avmedia/source/macavf/macavfuno.cxx b/main/avmedia/source/macavf/macavf_uno.cxx similarity index 98% rename from main/avmedia/source/macavf/macavfuno.cxx rename to main/avmedia/source/macavf/macavf_uno.cxx index acc0d93..6d936eb 100644 --- a/main/avmedia/source/macavf/macavfuno.cxx +++ b/main/avmedia/source/macavf/macavf_uno.cxx @@ -19,8 +19,7 @@ * *************************************************************/ -#include "macavfcommon.hxx" -#include "manager.hxx" +#include "macavf_manager.hxx" using namespace ::com::sun::star; diff --git a/main/avmedia/source/macavf/window.cxx b/main/avmedia/source/macavf/macavf_window.cxx similarity index 99% rename from main/avmedia/source/macavf/window.cxx rename to main/avmedia/source/macavf/macavf_window.cxx index f9e68f7..2d579ed 100644 --- a/main/avmedia/source/macavf/window.cxx +++ b/main/avmedia/source/macavf/macavf_window.cxx @@ -20,12 +20,11 @@ *************************************************************/ - #include <com/sun/star/awt/SystemPointer.hpp> #include <com/sun/star/awt/PosSize.hpp> -#include "window.hxx" -#include "player.hxx" +#include "macavf_window.hxx" +#include "macavf_player.hxx" using namespace ::com::sun::star; diff --git a/main/avmedia/source/macavf/window.hxx b/main/avmedia/source/macavf/macavf_window.hxx similarity index 98% rename from main/avmedia/source/macavf/window.hxx rename to main/avmedia/source/macavf/macavf_window.hxx index 83977c2..db2f5fc 100644 --- a/main/avmedia/source/macavf/window.hxx +++ b/main/avmedia/source/macavf/macavf_window.hxx @@ -19,10 +19,11 @@ * *************************************************************/ -#ifndef _WINDOW_HXX -#define _WINDOW_HXX +#ifndef MACAVF_WINDOW_HXX +#define MACAVF_WINDOW_HXX + +#include "macavf_common.hxx" -#include "macavfcommon.hxx" #include <cppuhelper/interfacecontainer.h> #include "com/sun/star/media/XPlayerWindow.hdl" diff --git a/main/avmedia/source/macavf/makefile.mk b/main/avmedia/source/macavf/makefile.mk index 542ba0a..95cc0a8 100644 --- a/main/avmedia/source/macavf/makefile.mk +++ b/main/avmedia/source/macavf/makefile.mk @@ -41,15 +41,15 @@ CDEFS+= -DVERBOSE CFLAGSCXX+=$(OBJCXXFLAGS) SLOFILES= \ - $(SLO)$/macavfuno.obj \ - $(SLO)$/framegrabber.obj \ - $(SLO)$/manager.obj \ - $(SLO)$/window.obj \ - $(SLO)$/player.obj + $(SLO)$/macavf_uno.obj \ + $(SLO)$/macavf_framegrabber.obj \ + $(SLO)$/macavf_manager.obj \ + $(SLO)$/macavf_window.obj \ + $(SLO)$/macavf_player.obj EXCEPTIONSFILES= \ - $(SLO)$/framegrabber.obj \ - $(SLO)$/macavfuno.obj + $(SLO)$/macavf_framegrabber.obj \ + $(SLO)$/macavf_uno.obj SHL1TARGET= $(TARGET)$(DLLPOSTFIX) diff --git a/main/avmedia/source/quicktime/makefile.mk b/main/avmedia/source/quicktime/makefile.mk index 6b83b93..afd0384 100644 --- a/main/avmedia/source/quicktime/makefile.mk +++ b/main/avmedia/source/quicktime/makefile.mk @@ -44,15 +44,15 @@ CDEFS+= -DVERBOSE CFLAGSCXX+=$(OBJCXXFLAGS) SLOFILES= \ - $(SLO)$/quicktimeuno.obj \ - $(SLO)$/framegrabber.obj \ - $(SLO)$/manager.obj \ - $(SLO)$/window.obj \ - $(SLO)$/player.obj + $(SLO)$/qt_uno.obj \ + $(SLO)$/qt_framegrabber.obj \ + $(SLO)$/qt_manager.obj \ + $(SLO)$/qt_window.obj \ + $(SLO)$/qt_player.obj EXCEPTIONSFILES= \ - $(SLO)$/framegrabber.obj \ - $(SLO)$/quicktimeuno.obj + $(SLO)$/qt_framegrabber.obj \ + $(SLO)$/qt_uno.obj SHL1TARGET= $(TARGET)$(DLLPOSTFIX) diff --git a/main/avmedia/source/quicktime/quicktimecommon.hxx b/main/avmedia/source/quicktime/qt_common.hxx similarity index 96% rename from main/avmedia/source/quicktime/quicktimecommon.hxx rename to main/avmedia/source/quicktime/qt_common.hxx index 42f9634..f4102e6 100644 --- a/main/avmedia/source/quicktime/quicktimecommon.hxx +++ b/main/avmedia/source/quicktime/qt_common.hxx @@ -20,9 +20,8 @@ *************************************************************/ - -#ifndef _QUICKTIMECOMMON_HXX -#define _QUICKTIMECOMMON_HXX +#ifndef QT_COMMON_HXX +#define QT_COMMON_HXX #ifdef MACOSX #include <premac.h> @@ -62,5 +61,5 @@ #define AVMEDIA_QUICKTIME_WINDOW_IMPLEMENTATIONNAME "com.sun.star.comp.avmedia.Window_QuickTime" #define AVMEDIA_QUICKTIME_WINDOW_SERVICENAME "com.sun.star.media.Window_QuickTime" -#endif // _QUICKTIMECOMMOM_HXX +#endif // QT_COMMOM_HXX diff --git a/main/avmedia/source/quicktime/framegrabber.cxx b/main/avmedia/source/quicktime/qt_framegrabber.cxx similarity index 98% rename from main/avmedia/source/quicktime/framegrabber.cxx rename to main/avmedia/source/quicktime/qt_framegrabber.cxx index 5d90192..dbbb3f7 100644 --- a/main/avmedia/source/quicktime/framegrabber.cxx +++ b/main/avmedia/source/quicktime/qt_framegrabber.cxx @@ -20,9 +20,8 @@ *************************************************************/ - -#include "framegrabber.hxx" -#include "player.hxx" +#include "qt_framegrabber.hxx" +#include "qt_player.hxx" #include <tools/stream.hxx> #include <vcl/graph.hxx> diff --git a/main/avmedia/source/quicktime/framegrabber.hxx b/main/avmedia/source/quicktime/qt_framegrabber.hxx similarity index 93% rename from main/avmedia/source/quicktime/framegrabber.hxx rename to main/avmedia/source/quicktime/qt_framegrabber.hxx index 7dc9afe..c59eb6b 100644 --- a/main/avmedia/source/quicktime/framegrabber.hxx +++ b/main/avmedia/source/quicktime/qt_framegrabber.hxx @@ -20,15 +20,12 @@ *************************************************************/ +#ifndef QT_FRAMEGRABBER_HXX +#define QT_FRAMEGRABBER_HXX -#ifndef _FRAMEGRABBER_HXX -#define _FRAMEGRABBER_HXX +#include "qt_common.hxx" -#include "quicktimecommon.hxx" - -#ifndef _COM_SUN_STAR_MEDIA_XFRAMEGRABBER_HDL_ #include "com/sun/star/media/XFrameGrabber.hdl" -#endif namespace avmedia { namespace quicktime { @@ -66,4 +63,5 @@ private: } // namespace quicktime } // namespace avmedia -#endif // _FRAMEGRABBER_HXX +#endif // QT_FRAMEGRABBER_HXX + diff --git a/main/avmedia/source/quicktime/manager.cxx b/main/avmedia/source/quicktime/qt_manager.cxx similarity index 98% rename from main/avmedia/source/quicktime/manager.cxx rename to main/avmedia/source/quicktime/qt_manager.cxx index 78794c1..fdf8240 100644 --- a/main/avmedia/source/quicktime/manager.cxx +++ b/main/avmedia/source/quicktime/qt_manager.cxx @@ -20,9 +20,9 @@ *************************************************************/ +#include "qt_manager.hxx" +#include "qt_player.hxx" -#include "manager.hxx" -#include "player.hxx" #include <tools/urlobj.hxx> using namespace ::com::sun::star; diff --git a/main/avmedia/source/quicktime/manager.hxx b/main/avmedia/source/quicktime/qt_manager.hxx similarity index 93% rename from main/avmedia/source/quicktime/manager.hxx rename to main/avmedia/source/quicktime/qt_manager.hxx index b90916a..9cceb4a 100644 --- a/main/avmedia/source/quicktime/manager.hxx +++ b/main/avmedia/source/quicktime/qt_manager.hxx @@ -20,15 +20,12 @@ *************************************************************/ +#ifndef QT_MANAGER_HXX +#define QT_MANAGER_HXX -#ifndef _MANAGER_HXX -#define _MANAGER_HXX +#include "qt_common.hxx" -#include "quicktimecommon.hxx" - -#ifndef _COM_SUN_STAR_MEDIA_XMANAGER_HDL_ #include "com/sun/star/media/XManager.hdl" -#endif // ----------- // - Manager - @@ -59,4 +56,5 @@ private: } // namespace quicktime } // namespace avmedia -#endif // _MANAGER_HXX +#endif // QT_MANAGER_HXX + diff --git a/main/avmedia/source/quicktime/player.cxx b/main/avmedia/source/quicktime/qt_player.cxx similarity index 99% rename from main/avmedia/source/quicktime/player.cxx rename to main/avmedia/source/quicktime/qt_player.cxx index b98693c..fcb88c5 100644 --- a/main/avmedia/source/quicktime/player.cxx +++ b/main/avmedia/source/quicktime/qt_player.cxx @@ -20,12 +20,11 @@ *************************************************************/ - #include <math.h> -#include "player.hxx" -#include "framegrabber.hxx" -#include "window.hxx" +#include "qt_player.hxx" +#include "qt_framegrabber.hxx" +#include "qt_window.hxx" using namespace ::com::sun::star; diff --git a/main/avmedia/source/quicktime/player.hxx b/main/avmedia/source/quicktime/qt_player.hxx similarity index 97% rename from main/avmedia/source/quicktime/player.hxx rename to main/avmedia/source/quicktime/qt_player.hxx index b9811da..9f9274b 100644 --- a/main/avmedia/source/quicktime/player.hxx +++ b/main/avmedia/source/quicktime/qt_player.hxx @@ -20,16 +20,13 @@ *************************************************************/ - -#ifndef _PLAYER_HXX -#define _PLAYER_HXX +#ifndef QT_PLAYER_HXX +#define QT_PLAYER_HXX #include <osl/conditn.h> -#include "quicktimecommon.hxx" +#include "qt_common.hxx" -#ifndef _COM_SUN_STAR_MEDIA_XPLAYER_HDL_ #include "com/sun/star/media/XPlayer.hdl" -#endif namespace avmedia { namespace quicktime { @@ -106,4 +103,5 @@ private: } // namespace quicktime } // namespace avmedia -#endif // _PLAYER_HXX +#endif // QT_PLAYER_HXX + diff --git a/main/avmedia/source/quicktime/quicktimeuno.cxx b/main/avmedia/source/quicktime/qt_uno.cxx similarity index 97% rename from main/avmedia/source/quicktime/quicktimeuno.cxx rename to main/avmedia/source/quicktime/qt_uno.cxx index b987f16..1f39fbf 100644 --- a/main/avmedia/source/quicktime/quicktimeuno.cxx +++ b/main/avmedia/source/quicktime/qt_uno.cxx @@ -19,10 +19,7 @@ * *************************************************************/ - - -#include "quicktimecommon.hxx" -#include "manager.hxx" +#include "qt_manager.hxx" using namespace ::com::sun::star; @@ -71,3 +68,4 @@ extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* return pRet; } + diff --git a/main/avmedia/source/quicktime/window.cxx b/main/avmedia/source/quicktime/qt_window.cxx similarity index 99% rename from main/avmedia/source/quicktime/window.cxx rename to main/avmedia/source/quicktime/qt_window.cxx index b519101..73887ab 100644 --- a/main/avmedia/source/quicktime/window.cxx +++ b/main/avmedia/source/quicktime/qt_window.cxx @@ -20,12 +20,11 @@ *************************************************************/ - #include <com/sun/star/awt/SystemPointer.hpp> #include <com/sun/star/awt/PosSize.hpp> -#include "window.hxx" -#include "player.hxx" +#include "qt_window.hxx" +#include "qt_player.hxx" using namespace ::com::sun::star; diff --git a/main/avmedia/source/quicktime/window.hxx b/main/avmedia/source/quicktime/qt_window.hxx similarity index 97% rename from main/avmedia/source/quicktime/window.hxx rename to main/avmedia/source/quicktime/qt_window.hxx index 24b837f..9babf0d 100644 --- a/main/avmedia/source/quicktime/window.hxx +++ b/main/avmedia/source/quicktime/qt_window.hxx @@ -20,16 +20,13 @@ *************************************************************/ +#ifndef QT_WINDOW_HXX +#define QT_WINDOW_HXX -#ifndef _WINDOW_HXX -#define _WINDOW_HXX - -#include "quicktimecommon.hxx" +#include "qt_common.hxx" #include <cppuhelper/interfacecontainer.h> -#ifndef _COM_SUN_STAR_MEDIA_XPLAYERWINDOW_HDL_ #include "com/sun/star/media/XPlayerWindow.hdl" -#endif namespace avmedia { namespace quicktime { @@ -108,4 +105,5 @@ private: } // namespace quicktime } // namespace avmedia -#endif // _WINDOW_HXX +#endif // QT_WINDOW_HXX +
