Parent Directory
| 
Revision Log
Revision 1514 - (view) (download)
| 1 : | suxen_drol | 1514 | diff -urN /c/DXVCSDK-orig/Include/strmif.h ./Include/strmif.h |
| 2 : | --- /c/DXVCSDK-orig/Include/strmif.h Wed Dec 4 01:03:00 2002 | ||
| 3 : | +++ ./Include/strmif.h Fri Jul 16 21:22:28 2004 | ||
| 4 : | @@ -28732,8 +28732,8 @@ | ||
| 5 : | |||
| 6 : | typedef struct tagVMRGUID | ||
| 7 : | { | ||
| 8 : | - GUID *pGUID; | ||
| 9 : | - GUID GUID; | ||
| 10 : | + ::GUID *pGUID; | ||
| 11 : | + ::GUID GUID; | ||
| 12 : | } VMRGUID; | ||
| 13 : | |||
| 14 : | typedef struct tagVMRMONITORINFO | ||
| 15 : | diff -urN /c/DXVCSDK-orig/Samples/C++/Directshow/BaseClasses/Makefile ./Samples/C++/Directshow/BaseClasses/Makefile | ||
| 16 : | --- /c/DXVCSDK-orig/Samples/C++/Directshow/BaseClasses/Makefile Thu Jan 1 10:00:00 1970 | ||
| 17 : | +++ ./Samples/C++/Directshow/BaseClasses/Makefile Sun Jul 18 12:13:06 2004 | ||
| 18 : | @@ -0,0 +1,25 @@ | ||
| 19 : | +SRC=amextra.cpp amfilter.cpp amvideo.cpp combase.cpp cprop.cpp ctlutil.cpp ddmm.cpp dllentry.cpp dllsetup.cpp mtype.cpp outputq.cpp pstream.cpp pullpin.cpp refclock.cpp renbase.cpp schedule.cpp seekpt.cpp source.cpp strmctl.cpp sysclock.cpp transfrm.cpp transip.cpp videoctl.cpp vtrans.cpp winctrl.cpp winutil.cpp wxdebug.cpp wxlist.cpp wxutil.cpp | ||
| 20 : | + | ||
| 21 : | +#DXROOT=/c/DXVCSDK | ||
| 22 : | +DXROOT=../../../.. | ||
| 23 : | +OBJ=$(SRC:.cpp=.o) | ||
| 24 : | +LIB=strmbase.lib | ||
| 25 : | + | ||
| 26 : | +CXX=g++ | ||
| 27 : | +CXXFLAGS=-O2 -fno-for-scope -mthreads | ||
| 28 : | + | ||
| 29 : | +all: $(LIB) | ||
| 30 : | + | ||
| 31 : | +$(LIB): $(OBJ) | ||
| 32 : | + $(AR) $(ARFLAGS) $@ $^ | ||
| 33 : | + | ||
| 34 : | +.cpp.o: | ||
| 35 : | + $(CXX) $(CXXFLAGS) \ | ||
| 36 : | + -DRELEASE \ | ||
| 37 : | + -I$(DXROOT)/Include \ | ||
| 38 : | + -I$(DXROOT)/samples/C++/DirectShow/BaseClasses \ | ||
| 39 : | + -include $(DXROOT)/mingw_dshow_port.h \ | ||
| 40 : | + -c $(CXXFLAGS) $< -o $@ | ||
| 41 : | + | ||
| 42 : | +clean: | ||
| 43 : | + rm $(OBJ) | ||
| 44 : | diff -urN /c/DXVCSDK-orig/Samples/C++/Directshow/BaseClasses/ctlutil.cpp ./Samples/C++/Directshow/BaseClasses/ctlutil.cpp | ||
| 45 : | --- /c/DXVCSDK-orig/Samples/C++/Directshow/BaseClasses/ctlutil.cpp Tue Nov 12 20:11:26 2002 | ||
| 46 : | +++ ./Samples/C++/Directshow/BaseClasses/ctlutil.cpp Fri Jul 16 21:21:06 2004 | ||
| 47 : | @@ -709,7 +709,7 @@ | ||
| 48 : | |||
| 49 : | HRESULT | ||
| 50 : | CPosPassThru::GetSeekingLongLong | ||
| 51 : | -( HRESULT (__stdcall IMediaSeeking::*pMethod)( LONGLONG * ) | ||
| 52 : | +( HRESULT ( IMediaSeeking::*pMethod)( LONGLONG * ) | ||
| 53 : | , LONGLONG * pll | ||
| 54 : | ) | ||
| 55 : | { | ||
| 56 : | diff -urN /c/DXVCSDK-orig/Samples/C++/Directshow/BaseClasses/ctlutil.h ./Samples/C++/Directshow/BaseClasses/ctlutil.h | ||
| 57 : | --- /c/DXVCSDK-orig/Samples/C++/Directshow/BaseClasses/ctlutil.h Tue Nov 12 20:11:26 2002 | ||
| 58 : | +++ ./Samples/C++/Directshow/BaseClasses/ctlutil.h Fri Jul 16 21:21:57 2004 | ||
| 59 : | @@ -275,7 +275,7 @@ | ||
| 60 : | // Prevent bugs from constructing from LONG (which gets | ||
| 61 : | // converted to double and then multiplied by 10000000 | ||
| 62 : | COARefTime(LONG); | ||
| 63 : | - operator=(LONG); | ||
| 64 : | + COARefTime& operator=(LONG); | ||
| 65 : | }; | ||
| 66 : | |||
| 67 : | |||
| 68 : | @@ -355,7 +355,7 @@ | ||
| 69 : | STDMETHODIMP CanSeekBackward(LONG *pCanSeekBackward); | ||
| 70 : | |||
| 71 : | private: | ||
| 72 : | - HRESULT GetSeekingLongLong( HRESULT (__stdcall IMediaSeeking::*pMethod)( LONGLONG * ), | ||
| 73 : | + HRESULT GetSeekingLongLong( HRESULT ( IMediaSeeking::*pMethod)( LONGLONG * ), | ||
| 74 : | LONGLONG * pll ); | ||
| 75 : | }; | ||
| 76 : | |||
| 77 : | diff -urN /c/DXVCSDK-orig/Samples/C++/Directshow/BaseClasses/ddmm.cpp ./Samples/C++/Directshow/BaseClasses/ddmm.cpp | ||
| 78 : | --- /c/DXVCSDK-orig/Samples/C++/Directshow/BaseClasses/ddmm.cpp Tue Nov 12 20:11:26 2002 | ||
| 79 : | +++ ./Samples/C++/Directshow/BaseClasses/ddmm.cpp Fri Jul 16 21:42:13 2004 | ||
| 80 : | @@ -17,8 +17,8 @@ | ||
| 81 : | */ | ||
| 82 : | typedef struct { | ||
| 83 : | LPSTR szDevice; | ||
| 84 : | - GUID* lpGUID; | ||
| 85 : | - GUID GUID; | ||
| 86 : | + ::GUID* lpGUID; | ||
| 87 : | + ::GUID GUID; | ||
| 88 : | BOOL fFound; | ||
| 89 : | } FindDeviceData; | ||
| 90 : | |||
| 91 : | diff -urN /c/DXVCSDK-orig/Samples/C++/Directshow/BaseClasses/mtype.cpp ./Samples/C++/Directshow/BaseClasses/mtype.cpp | ||
| 92 : | --- /c/DXVCSDK-orig/Samples/C++/Directshow/BaseClasses/mtype.cpp Tue Nov 12 20:11:26 2002 | ||
| 93 : | +++ ./Samples/C++/Directshow/BaseClasses/mtype.cpp Fri Jul 16 21:43:44 2004 | ||
| 94 : | @@ -13,7 +13,6 @@ | ||
| 95 : | // in the streams IDL file, but also has (non-virtual) functions | ||
| 96 : | |||
| 97 : | #include <streams.h> | ||
| 98 : | -#include <mmreg.h> | ||
| 99 : | |||
| 100 : | CMediaType::~CMediaType(){ | ||
| 101 : | FreeMediaType(*this); | ||
| 102 : | diff -urN /c/DXVCSDK-orig/Samples/C++/Directshow/BaseClasses/wxdebug.cpp ./Samples/C++/Directshow/BaseClasses/wxdebug.cpp | ||
| 103 : | --- /c/DXVCSDK-orig/Samples/C++/Directshow/BaseClasses/wxdebug.cpp Tue Nov 12 20:11:26 2002 | ||
| 104 : | +++ ./Samples/C++/Directshow/BaseClasses/wxdebug.cpp Sun Jul 18 13:21:46 2004 | ||
| 105 : | @@ -564,7 +564,7 @@ | ||
| 106 : | { | ||
| 107 : | // re-read the registry every second. We cannot use RegNotify() to | ||
| 108 : | // notice registry changes because it's not available on win9x. | ||
| 109 : | - static g_dwLastRefresh = 0; | ||
| 110 : | + static DWORD g_dwLastRefresh = 0; | ||
| 111 : | DWORD dwTime = timeGetTime(); | ||
| 112 : | if(dwTime - g_dwLastRefresh > 1000) { | ||
| 113 : | g_dwLastRefresh = dwTime; | ||
| 114 : | @@ -1143,7 +1143,33 @@ | ||
| 115 : | hr = pUnk->QueryInterface(IID_IPin, (void **)&pp); | ||
| 116 : | if(SUCCEEDED(hr)) | ||
| 117 : | { | ||
| 118 : | - CDisp::CDisp(pp); | ||
| 119 : | +/* --- copy from CDisp::CDisp(IPin*) --- */ | ||
| 120 : | + PIN_INFO pi; | ||
| 121 : | + TCHAR str[MAX_PIN_NAME]; | ||
| 122 : | + CLSID clsid; | ||
| 123 : | + | ||
| 124 : | + if (pp) { | ||
| 125 : | + pp->QueryPinInfo(&pi); | ||
| 126 : | + pi.pFilter->GetClassID(&clsid); | ||
| 127 : | + QueryPinInfoReleaseFilter(pi); | ||
| 128 : | + #ifndef UNICODE | ||
| 129 : | + WideCharToMultiByte(GetACP(), 0, pi.achName, lstrlenW(pi.achName) + 1, | ||
| 130 : | + str, MAX_PIN_NAME, NULL, NULL); | ||
| 131 : | + #else | ||
| 132 : | + lstrcpy(str, pi.achName); | ||
| 133 : | + #endif | ||
| 134 : | + } else { | ||
| 135 : | + lstrcpy(str, TEXT("NULL IPin")); | ||
| 136 : | + } | ||
| 137 : | + | ||
| 138 : | + m_pString = (PTCHAR) new TCHAR[lstrlen(str)+64]; | ||
| 139 : | + if (!m_pString) { | ||
| 140 : | + pp->Release(); | ||
| 141 : | + return; | ||
| 142 : | + } | ||
| 143 : | + | ||
| 144 : | + wsprintf(m_pString, TEXT("%hs(%s)"), GuidNames[clsid], str); | ||
| 145 : | +/* --- copy from CDisp::CDisp(IPin*) --- */ | ||
| 146 : | pp->Release(); | ||
| 147 : | return; | ||
| 148 : | } | ||
| 149 : | diff -urN /c/DXVCSDK-orig/mingw_dshow_port.h ./mingw_dshow_port.h | ||
| 150 : | --- /c/DXVCSDK-orig/mingw_dshow_port.h Thu Jan 1 10:00:00 1970 | ||
| 151 : | +++ ./mingw_dshow_port.h Sun Jul 18 12:15:19 2004 | ||
| 152 : | @@ -0,0 +1,12 @@ | ||
| 153 : | +#include <wtypes.h> | ||
| 154 : | +#include <unknwn.h> | ||
| 155 : | +#include <ole2.h> | ||
| 156 : | +#include <limits.h> | ||
| 157 : | + | ||
| 158 : | +#define _WINGDI_ 1 | ||
| 159 : | +#define AM_NOVTABLE | ||
| 160 : | +#define _OBJBASE_H_ | ||
| 161 : | +#undef _X86_ | ||
| 162 : | +#define _I64_MAX LONG_LONG_MAX | ||
| 163 : | +#define EXTERN_GUID(itf,l1,s1,s2,c1,c2,c3,c4,c5,c6,c7,c8) \ | ||
| 164 : | + EXTERN_C static const IID itf = {l1,s1,s2,{c1,c2,c3,c4,c5,c6,c7,c8} } |
| No admin address has been configured | ViewVC Help |
| Powered by ViewVC 1.0.4 |