WG: [MPlayer-cygwin] Qtx support under Windows?

[Gianluigi Tiesi]

I've made the full patch, please test it on linux, too many
reboots for today ;)

I think win32 stuff can be cleaned a bit.

Bye

-- 
Gianluigi Tiesi <sherpya at netfarm.it>
EDP Project Leader
Netfarm S.r.l. - http://www.netfarm.it/
Free Software: http://oss.netfarm.it/
-------------- next part --------------
diff -NubBr -xCVS -xhelp_mp.h -xGui -x'*.a' -x'*.exe' -x'*.o' -xconfigure.log -xconfig.mak -x.cvsignore -x'*.ini' -xconfig.h -xcodecs.conf.h -xversion.h -x.depend main/libmpcodecs/ad_qtaudio.c sherpya/libmpcodecs/ad_qtaudio.c
--- main/libmpcodecs/ad_qtaudio.c	2004-12-04 23:59:19.000000000 +0100
+++ sherpya/libmpcodecs/ad_qtaudio.c	2005-01-14 22:12:47.658603200 +0100
@@ -68,6 +68,7 @@
                                 unsigned long *outputBytes);
 typedef int (__cdecl* LPFUNC9)(SoundConverter         sc) ;                                
 
+static HINSTANCE qtime_qts;
 static HINSTANCE qtml_dll;
 static LPFUNC1 InitializeQTML;
 static LPFUNC2 SoundConverterOpen;
@@ -91,10 +92,16 @@
 #ifdef WIN32_LOADER
     Setup_LDT_Keeper();
 #endif
+    qtime_qts = LoadLibraryA("QuickTime.qts");
+    if( qtime_qts == (HMODULE)NULL )
+    {
+        mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed loading QuickTime.qts\n" );
+        return 1;
+    }
     qtml_dll = LoadLibraryA("qtmlClient.dll");
     if( qtml_dll == (HMODULE)NULL )
     {
-        mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed loading dll\n" );
+        mp_msg(MSGT_DECAUDIO,MSGL_ERR,"failed loading qtmlClient.dll\n" );
 	return 1;
     }
 #if 1
@@ -269,6 +276,8 @@
 //    printf("TerminateQTML:%i\n",error);
 //    FreeLibrary( qtml_dll );
 //    qtml_dll = NULL;
+//    FreeLibrary( qtime_qts );
+//    qtime_qts = NULL;
 //    printf("qt dll loader uninit done\n");
 #ifdef MACOSX
     ExitMovies();
diff -NubBr -xCVS -xhelp_mp.h -xGui -x'*.a' -x'*.exe' -x'*.o' -xconfigure.log -xconfig.mak -x.cvsignore -x'*.ini' -xconfig.h -xcodecs.conf.h -xversion.h -x.depend main/libmpcodecs/vd_qtvideo.c sherpya/libmpcodecs/vd_qtvideo.c
--- main/libmpcodecs/vd_qtvideo.c	2004-12-04 23:59:20.000000000 +0100
+++ sherpya/libmpcodecs/vd_qtvideo.c	2005-01-14 22:14:28.183150400 +0100
@@ -52,7 +52,7 @@
 
 static GWorldPtr OutBufferGWorld = NULL;//a GWorld is some kind of description for a drawing environment
 static ImageDescriptionHandle framedescHandle;
-//static HINSTANCE qtml_dll;
+static HINSTANCE qtime_qts;
 static HMODULE handler;
 
 #if defined(USE_QTX_CODECS) && !defined(MACOSX)
@@ -116,6 +116,12 @@
     Setup_LDT_Keeper();
 #endif
 
+    qtime_qts = LoadLibraryA("QuickTime.qts");
+    if(!qtime_qts){
+    mp_msg(MSGT_DECVIDEO,MSGL_ERR,"unable to load QuickTime.qts\n" );
+    return 0;
+    }
+    
     handler = LoadLibraryA("qtmlClient.dll");
     if(!handler){
     mp_msg(MSGT_DECVIDEO,MSGL_ERR,"unable to load qtmlClient.dll\n");
diff -NubBr -xCVS -xhelp_mp.h -xGui -x'*.a' -x'*.exe' -x'*.o' -xconfigure.log -xconfig.mak -x.cvsignore -x'*.ini' -xconfig.h -xcodecs.conf.h -xversion.h -x.depend main/libmpcodecs/ve_qtvideo.c sherpya/libmpcodecs/ve_qtvideo.c
--- main/libmpcodecs/ve_qtvideo.c	2004-12-04 23:59:21.000000000 +0100
+++ sherpya/libmpcodecs/ve_qtvideo.c	2005-01-14 22:16:09.709137600 +0100
@@ -34,6 +34,7 @@
 HMODULE   WINAPI LoadLibraryA(LPCSTR);
 FARPROC   WINAPI GetProcAddress(HMODULE,LPCSTR);
 int       WINAPI FreeLibrary(HMODULE);
+static HINSTANCE qtime_qts;
 static HMODULE handler;
 
 static OSErr        (*FindCodec)(CodecType              cType,
@@ -296,6 +297,12 @@
 #ifdef WIN32_LOADER
     Setup_LDT_Keeper();
 #endif
+    qtime_qts = LoadLibraryA("QuickTime.qts");
+    if(!qtime_qts){
+        mp_msg(MSGT_MENCODER,MSGL_ERR,"unable to load QuickTime.qts\n" );
+        return 0;
+    }
+    
     handler = LoadLibraryA("qtmlClient.dll");
     if(!handler){
         mp_msg(MSGT_MENCODER,MSGL_ERR,"unable to load qtmlClient.dll\n");