Ignore:
Timestamp:
Apr 24, 2012 7:07:39 AM (12 years ago)
Author:
nanang
Message:

Re #1276:

  • Updated baseclasses VS2005 project setting (use VS property sheet, etc).
  • Added PJMEDIA_VIDEO_DEV_HAS_DSHOW filter.
Location:
pjproject/trunk/third_party/BaseClasses
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • pjproject/trunk/third_party/BaseClasses

    • Property svn:ignore deleted

  • pjproject/trunk/third_party/BaseClasses/amfilter.cpp

    r4061 r4072  
    2727//===================================================================== 
    2828//===================================================================== 
     29 
     30#include <pjmedia-videodev/config.h> 
     31 
     32#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0 
    2933 
    3034#include <streams.h> 
    … …  
    53575361#pragma warning(disable:4514) 
    53585362 
     5363#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */ 

  • pjproject/trunk/third_party/BaseClasses/amvideo.cpp

    r4061 r4072  
    88//------------------------------------------------------------------------------ 
    99 
     10#include <pjmedia-videodev/config.h> 
     11 
     12#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0 
    1013 
    1114#include <streams.h> 
    … …  
    274277    return COLORS(pVideoInfo); 
    275278} 
     279 
     280#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */ 

  • pjproject/trunk/third_party/BaseClasses/arithutil.cpp

    r4061 r4072  
    77// Copyright (c) 1992-2004 Microsoft Corporation.  All rights reserved. 
    88//------------------------------------------------------------------------------ 
     9 
     10#include <pjmedia-videodev/config.h> 
     11 
     12#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0 
    913 
    1014#include <streams.h> 
    … …  
    359363                    (LONGLONG)uliResult.QuadPart; 
    360364} 
     365 
     366#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */ 

  • pjproject/trunk/third_party/BaseClasses/combase.cpp

    r4061 r4072  
    88//------------------------------------------------------------------------------ 
    99 
     10#include <pjmedia-videodev/config.h> 
     11 
     12#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0 
    1013 
    1114#include <streams.h> 
    … …  
    264267} 
    265268 
     269#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */ 

  • pjproject/trunk/third_party/BaseClasses/ctlutil.cpp

    r4061 r4072  
    1313// renderers and transforms to pass by IMediaPosition and IMediaSeeking 
    1414 
     15#include <pjmedia-videodev/config.h> 
     16 
     17#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0 
    1518 
    1619#include <streams.h> 
    … …  
    25402543} 
    25412544 
     2545#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */ 

  • pjproject/trunk/third_party/BaseClasses/mtype.cpp

    r4061 r4072  
    88//------------------------------------------------------------------------------ 
    99 
     10#include <pjmedia-videodev/config.h> 
     11 
     12#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0 
    1013 
    1114// helper class that derived pin objects can use to compare media 
    … …  
    477480// eliminate very many spurious warnings from MS compiler 
    478481#pragma warning(disable:4514) 
     482 
     483#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */ 

  • pjproject/trunk/third_party/BaseClasses/renbase.cpp

    r4061 r4072  
    77//------------------------------------------------------------------------------ 
    88 
     9#include <pjmedia-videodev/config.h> 
     10 
     11#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0 
    912 
    1013#include <streams.h>        // DirectShow base class definitions 
    … …  
    28572860#pragma warning(disable: 4514) 
    28582861 
     2862#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */ 

  • pjproject/trunk/third_party/BaseClasses/wxdebug.cpp

    r4061 r4072  
    88//------------------------------------------------------------------------------ 
    99 
     10#include <pjmedia-videodev/config.h> 
     11 
     12#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0 
    1013 
    1114#define _WINDLL 
    … …  
    14731476#endif 
    14741477 
     1478#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */ 

  • pjproject/trunk/third_party/BaseClasses/wxlist.cpp

    r4061 r4072  
    77//------------------------------------------------------------------------------ 
    88 
     9#include <pjmedia-videodev/config.h> 
     10 
     11#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0 
    912 
    1013/* A generic list of pointers to objects. 
    … …  
    890893 
    891894} // Reverse 
     895 
     896#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */ 

  • pjproject/trunk/third_party/BaseClasses/wxutil.cpp

    r4061 r4072  
    88//------------------------------------------------------------------------------ 
    99 
     10#include <pjmedia-videodev/config.h> 
     11 
     12#if defined(PJMEDIA_VIDEO_DEV_HAS_DSHOW) && PJMEDIA_VIDEO_DEV_HAS_DSHOW != 0 
    1013 
    1114#include <streams.h> 
    … …  
    768771 
    769772 
     773#endif /* PJMEDIA_VIDEO_DEV_HAS_DSHOW */ 
Note: See TracChangeset for help on using the changeset viewer.