From 3fe1744693a3462d00ce37aaa7b35030591109ce Mon Sep 17 00:00:00 2001 From: Nanang Izzuddin Date: Tue, 24 Apr 2012 07:07:39 +0000 Subject: Re #1276: - Updated baseclasses VS2005 project setting (use VS property sheet, etc). - Added PJMEDIA_VIDEO_DEV_HAS_DSHOW filter. git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4072 74dad513-b988-da41-8d7b-12977e46ad98 --- third_party/BaseClasses/amfilter.cpp | 5 + third_party/BaseClasses/amvideo.cpp | 5 + third_party/BaseClasses/arithutil.cpp | 6 + third_party/BaseClasses/combase.cpp | 4 + third_party/BaseClasses/ctlutil.cpp | 4 + third_party/BaseClasses/mtype.cpp | 5 + third_party/BaseClasses/renbase.cpp | 4 + third_party/BaseClasses/wxdebug.cpp | 4 + third_party/BaseClasses/wxlist.cpp | 5 + third_party/BaseClasses/wxutil.cpp | 4 + .../build/baseclasses/libbaseclasses.vcproj | 490 +++++++++++++++++++++ 11 files changed, 536 insertions(+) create mode 100644 third_party/build/baseclasses/libbaseclasses.vcproj (limited to 'third_party') diff --git a/third_party/BaseClasses/amfilter.cpp b/third_party/BaseClasses/amfilter.cpp index 03c13d14..282c35d0 100644 --- a/third_party/BaseClasses/amfilter.cpp +++ b/third_party/BaseClasses/amfilter.cpp @@ -27,6 +27,10 @@ //===================================================================== //===================================================================== +#include + +#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0 + #include #include @@ -5356,3 +5360,4 @@ AMovieSetupRegisterFilter( const AMOVIESETUP_FILTER * const psetupdata // Remove warnings about unreferenced inline functions #pragma warning(disable:4514) +#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */ diff --git a/third_party/BaseClasses/amvideo.cpp b/third_party/BaseClasses/amvideo.cpp index 42fe446d..ad1436f8 100644 --- a/third_party/BaseClasses/amvideo.cpp +++ b/third_party/BaseClasses/amvideo.cpp @@ -7,6 +7,9 @@ // Copyright (c) 1992-2001 Microsoft Corporation. All rights reserved. //------------------------------------------------------------------------------ +#include + +#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0 #include #include @@ -273,3 +276,5 @@ STDAPI_(const RGBQUAD *) GetBitmapPalette(const VIDEOINFOHEADER *pVideoInfo) } return COLORS(pVideoInfo); } + +#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */ diff --git a/third_party/BaseClasses/arithutil.cpp b/third_party/BaseClasses/arithutil.cpp index cd0d1271..9600e5f3 100644 --- a/third_party/BaseClasses/arithutil.cpp +++ b/third_party/BaseClasses/arithutil.cpp @@ -7,6 +7,10 @@ // Copyright (c) 1992-2004 Microsoft Corporation. All rights reserved. //------------------------------------------------------------------------------ +#include + +#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0 + #include // @@ -358,3 +362,5 @@ LONGLONG WINAPI Int64x32Div32(LONGLONG a, LONG b, LONG c, LONG d) return bSign ? -(LONGLONG)uliResult.QuadPart : (LONGLONG)uliResult.QuadPart; } + +#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */ diff --git a/third_party/BaseClasses/combase.cpp b/third_party/BaseClasses/combase.cpp index ec62a88c..bf7e3512 100644 --- a/third_party/BaseClasses/combase.cpp +++ b/third_party/BaseClasses/combase.cpp @@ -7,6 +7,9 @@ // Copyright (c) 1992-2001 Microsoft Corporation. All rights reserved. //------------------------------------------------------------------------------ +#include + +#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0 #include #pragma warning( disable : 4514 ) // Disable warnings re unused inline functions @@ -263,3 +266,4 @@ BOOL WINAPI IsEqualObject(IUnknown *pFirst, IUnknown *pSecond) return (pUnknown1 == pUnknown2); } +#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */ diff --git a/third_party/BaseClasses/ctlutil.cpp b/third_party/BaseClasses/ctlutil.cpp index 8ccb9dc3..2902df26 100644 --- a/third_party/BaseClasses/ctlutil.cpp +++ b/third_party/BaseClasses/ctlutil.cpp @@ -12,6 +12,9 @@ // property methods. We also implement CPosPassThru that can be used by // renderers and transforms to pass by IMediaPosition and IMediaSeeking +#include + +#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0 #include #include @@ -2539,3 +2542,4 @@ CCmdQueue::GetCommandDueFor(REFERENCE_TIME rtStream, __out CDeferredCommand**ppC return VFW_E_NOT_FOUND; } +#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */ diff --git a/third_party/BaseClasses/mtype.cpp b/third_party/BaseClasses/mtype.cpp index fffbcf79..8d99697e 100644 --- a/third_party/BaseClasses/mtype.cpp +++ b/third_party/BaseClasses/mtype.cpp @@ -7,6 +7,9 @@ // Copyright (c) 1992-2001 Microsoft Corporation. All rights reserved. //------------------------------------------------------------------------------ +#include + +#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0 // helper class that derived pin objects can use to compare media // types etc. Has same data members as the struct AM_MEDIA_TYPE defined @@ -476,3 +479,5 @@ STDAPI CreateAudioMediaType( // eliminate very many spurious warnings from MS compiler #pragma warning(disable:4514) + +#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */ diff --git a/third_party/BaseClasses/renbase.cpp b/third_party/BaseClasses/renbase.cpp index c6e19627..b354b5fb 100644 --- a/third_party/BaseClasses/renbase.cpp +++ b/third_party/BaseClasses/renbase.cpp @@ -6,6 +6,9 @@ // Copyright (c) 1992-2001 Microsoft Corporation. All rights reserved. //------------------------------------------------------------------------------ +#include + +#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0 #include // DirectShow base class definitions #include // Needed for definition of timeGetTime @@ -2856,3 +2859,4 @@ CBaseVideoRenderer::JoinFilterGraph(__inout_opt IFilterGraph *pGraph, __in_opt L // Microsoft compiler which in this case are not very useful #pragma warning(disable: 4514) +#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */ diff --git a/third_party/BaseClasses/wxdebug.cpp b/third_party/BaseClasses/wxdebug.cpp index 3c433031..3a1dc38f 100644 --- a/third_party/BaseClasses/wxdebug.cpp +++ b/third_party/BaseClasses/wxdebug.cpp @@ -7,6 +7,9 @@ // Copyright (c) 1992-2001 Microsoft Corporation. All rights reserved. //------------------------------------------------------------------------------ +#include + +#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0 #define _WINDLL @@ -1472,3 +1475,4 @@ void WINAPI DumpGraph(IFilterGraph *pGraph, DWORD dwLevel) #endif +#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */ diff --git a/third_party/BaseClasses/wxlist.cpp b/third_party/BaseClasses/wxlist.cpp index 2ec67a45..df22839d 100644 --- a/third_party/BaseClasses/wxlist.cpp +++ b/third_party/BaseClasses/wxlist.cpp @@ -6,6 +6,9 @@ // Copyright (c) 1992-2001 Microsoft Corporation. All rights reserved. //------------------------------------------------------------------------------ +#include + +#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0 /* A generic list of pointers to objects. Objectives: avoid using MFC libraries in ndm kernel mode and @@ -889,3 +892,5 @@ void CBaseList::Reverse() #endif } // Reverse + +#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */ diff --git a/third_party/BaseClasses/wxutil.cpp b/third_party/BaseClasses/wxutil.cpp index 5bc97a9a..8ff8de4a 100644 --- a/third_party/BaseClasses/wxutil.cpp +++ b/third_party/BaseClasses/wxutil.cpp @@ -7,6 +7,9 @@ // Copyright (c) 1992-2001 Microsoft Corporation. All rights reserved. //------------------------------------------------------------------------------ +#include + +#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0 #include #define STRSAFE_NO_DEPRECATE @@ -767,3 +770,4 @@ bool TimeKillSynchronousFlagAvailable( void ) } +#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */ diff --git a/third_party/build/baseclasses/libbaseclasses.vcproj b/third_party/build/baseclasses/libbaseclasses.vcproj new file mode 100644 index 00000000..7887ea81 --- /dev/null +++ b/third_party/build/baseclasses/libbaseclasses.vcproj @@ -0,0 +1,490 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3