[Mplayer-cvslog] CVS: main/loader/DirectShow DS_AudioDec.cpp,1.6,1.7 DS_AudioDecoder.cpp,1.2,1.3 DS_AudioDecoder.h,1.1,1.2 DS_VideoDec.cpp,1.16,1.17 DS_VideoDecoder.cpp,1.6,1.7 libwin32.h,1.4,1.5 outputpin.cpp,1.5,1.6
Arpi of Ize
arpi at mplayer.dev.hu
Thu Oct 4 13:56:30 CEST 2001
Update of /cvsroot/mplayer/main/loader/DirectShow
In directory mplayer:/var/tmp.root/cvs-serv28458
Modified Files:
DS_AudioDec.cpp DS_AudioDecoder.cpp DS_AudioDecoder.h
DS_VideoDec.cpp DS_VideoDecoder.cpp libwin32.h outputpin.cpp
Log Message:
killed unneeded dependency on c++ headers
Index: DS_AudioDec.cpp
===================================================================
RCS file: /cvsroot/mplayer/main/loader/DirectShow/DS_AudioDec.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DS_AudioDec.cpp 4 Oct 2001 00:07:15 -0000 1.6
+++ DS_AudioDec.cpp 4 Oct 2001 11:56:12 -0000 1.7
@@ -3,18 +3,18 @@
#include "interfaces.h"
#include "DS_AudioDecoder.h"
-#include <wine/winerror.h>
-#include <libwin32.h>
+#include "wine/winerror.h"
+#include "libwin32.h"
//#include <cpuinfo.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <cstdio>
-#include <iostream>
-#include <strstream>
+//#include <unistd.h>
+//#include <fcntl.h>
+//#include <errno.h>
+//#include <sys/types.h>
+//#include <sys/mman.h>
+//#include <cstdio>
+//#include <iostream>
+//#include <strstream>
#include "DS_AudioDec.h"
Index: DS_AudioDecoder.cpp
===================================================================
RCS file: /cvsroot/mplayer/main/loader/DirectShow/DS_AudioDecoder.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DS_AudioDecoder.cpp 4 Oct 2001 02:21:47 -0000 1.2
+++ DS_AudioDecoder.cpp 4 Oct 2001 11:56:12 -0000 1.3
@@ -68,7 +68,7 @@
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;
Index: DS_AudioDecoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/loader/DirectShow/DS_AudioDecoder.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DS_AudioDecoder.h 16 Aug 2001 00:50:02 -0000 1.1
+++ DS_AudioDecoder.h 4 Oct 2001 11:56:12 -0000 1.2
@@ -1,7 +1,7 @@
#ifndef AVIFILE_DSHOW_H
#define AVIFILE_DSHOW_H
-#include <libwin32.h>
+#include "libwin32.h"
#include "DS_Filter.h"
class DS_AudioDecoder : public IAudioDecoder
Index: DS_VideoDec.cpp
===================================================================
RCS file: /cvsroot/mplayer/main/loader/DirectShow/DS_VideoDec.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DS_VideoDec.cpp 4 Oct 2001 00:07:15 -0000 1.16
+++ DS_VideoDec.cpp 4 Oct 2001 11:56:12 -0000 1.17
@@ -3,19 +3,20 @@
#include "libwin32.h"
#include "DS_VideoDecoder.h"
-#include <wine/winerror.h>
+#include "wine/winerror.h"
//#include <cpuinfo.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <cstdio>
-#include <iostream>
-#include <strstream>
+//#include <unistd.h>
+//#include <fcntl.h>
+//#include <errno.h>
+//#include <sys/types.h>
+//#include <sys/mman.h>
-#include <registry.h>
+//#include <cstdio>
+//#include <iostream>
+//#include <strstream>
+
+#include "registry.h"
//#include <wine/winreg.h>
#include "DS_VideoDec.h"
Index: DS_VideoDecoder.cpp
===================================================================
RCS file: /cvsroot/mplayer/main/loader/DirectShow/DS_VideoDecoder.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DS_VideoDecoder.cpp 4 Oct 2001 02:21:47 -0000 1.6
+++ DS_VideoDecoder.cpp 4 Oct 2001 11:56:12 -0000 1.7
@@ -18,9 +18,10 @@
#include <errno.h>
#include <sys/types.h>
#include <sys/mman.h>
-#include <cstdio>
-#include <iostream>
-#include <strstream>
+
+//#include <cstdio>
+//#include <iostream>
+//#include <strstream>
#define __MODULE__ "DirectShow_VideoDecoder"
@@ -83,7 +84,7 @@
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 @@
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 @@
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 @@
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))
Index: libwin32.h
===================================================================
RCS file: /cvsroot/mplayer/main/loader/DirectShow/libwin32.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libwin32.h 4 Oct 2001 02:21:47 -0000 1.4
+++ libwin32.h 4 Oct 2001 11:56:12 -0000 1.5
@@ -33,7 +33,7 @@
#include <wine/vfw.h>
#include <com.h>
#include <stdarg.h>
-#include <string>
+//#include <string>
#include <stdio.h>
typedef unsigned int uint_t; // use as generic type -
@@ -55,7 +55,8 @@
struct CodecInfo
{
- std::string dll;
+// std::string dll;
+ char* dll;
GUID guid;
};
Index: outputpin.cpp
===================================================================
RCS file: /cvsroot/mplayer/main/loader/DirectShow/outputpin.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- outputpin.cpp 4 Oct 2001 02:21:47 -0000 1.5
+++ outputpin.cpp 4 Oct 2001 11:56:12 -0000 1.6
@@ -2,8 +2,12 @@
#include "allocator.h"
#include "iunk.h"
#include "wine/winerror.h"
-#include <cstdio>
-#include <cstring>
+
+#include "stdio.h"
+//#include "string.h"
+
+//#include <cstdio>
+//#include <cstring>
/*
An object beyond interface IEnumMediaTypes.
More information about the MPlayer-cvslog
mailing list