[Mplayer-cvslog] CVS: main/loader/dmo DMO_AudioDecoder.c,1.2,1.3 DMO_VideoDecoder.c,1.4,1.5 dmo.c,1.1,1.2

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/loader/dmo
In directory mail:/var/tmp.root/cvs-serv21596/dmo

Modified Files:
	DMO_AudioDecoder.c DMO_VideoDecoder.c dmo.c 
Log Message:
cygwin support patch by Sascha Sommer and some fixes by me

Index: DMO_AudioDecoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/loader/dmo/DMO_AudioDecoder.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DMO_AudioDecoder.c	14 Dec 2002 17:56:28 -0000	1.2
+++ DMO_AudioDecoder.c	21 Apr 2003 21:06:07 -0000	1.3
@@ -4,14 +4,16 @@
 	 Copyright 2001 Eugene Kuznetsov  (divx at euro.ru)
 
 *********************************************************/
-
+#include "config.h"
 #ifndef NOAVIFILE_HEADERS
 #include "audiodecoder.h"
 #include "except.h"
 #else
 #include "libwin32.h"
+#ifdef WIN32_LOADER
 #include "ldt_keeper.h"
 #endif
+#endif
 
 #include "DMO_Filter.h"
 #include "DMO_AudioDecoder.h"
@@ -43,8 +45,10 @@
     int sz;
     WAVEFORMATEX* pWF;
 
+#ifdef WIN32_LOADER
     Setup_LDT_Keeper();
     Setup_FS_Segment();
+#endif
         
     this = malloc(sizeof(DMO_AudioDecoder));
     
@@ -118,7 +122,9 @@
     if (!in_data || !out_data)
 	return -1;
 
+#ifdef WIN32_LOADER
     Setup_FS_Segment();
+#endif
     
     //m_pDMO_Filter->m_pMedia->vt->Lock(m_pDMO_Filter->m_pMedia, 1);
     bufferin = CMediaBufferCreate(in_size, (void*)in_data, in_size, 1);

Index: DMO_VideoDecoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/loader/dmo/DMO_VideoDecoder.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DMO_VideoDecoder.c	21 Apr 2003 20:09:08 -0000	1.4
+++ DMO_VideoDecoder.c	21 Apr 2003 21:06:07 -0000	1.5
@@ -4,11 +4,13 @@
 	Copyright 2000 Eugene Kuznetsov  (divx at euro.ru)
 
 *********************************************************/
-
+#include "config.h"
 #include "guids.h"
 #include "interfaces.h"
 #include "registry.h"
+#ifdef WIN32_LOADER
 #include "../ldt_keeper.h"
+#endif
 
 #ifndef NOAVIFILE_HEADERS
 #include "videodecoder.h"
@@ -101,7 +103,9 @@
     this->m_iLastQuality = -1;
     this->m_iMaxAuto = maxauto;
 
+#ifdef WIN32_LOADER
     Setup_LDT_Keeper();
+#endif
 
     //memset(&m_obh, 0, sizeof(m_obh));
     //m_obh.biSize = sizeof(m_obh);
@@ -313,7 +317,9 @@
 //	return -1;
 //    }
 
+#ifdef WIN32_LOADER
     Setup_FS_Segment();
+#endif
 
     bufferin = CMediaBufferCreate(size, (void*)src, size, 0);
     result = this->m_pDMO_Filter->m_pMedia->vt->ProcessInput(this->m_pDMO_Filter->m_pMedia, 0,
@@ -500,7 +506,9 @@
 	break;
     }
 
+#ifdef WIN32_LOADER
     Setup_FS_Segment();
+#endif
 
 //    if(should_test)
 //	result = this->m_pDMO_Filter->m_pOutputPin->vt->QueryAccept(this->m_pDMO_Filter->m_pOutputPin, &this->m_sDestType);

Index: dmo.c
===================================================================
RCS file: /cvsroot/mplayer/main/loader/dmo/dmo.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dmo.c	26 Nov 2002 22:54:11 -0000	1.1
+++ dmo.c	21 Apr 2003 21:06:07 -0000	1.2
@@ -1,3 +1,4 @@
+#include "config.h"
 #include "DMO_Filter.h"
 #include "driver.h"
 #include "com.h"
@@ -19,7 +20,9 @@
 	This->m_pMedia->vt->Release((IUnknown*)This->m_pMedia);
 
     free(This);
+#ifdef WIN32_LOADER
     CodecRelease();
+#endif
 }
 
 DMO_Filter* DMO_FilterCreate(const char* dllname, const GUID* id,
@@ -33,7 +36,9 @@
 	return NULL;
 
     memset(This, 0, sizeof(DMO_Filter));
+#ifdef WIN32_LOADER
     CodecAlloc();
+#endif
 
     //This->Start = DS_Filter_Start;
     //This->Stop = DS_Filter_Stop;