[Toxine-cvs] CVS: toxine/src commands.c,1.58,1.59 loader.c,1.11,1.12 main.c,1.24,1.25

[Daniel Caujolle-B. <f1...@us...>]

Update of /cvsroot/toxine/toxine/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5313

Modified Files:
	commands.c loader.c main.c 
Log Message:
@@ reenable toxine_release()

Index: commands.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/commands.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- commands.c	8 Apr 2004 15:27:17 -0000	1.58
+++ commands.c	8 Apr 2004 15:35:36 -0000	1.59
@@ -1303,7 +1303,7 @@
   int major, minor, sub;
 
   pinfo("Toxine version %s\n", VERSION);
-  pinfo("Copyright 2002, Daniel Caujolle-Bert <f1...@us...>.\n");
+  pinfo("Copyright 2002-2004, Daniel Caujolle-Bert <f1...@us...>.\n");
   pinfo("Built with xine library %d.%d.%d (%s).\n",
 	XINE_MAJOR_VERSION, XINE_MINOR_VERSION, XINE_SUB_VERSION, XINE_VERSION);
   xine_get_version(&major, &minor, &sub);

Index: loader.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/loader.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- loader.c	7 Apr 2004 18:21:07 -0000	1.11
+++ loader.c	8 Apr 2004 15:35:36 -0000	1.12
@@ -35,7 +35,7 @@
 
 extern int errno;
 
-/* #define LOCAL_BUILD 1 */
+#define LOCAL_BUILD 1
 #ifdef LOCAL_BUILD
 #undef TOXINE_PLUGINDIR
 #define TOXINE_PLUGINDIR "plugins/.libs"

Index: main.c
===================================================================
RCS file: /cvsroot/toxine/toxine/src/main.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- main.c	7 Apr 2004 18:21:07 -0000	1.24
+++ main.c	8 Apr 2004 15:35:36 -0000	1.25
@@ -112,13 +112,10 @@
  * Freeing allocated memory.
  */
 static void toxine_release(toxine_t *tox) {
-  int i;
 
-#warning FIXME
-  return;
-    
   if(tox) {
-
+    int i;
+    
     if(tox->msg_fd >= 0)
       close(tox->msg_fd);
     
@@ -142,8 +139,6 @@
     
     toxine_free(tox->script.filename);
     
-    pthread_mutex_destroy(&tox->event.mutex);
-
     toxine_free(tox);
   }
 }