From f7d7e887d9c75c0efaadb0beba7cce42a2cb5cc0 Mon Sep 17 00:00:00 2001 From: arpi Date: Thu, 4 Oct 2001 11:56:12 +0000 Subject: killed unneeded dependency on c++ headers git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2073 b3059339-0415-0410-9bf9-f77b7e298cf2 --- loader/dshow/DS_AudioDec.c | 20 ++++++++++---------- loader/dshow/DS_AudioDecoder.c | 2 +- loader/dshow/DS_AudioDecoder.h | 2 +- loader/dshow/DS_VideoDec.c | 21 +++++++++++---------- loader/dshow/DS_VideoDecoder.c | 21 +++++++++++---------- loader/dshow/libwin32.h | 5 +++-- loader/dshow/outputpin.c | 8 ++++++-- 7 files changed, 43 insertions(+), 36 deletions(-) (limited to 'loader/dshow') diff --git a/loader/dshow/DS_AudioDec.c b/loader/dshow/DS_AudioDec.c index d96d513072..f9e803619b 100644 --- a/loader/dshow/DS_AudioDec.c +++ b/loader/dshow/DS_AudioDec.c @@ -3,18 +3,18 @@ #include "interfaces.h" #include "DS_AudioDecoder.h" -#include -#include +#include "wine/winerror.h" +#include "libwin32.h" //#include -#include -#include -#include -#include -#include -#include -#include -#include +//#include +//#include +//#include +//#include +//#include +//#include +//#include +//#include #include "DS_AudioDec.h" diff --git a/loader/dshow/DS_AudioDecoder.c b/loader/dshow/DS_AudioDecoder.c index 26ad1406e1..87e919c7c0 100644 --- a/loader/dshow/DS_AudioDecoder.c +++ b/loader/dshow/DS_AudioDecoder.c @@ -68,7 +68,7 @@ DS_AudioDecoder::DS_AudioDecoder(const CodecInfo& info, const WAVEFORMATEX* wf) try { m_pDS_Filter = new DS_Filter(); - m_pDS_Filter->Create(info.dll.c_str(), &info.guid, &m_sOurType, &m_sDestType); + m_pDS_Filter->Create(info.dll, &info.guid, &m_sOurType, &m_sDestType); m_pDS_Filter->Start(); ALLOCATOR_PROPERTIES props, props1; diff --git a/loader/dshow/DS_AudioDecoder.h b/loader/dshow/DS_AudioDecoder.h index 5b3eb548bf..e527156e4e 100644 --- a/loader/dshow/DS_AudioDecoder.h +++ b/loader/dshow/DS_AudioDecoder.h @@ -1,7 +1,7 @@ #ifndef AVIFILE_DSHOW_H #define AVIFILE_DSHOW_H -#include +#include "libwin32.h" #include "DS_Filter.h" class DS_AudioDecoder : public IAudioDecoder diff --git a/loader/dshow/DS_VideoDec.c b/loader/dshow/DS_VideoDec.c index 541fc34fa3..2df86ab0eb 100644 --- a/loader/dshow/DS_VideoDec.c +++ b/loader/dshow/DS_VideoDec.c @@ -3,19 +3,20 @@ #include "libwin32.h" #include "DS_VideoDecoder.h" -#include +#include "wine/winerror.h" //#include -#include -#include -#include -#include -#include -#include -#include -#include +//#include +//#include +//#include +//#include +//#include -#include +//#include +//#include +//#include + +#include "registry.h" //#include #include "DS_VideoDec.h" diff --git a/loader/dshow/DS_VideoDecoder.c b/loader/dshow/DS_VideoDecoder.c index a04817c495..0f4fdd7a1b 100644 --- a/loader/dshow/DS_VideoDecoder.c +++ b/loader/dshow/DS_VideoDecoder.c @@ -18,9 +18,10 @@ #include #include #include -#include -#include -#include + +//#include +//#include +//#include #define __MODULE__ "DirectShow_VideoDecoder" @@ -83,7 +84,7 @@ DS_VideoDecoder::DS_VideoDecoder(const CodecInfo& info, const BITMAPINFOHEADER& HRESULT result; - m_pDS_Filter->Create(info.dll.c_str(), &info.guid, &m_sOurType, &m_sDestType); + m_pDS_Filter->Create(info.dll, &info.guid, &m_sOurType, &m_sDestType); if (!flip) { @@ -150,10 +151,10 @@ DS_VideoDecoder::DS_VideoDecoder(const CodecInfo& info, const BITMAPINFOHEADER& m_sVhdr2->bmiHeader.biCompression = 0; m_sDestType.subtype = MEDIASUBTYPE_RGB24; - m_bIsDivX = ((info.dll == string("divxcvki.ax")) - || (info.dll == string("divx_c32.ax")) - || (info.dll == string("wmvds32.ax")) - || (info.dll == string("wmv8ds32.ax"))); + m_bIsDivX = ((strcmp(info.dll,"divxcvki.ax")==0) + || (strcmp(info.dll,"divx_c32.ax")==0) + || (strcmp(info.dll,"wmvds32.ax")==0) + || (strcmp(info.dll,"wmv8ds32.ax")==0) ); printf("m_bIsDivX=%d\n",m_bIsDivX); } @@ -501,7 +502,7 @@ HRESULT DS_VideoDecoder::GetValue(const char* name, int& value) return 0; } } - else if (record.dll == string("ir50_32.dll")) + else if (strcmp(record.dll,"ir50_32.dll")==0) { IHidden2* hidden = 0; if (m_pDS_Filter->m_pFilter->vt->QueryInterface((IUnknown*)m_pDS_Filter->m_pFilter, &IID_Iv50Hidden, (void**)&hidden)) @@ -584,7 +585,7 @@ HRESULT DS_VideoDecoder::SetValue(const char* name, int value) if (strcmp(name, "Hue") == 0) return hidden->vt->SetSmth5(hidden, value, 0); } - else if (record.dll == string("ir50_32.dll")) + else if (strcmp(record.dll,"ir50_32.dll")==0) { IHidden2* hidden = 0; if (m_pDS_Filter->m_pFilter->vt->QueryInterface((IUnknown*)m_pDS_Filter->m_pFilter, &IID_Iv50Hidden, (void**)&hidden)) diff --git a/loader/dshow/libwin32.h b/loader/dshow/libwin32.h index 038002fca9..42aa44dd64 100644 --- a/loader/dshow/libwin32.h +++ b/loader/dshow/libwin32.h @@ -33,7 +33,7 @@ #include #include #include -#include +//#include #include typedef unsigned int uint_t; // use as generic type - @@ -55,7 +55,8 @@ struct FatalError struct CodecInfo { - std::string dll; +// std::string dll; + char* dll; GUID guid; }; diff --git a/loader/dshow/outputpin.c b/loader/dshow/outputpin.c index 22311d77dc..49841bd8c2 100644 --- a/loader/dshow/outputpin.c +++ b/loader/dshow/outputpin.c @@ -2,8 +2,12 @@ #include "allocator.h" #include "iunk.h" #include "wine/winerror.h" -#include -#include + +#include "stdio.h" +//#include "string.h" + +//#include +//#include /* An object beyond interface IEnumMediaTypes. -- cgit v1.2.3