[xine-cvs] CVS: xine-lib/src/libspudec spu.c,1.21,1.22 xine_decoder.c,1.33,1.34

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

Update of /cvsroot/xine/xine-lib/src/libspudec
In directory usw-pr-cvs1:/tmp/cvs-serv3406/src/libspudec

Modified Files:
	spu.c xine_decoder.c 
Log Message:
Add 'xine_' prefix to all of xine-utils functions (what about cpu 
acceleration?). Merge xine-utils header files to a new one "xineutils.h". 
Update xine-lib C/headers to reflect those changes.
dxr3 headers are no more installed ine $includdir, but $includdir/xine.


Index: spu.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libspudec/spu.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- spu.c	2001/10/26 13:39:21	1.21
+++ spu.c	2001/11/17 14:26:39	1.22
@@ -51,7 +51,7 @@
 
 #include "spu.h"
 #include "video_out/alphablend.h"
-#include "monitor.h"
+#include "xineutils.h"
 
 #define LOG_DEBUG 1
 

Index: xine_decoder.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libspudec/xine_decoder.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xine_decoder.c	2001/11/15 23:18:04	1.33
+++ xine_decoder.c	2001/11/17 14:26:39	1.34
@@ -37,7 +37,7 @@
 #include "xine_internal.h"
 #include "video_out/alphablend.h"
 #include "xine-engine/bswap.h"
-#include "monitor.h"
+#include "xineutils.h"
 
 static void spudec_print_overlay( vo_overlay_t *ovl );
 
@@ -193,7 +193,7 @@
                i,
                this->spu_events[i].event,
                sizeof(spu_overlay_event_t));
-      this->spu_events[i].event = xmalloc (sizeof(spu_overlay_event_t));
+      this->spu_events[i].event = xine_xmalloc (sizeof(spu_overlay_event_t));
       xprintf (VERBOSE|SPU, "MALLOC2: this->spu_events[%d].event %p, len=%d\n",
                i,
                this->spu_events[i].event,
@@ -210,10 +210,10 @@
   this->spu_objects[1].pts=0;
   xprintf (VERBOSE|SPU, "MALLOC1: this->spu_objects[1].overlay %p, len=%d\n",
             this->spu_objects[1].overlay, sizeof(vo_overlay_t));
-  this->spu_objects[1].overlay = xmalloc (sizeof(vo_overlay_t));
+  this->spu_objects[1].overlay = xine_xmalloc (sizeof(vo_overlay_t));
   xprintf (VERBOSE|SPU, "MALLOC2: this->spu_objects[1].overlay %p, len=%d\n",
             this->spu_objects[1].overlay, sizeof(vo_overlay_t));
-/* xmalloc does memset */
+/* xine_xmalloc does memset */
 /*  memset(this->spu_objects[1].overlay,0,sizeof(vo_overlay_t));
  */
   
@@ -326,7 +326,7 @@
             new_event,
             this->spu_events[new_event].event->object.overlay,
             sizeof(vo_overlay_t));
-  this->spu_events[new_event].event->object.overlay = xmalloc (sizeof(vo_overlay_t));
+  this->spu_events[new_event].event->object.overlay = xine_xmalloc (sizeof(vo_overlay_t));
   xprintf (VERBOSE|SPU, "328MALLOC2: this->spu_events[new_event=%d].event->object.overlay %p, len=%d\n",
             new_event,
             this->spu_events[new_event].event->object.overlay,
@@ -796,14 +796,14 @@
       xprintf (VERBOSE|SPU, "MALLOC1: overlay_event %p, len=%d\n",
                overlay_event,
                sizeof(spu_overlay_event_t));
-      overlay_event = xmalloc (sizeof(spu_overlay_event_t));
+      overlay_event = xine_xmalloc (sizeof(spu_overlay_event_t));
       xprintf (VERBOSE|SPU, "MALLOC2: overlay_event %p, len=%d\n",
                overlay_event,
                sizeof(spu_overlay_event_t));
       xprintf (VERBOSE|SPU, "MALLOC1: overlay %p, len=%d\n",
                overlay,
                sizeof(vo_overlay_t));
-      overlay = xmalloc (sizeof(vo_overlay_t));
+      overlay = xine_xmalloc (sizeof(vo_overlay_t));
       xprintf (VERBOSE|SPU, "MALLOC2: overlay %p, len=%d\n",
                overlay,
                sizeof(vo_overlay_t));
@@ -889,8 +889,8 @@
     return NULL;
   }
 
-  this = (spudec_decoder_t *) xmalloc (sizeof (spudec_decoder_t));
-/* xmalloc does memset */
+  this = (spudec_decoder_t *) xine_xmalloc (sizeof (spudec_decoder_t));
+/* xine_xmalloc does memset */
 /*  memset (this, 0, sizeof(*this)); */
 
   this->spu_decoder.interface_version   = 4;