[Mplayer-cvslog] CVS: main/libmpcodecs ad_acm.c,1.10,1.11 ad_qtaudio.c,1.7,1.8 vd_qtvideo.c,1.13,1.14

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var/tmp.root/cvs-serv24025

Modified Files:
	ad_acm.c ad_qtaudio.c vd_qtvideo.c 
Log Message:
real cygwin support by Sascha Sommer <saschasommer at freenet.de>

Index: ad_acm.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_acm.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ad_acm.c	6 Nov 2002 23:54:24 -0000	1.10
+++ ad_acm.c	12 Feb 2003 15:39:59 -0000	1.11
@@ -81,7 +81,9 @@
 	print_wave_header(priv->o_wf);
     }
 
+#ifdef WIN32_LOADER
     MSACM_RegisterDriver((const char *)sh_audio->codec->dll, in_fmt->wFormatTag, 0);
+#endif
     ret = acmStreamOpen(&priv->handle, (HACMDRIVER)NULL, in_fmt,
 			priv->o_wf, NULL, 0, 0, 0);
     if (ret)
@@ -149,7 +151,9 @@
 	    return;
     }
     
+#ifdef WIN32_LOADER
     MSACM_UnregisterAllDrivers();
+#endif
 
     free(priv->o_wf);
     free(priv);

Index: ad_qtaudio.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ad_qtaudio.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ad_qtaudio.c	29 Dec 2002 13:42:58 -0000	1.7
+++ ad_qtaudio.c	12 Feb 2003 15:39:59 -0000	1.8
@@ -10,7 +10,7 @@
 #include "ad_internal.h"
 #include "bswap.h"
 
-#ifdef USE_WIN32DLL
+#ifdef WIN32_LOADER
 #include "ldt_keeper.h"
 #endif
 
@@ -81,7 +81,7 @@
 static int loader_init()
 {
 
-#ifdef USE_WIN32DLL
+#ifdef WIN32_LOADER
     Setup_LDT_Keeper();
 #endif
     qtml_dll = LoadLibraryA("qtmlClient.dll");

Index: vd_qtvideo.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/vd_qtvideo.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- vd_qtvideo.c	16 Dec 2002 02:38:37 -0000	1.13
+++ vd_qtvideo.c	12 Feb 2003 15:39:59 -0000	1.14
@@ -8,7 +8,7 @@
 #include "mp_msg.h"
 #include "vd_internal.h"
 
-#ifdef USE_WIN32DLL
+#ifdef WIN32_LOADER
 #include "ldt_keeper.h"
 #endif
 
@@ -98,7 +98,7 @@
     CodecInfo cinfo;	// for ImageCodecGetCodecInfo()
     ImageSubCodecDecompressCapabilities icap; // for ImageCodecInitialize()
 
-#ifdef USE_WIN32DLL
+#ifdef WIN32_LOADER
     Setup_LDT_Keeper();
 #endif