Changeset 4072


Ignore:
Timestamp:
Apr 24, 2012 7:07:39 AM (13 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
Files:
3 added
12 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjproject-vs8.sln

    r4062 r4072  
    143143Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjmedia_videodev", "pjmedia\build\pjmedia_videodev.vcproj", "{A1989FF3-9894-40F4-B5A6-6EA364476E45}" 
    144144EndProject 
    145 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BaseClasses", "third_party\BaseClasses\baseclasses.vcproj", "{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}" 
     145Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbaseclasses", "third_party\build\baseclasses\libbaseclasses.vcproj", "{E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}" 
    146146EndProject 
    147147Global 
     
    29572957                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug|Win32 
    29582958                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug|Win32 
    2959                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Dynamic|Pocket PC 2003 (ARMV4).ActiveCfg = Debug Unicode|Win32 
    2960                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Dynamic|Smartphone 2003 (ARMV4).ActiveCfg = Debug Unicode|Win32 
    2961                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Dynamic|Win32.ActiveCfg = Debug Unicode|Win32 
    2962                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Dynamic|Win32.Build.0 = Debug Unicode|Win32 
    2963                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug Unicode|Win32 
    2964                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug Unicode|Win32 
    2965                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug Unicode|Win32 
    2966                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug Unicode|Win32 
    2967                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Static|Pocket PC 2003 (ARMV4).ActiveCfg = Debug Unicode|Win32 
    2968                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Static|Smartphone 2003 (ARMV4).ActiveCfg = Debug Unicode|Win32 
    2969                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Static|Win32.ActiveCfg = Debug Unicode|Win32 
    2970                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Static|Win32.Build.0 = Debug Unicode|Win32 
    2971                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug Unicode|Win32 
    2972                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug Unicode|Win32 
    2973                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug Unicode|Win32 
    2974                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug Unicode|Win32 
     2959                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Dynamic|Pocket PC 2003 (ARMV4).ActiveCfg = Debug-Dynamic|Win32 
     2960                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Dynamic|Smartphone 2003 (ARMV4).ActiveCfg = Debug-Dynamic|Win32 
     2961                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Dynamic|Win32.ActiveCfg = Debug-Dynamic|Win32 
     2962                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Dynamic|Win32.Build.0 = Debug-Dynamic|Win32 
     2963                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug-Dynamic|Win32 
     2964                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug-Dynamic|Win32 
     2965                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug-Dynamic|Win32 
     2966                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug-Dynamic|Win32 
     2967                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Static|Pocket PC 2003 (ARMV4).ActiveCfg = Debug-Static|Win32 
     2968                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Static|Smartphone 2003 (ARMV4).ActiveCfg = Debug-Static|Win32 
     2969                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Static|Win32.ActiveCfg = Debug-Static|Win32 
     2970                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Static|Win32.Build.0 = Debug-Static|Win32 
     2971                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug-Static|Win32 
     2972                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Debug-Static|Win32 
     2973                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Static|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Debug-Static|Win32 
     2974                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Debug-Static|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Debug-Static|Win32 
    29752975                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32 
    29762976                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|Smartphone 2003 (ARMV4).ActiveCfg = Release|Win32 
     
    29812981                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Win32 
    29822982                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Win32 
    2983                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Dynamic|Pocket PC 2003 (ARMV4).ActiveCfg = Release Unicode|Win32 
    2984                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Dynamic|Smartphone 2003 (ARMV4).ActiveCfg = Release Unicode|Win32 
    2985                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Dynamic|Win32.ActiveCfg = Release Unicode|Win32 
    2986                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Dynamic|Win32.Build.0 = Release Unicode|Win32 
    2987                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release Unicode|Win32 
    2988                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release Unicode|Win32 
    2989                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release Unicode|Win32 
    2990                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release Unicode|Win32 
    2991                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Static|Pocket PC 2003 (ARMV4).ActiveCfg = Release Unicode|Win32 
    2992                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Static|Smartphone 2003 (ARMV4).ActiveCfg = Release Unicode|Win32 
    2993                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Static|Win32.ActiveCfg = Release Unicode|Win32 
    2994                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Static|Win32.Build.0 = Release Unicode|Win32 
    2995                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release Unicode|Win32 
    2996                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release Unicode|Win32 
    2997                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Static|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release Unicode|Win32 
    2998                 {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Static|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release Unicode|Win32 
     2983                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Dynamic|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32 
     2984                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Dynamic|Smartphone 2003 (ARMV4).ActiveCfg = Release|Win32 
     2985                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Dynamic|Win32.ActiveCfg = Release-Dynamic|Win32 
     2986                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Dynamic|Win32.Build.0 = Release-Dynamic|Win32 
     2987                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Dynamic|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32 
     2988                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Dynamic|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Win32 
     2989                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Dynamic|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Win32 
     2990                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Dynamic|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Win32 
     2991                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Static|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32 
     2992                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Static|Smartphone 2003 (ARMV4).ActiveCfg = Release|Win32 
     2993                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Static|Win32.ActiveCfg = Release-Static|Win32 
     2994                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Static|Win32.Build.0 = Release-Static|Win32 
     2995                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Static|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32 
     2996                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Static|Windows Mobile 5.0 Smartphone SDK (ARMV4I).ActiveCfg = Release|Win32 
     2997                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Static|Windows Mobile 6 Professional SDK (ARMV4I).ActiveCfg = Release|Win32 
     2998                {E8A3F6FA-AE1C-4C8E-A0B6-9C8480324EAA}.Release-Static|Windows Mobile 6 Standard SDK (ARMV4I).ActiveCfg = Release|Win32 
    29992999        EndGlobalSection 
    30003000        GlobalSection(SolutionProperties) = preSolution 
  • 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.