[Mplayer-cvslog] CVS: main mplayer.c,1.719,1.720

Sascha Sommer CVS faust3 at mplayerhq.hu
Sun Aug 17 21:18:52 CEST 2003


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

Modified Files:
	mplayer.c 
Log Message:
dll loading from codecs dir support for windows

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.719
retrieving revision 1.720
diff -u -r1.719 -r1.720
--- mplayer.c	14 Aug 2003 21:29:39 -0000	1.719
+++ mplayer.c	17 Aug 2003 19:18:29 -0000	1.720
@@ -782,6 +782,40 @@
 #endif
 #endif
 
+#if defined(WIN32) && defined(USE_WIN32DLL)
+{  /*make our codec dirs available for LoadLibraryA()*/
+  char tmppath[MAX_PATH*2 + 1];
+  char win32path[MAX_PATH];
+  char realpath[MAX_PATH];
+  int       WINAPI SetEnvironmentVariableA(char*,char*);
+  int       WINAPI GetModuleFileNameA(void*,char*,int);
+#ifdef __CYGWIN__
+  cygwin_conv_to_full_win32_path(WIN32_PATH,win32path);
+  strcpy(tmppath,win32path);
+#ifdef USE_REALCODECS
+  cygwin_conv_to_full_win32_path(REALCODEC_PATH,realpath);
+  sprintf(tmppath,"%s;%s",win32path,realpath);
+#endif /*USE_REALCODECS*/
+#else
+  if(!strstr(WIN32_PATH,":")){
+    GetModuleFileNameA(NULL, win32path, MAX_PATH);
+    strcpy(win32path + strlen(win32path) - strlen("mplayer.exe"), WIN32_PATH);
+  }
+  else strcpy(win32path,WIN32_PATH);
+  strcpy(tmppath,win32path);
+#ifdef USE_REALCODECS
+  if(!strstr(REALCODEC_PATH,":")){
+    GetModuleFileNameA(NULL, realpath, MAX_PATH);
+    strcpy(realpath + strlen(realpath) - strlen("mplayer.exe"), REALCODEC_PATH);
+  }
+  else strcpy(realpath,REALCODEC_PATH);
+  sprintf(tmppath,"%s;%s",win32path,realpath);
+#endif /*USE_REALCODECS*/
+#endif /*__CYGWIN__*/
+  SetEnvironmentVariableA("PATH", tmppath);
+}
+#endif /*WIN32 && USE_WIN32DLL*/
+
 #ifdef USE_TV
   tv_param_immediate = 1;
 #endif



More information about the MPlayer-cvslog mailing list