[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xine-cvslog
Subject:    [xine-cvs] CVS: xine-lib/src/xine-engine Makefile.am,1.106,1.107 load_plugins.c,1.211,1.212 xine.c,1
From:       Frantisek Dvorak <valtri () users ! sourceforge ! net>
Date:       2005-08-29 15:28:19
Message-ID: E1E9lYZ-0006iE-9r () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/xine/xine-lib/src/xine-engine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25680/src/xine-engine

Modified Files:
	Makefile.am load_plugins.c xine.c 
Log Message:
*BUGFIX*
Windows ports updates:
  - finished M$VC port update
  - moved xine plugins back to normal location for Windows ports,
    added relative directories (used relative to ${prefix}),
    make sure it's thread-safe (but it's still hacky)
  - fixed ugly bug with loading plugins, when working drive was differrent from
    plugins directory
    directory
  - directory and subdirectory separator called as platform specific
  - fix crash with newer win32 pthread (missing mutex_init in vo plugin), yes!
  - small doc update


Index: Makefile.am
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-engine/Makefile.am,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- Makefile.am	25 Aug 2005 15:36:30 -0000	1.106
+++ Makefile.am	29 Aug 2005 15:28:16 -0000	1.107
@@ -58,7 +58,7 @@
 	cp -p $(DEF_FILE) $(DESTDIR)$(libdir)
 
 uninstall-local:
-	rm -f $(DEF_FILE) $(DESTDIR)$(libdir)
+	rm -f $(DEF_FILE)
 endif
 
 @INCLUDED_INTL_TRUE@@INTLLIBS@:

Index: load_plugins.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-engine/load_plugins.c,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- load_plugins.c	25 Aug 2005 15:36:30 -0000	1.211
+++ load_plugins.c	29 Aug 2005 15:28:16 -0000	1.212
@@ -1088,21 +1088,21 @@
   if ((pluginpath = getenv("XINE_PLUGIN_PATH")) != NULL) {
     pluginpath = strdup(pluginpath);
   } else {
-    char *str1, *str2;
+    const char *str1, *str2;
     int len;
 
     str1 = "~/.xine/plugins";
     str2 = XINE_PLUGINDIR;
     len = strlen(str1) + strlen(str2) + 2;
     pluginpath = xine_xmalloc(len);
-    snprintf(pluginpath, len, "%s:%s", str1, str2);
+    snprintf(pluginpath, len, "%s" XINE_DIRECTORY_SEPARATOR_STRING "%s", str1, str2);
   }
   plugindir = xine_xmalloc(strlen(pluginpath)+strlen(homedir)+2);
   j=0;
   lenpluginpath = strlen(pluginpath);
   for (i=0; i <= lenpluginpath; ++i){
     switch (pluginpath[i]){
-    case ':':
+    case XINE_DIRECTORY_SEPARATOR_CHAR:
     case '\0':
       plugindir[j] = '\0';
       collect_plugins(this, plugindir);

Index: xine.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-engine/xine.c,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -r1.315 -r1.316
--- xine.c	25 Aug 2005 15:36:30 -0000	1.315
+++ xine.c	29 Aug 2005 15:28:17 -0000	1.316
@@ -1341,7 +1341,7 @@
 #if defined(WIN32)
   WSACleanup();
 #endif
-  
+
   free (this);
 }
 
@@ -1352,7 +1352,7 @@
 #ifdef WIN32
     WSADATA Data;
     int i_err;
-#endif /*  WIN32 */
+#endif
 
   this = xine_xmalloc (sizeof (xine_t));
   if (!this)



-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Xine-cvslog mailing list
Xine-cvslog@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
[prev in list] [next in list] [prev in thread] [next in thread]