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.

CVS patchset: 1054
CVS date: 2001/11/17 14:26:36

10 files changed, 37 insertions, 45 deletions

diff --git a/src/demuxers/demux_asf.c b/src/demuxers/demux_asf.c
index 20f9a27cf..656900266 100644
--- a/src/demuxers/demux_asf.c
+++ b/src/demuxers/demux_asf.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_asf.c,v 1.11 2001/11/16 17:53:10 miguelfreitas Exp $
+ * $Id: demux_asf.c,v 1.12 2001/11/17 14:26:37 f1rmb Exp $
  *
  * demultiplexer for asf streams
  *
@@ -38,10 +38,8 @@
 #include <stdlib.h>
 
 #include "xine_internal.h"
-#include "monitor.h"
 #include "demux.h"
-#include "utils.h"
-#include "memcpy.h"
+#include "xineutils.h"
 
 #define	WINE_TYPEDEFS_ONLY
 #include "libw32dll/wine/avifmt.h"
@@ -565,7 +563,7 @@ static void asf_reorder(demux_asf_t *this, uint8_t *src, int len){
 	s2+=this->reorder_h*this->reorder_w*this->reorder_b;
   }
 
-  fast_memcpy(src,dst,i);
+  xine_fast_memcpy(src,dst,i);
   free(dst);
 }
 
@@ -731,7 +729,7 @@ static void asf_send_buffer_defrag (demux_asf_t *this, asf_stream_t *stream,
 
           buf = stream->fifo->buffer_pool_alloc (stream->fifo);
           buf->content = buf->mem;
-          fast_memcpy (buf->content, p, bufsize);
+          xine_fast_memcpy (buf->content, p, bufsize);
 
           if (stream->fifo == this->video_fifo) {
             buf->input_pos  = this->input->get_current_pos (this->input);
@@ -1213,7 +1211,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
     return NULL;
   }
 
-  this        = xmalloc (sizeof (demux_asf_t));
+  this        = xine_xmalloc (sizeof (demux_asf_t));
   config      = xine->config;
   xine_debug  = config->lookup_int (config, "xine_debug", 0);
 
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index 2e831110c..3d8dc7c0f 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_avi.c,v 1.51 2001/11/10 13:48:02 guenter Exp $
+ * $Id: demux_avi.c,v 1.52 2001/11/17 14:26:37 f1rmb Exp $
  *
  * demultiplexer for avi streams
  *
@@ -38,9 +38,8 @@
 #include <stdlib.h>
 
 #include "xine_internal.h"
-#include "monitor.h"
+#include "xineutils.h"
 #include "demux.h"
-#include "utils.h"
 
 #define	WINE_TYPEDEFS_ONLY
 #include "libw32dll/wine/avifmt.h"
@@ -262,7 +261,7 @@ static avi_t *AVI_init(demux_avi_t *this)  {
 
   /* Create avi_t structure */
 
-  AVI = (avi_t *) xmalloc(sizeof(avi_t));
+  AVI = (avi_t *) xine_xmalloc(sizeof(avi_t));
   if(AVI==NULL) {
     this->AVI_errno = AVI_ERR_NO_MEM;
     return 0;
@@ -298,7 +297,7 @@ static avi_t *AVI_init(demux_avi_t *this)  {
       if(strncasecmp(data,"hdrl",4) == 0) {
 
 	hdrl_len = n;
-	hdrl_data = (unsigned char *) xmalloc(n);
+	hdrl_data = (unsigned char *) xine_xmalloc(n);
 	if(hdrl_data==0) 
 	  ERR_EXIT(AVI_ERR_NO_MEM);
 	if (this->input->read(this->input, hdrl_data,n) != n ) 
@@ -317,7 +316,7 @@ static avi_t *AVI_init(demux_avi_t *this)  {
 	 break if this is not the case */
       
       AVI->n_idx = AVI->max_idx = n/16;
-      AVI->idx = (unsigned  char((*)[16]) ) xmalloc(n);
+      AVI->idx = (unsigned  char((*)[16]) ) xine_xmalloc(n);
       if (AVI->idx==0) 
 	ERR_EXIT(AVI_ERR_NO_MEM);
 
@@ -535,11 +534,11 @@ static avi_t *AVI_init(demux_avi_t *this)  {
   }
     
 
-  AVI->video_index = (video_index_entry_t *) xmalloc(nvi*sizeof(video_index_entry_t));
+  AVI->video_index = (video_index_entry_t *) xine_xmalloc(nvi*sizeof(video_index_entry_t));
   if(AVI->video_index==0) ERR_EXIT(AVI_ERR_NO_MEM) ;
 
   if(AVI->audio_chunks) {
-    AVI->audio_index = (audio_index_entry_t *) xmalloc(nai*sizeof(audio_index_entry_t));
+    AVI->audio_index = (audio_index_entry_t *) xine_xmalloc(nai*sizeof(audio_index_entry_t));
     if(AVI->audio_index==0) ERR_EXIT(AVI_ERR_NO_MEM) ;
   }
   
@@ -1114,7 +1113,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
     return NULL;
   }
 
-  this        = xmalloc (sizeof (demux_avi_t));
+  this        = xine_xmalloc (sizeof (demux_avi_t));
   config      = xine->config;
   xine_debug  = config->lookup_int (config, "xine_debug", 0);
 
diff --git a/src/demuxers/demux_elem.c b/src/demuxers/demux_elem.c
index 2e019327c..19ff4a9d6 100644
--- a/src/demuxers/demux_elem.c
+++ b/src/demuxers/demux_elem.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_elem.c,v 1.27 2001/11/10 13:48:02 guenter Exp $
+ * $Id: demux_elem.c,v 1.28 2001/11/17 14:26:37 f1rmb Exp $
  *
  * demultiplexer for elementary mpeg streams
  * 
@@ -35,7 +35,7 @@
 #include <string.h>
 
 #include "xine_internal.h"
-#include "monitor.h"
+#include "xineutils.h"
 #include "demux.h"
 
 #ifndef	__GNUC__
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c
index 8ee0109e5..ade2e7961 100644
--- a/src/demuxers/demux_mpeg.c
+++ b/src/demuxers/demux_mpeg.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_mpeg.c,v 1.43 2001/11/13 21:47:57 heikos Exp $
+ * $Id: demux_mpeg.c,v 1.44 2001/11/17 14:26:37 f1rmb Exp $
  *
  * demultiplexer for mpeg 1/2 program streams
  * reads streams of variable blocksizes
@@ -38,10 +38,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "monitor.h"
 #include "xine_internal.h"
 #include "demux.h"
-#include "utils.h"
+#include "xineutils.h"
 
 #define NUM_PREVIEW_BUFFERS 150
 
@@ -945,7 +944,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
     return NULL;
   }
 
-  this        = xmalloc (sizeof (demux_mpeg_t));
+  this        = xine_xmalloc (sizeof (demux_mpeg_t));
   config      = xine->config;
   xine_debug  = config->lookup_int (config, "xine_debug", 0);
 
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index fc54626e1..74c32c062 100644
--- a/src/demuxers/demux_mpeg_block.c
+++ b/src/demuxers/demux_mpeg_block.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_mpeg_block.c,v 1.60 2001/11/10 13:48:02 guenter Exp $
+ * $Id: demux_mpeg_block.c,v 1.61 2001/11/17 14:26:37 f1rmb Exp $
  *
  * demultiplexer for mpeg 1/2 program streams
  *
@@ -35,9 +35,8 @@
 #include <stdlib.h>
 
 #include "xine_internal.h"
-#include "monitor.h"
+#include "xineutils.h"
 #include "demux.h"
-#include "utils.h"
 
 #define NUM_PREVIEW_BUFFERS 250
 
@@ -1003,7 +1002,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
     return NULL;
   }
 
-  this        = xmalloc (sizeof (demux_mpeg_block_t));
+  this        = xine_xmalloc (sizeof (demux_mpeg_block_t));
   this->xine  = xine;
   config      = xine->config;
   xine_debug  = config->lookup_int (config, "xine_debug", 0);
@@ -1018,7 +1017,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
   this->demux_plugin.get_stream_length = demux_mpeg_block_get_stream_length;
   this->demux_plugin.get_mimetypes     = demux_mpeg_block_get_mimetypes;
   
-  this->scratch = xmalloc_aligned (512, 4096);
+  this->scratch = xine_xmalloc_aligned (512, 4096);
     
   return (demux_plugin_t *) this;
 }
diff --git a/src/demuxers/demux_mpgaudio.c b/src/demuxers/demux_mpgaudio.c
index 6ec5113be..634b9174e 100644
--- a/src/demuxers/demux_mpgaudio.c
+++ b/src/demuxers/demux_mpgaudio.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_mpgaudio.c,v 1.27 2001/11/10 13:48:02 guenter Exp $
+ * $Id: demux_mpgaudio.c,v 1.28 2001/11/17 14:26:37 f1rmb Exp $
  *
  * demultiplexer for mpeg audio (i.e. mp3) streams
  *
@@ -35,7 +35,7 @@
 #include <stdlib.h>
 
 #include "xine_internal.h"
-#include "monitor.h"
+#include "xineutils.h"
 #include "demux.h"
 
 #ifndef	__GNUC__
diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c
index 4842becb7..79338c447 100644
--- a/src/demuxers/demux_ogg.c
+++ b/src/demuxers/demux_ogg.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_ogg.c,v 1.8 2001/11/10 13:48:02 guenter Exp $
+ * $Id: demux_ogg.c,v 1.9 2001/11/17 14:26:37 f1rmb Exp $
  *
  * demultiplexer for ogg streams
  *
@@ -37,9 +37,8 @@
 #include <ogg/ogg.h>
 
 #include "xine_internal.h"
-#include "monitor.h"
+#include "xineutils.h"
 #include "demux.h"
-#include "utils.h"
 
 #define CHUNKSIZE 8500
 
@@ -406,7 +405,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
     return NULL;
   }
 
-  this        = xmalloc (sizeof (demux_ogg_t));
+  this        = xine_xmalloc (sizeof (demux_ogg_t));
   config      = xine->config;
   xine_debug  = config->lookup_int (config, "xine_debug", 0);
 
diff --git a/src/demuxers/demux_pes.c b/src/demuxers/demux_pes.c
index 77defa9a7..4b4e728b5 100644
--- a/src/demuxers/demux_pes.c
+++ b/src/demuxers/demux_pes.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_pes.c,v 1.12 2001/11/10 13:48:02 guenter Exp $
+ * $Id: demux_pes.c,v 1.13 2001/11/17 14:26:37 f1rmb Exp $
  *
  * demultiplexer for mpeg 2 PES (Packetized Elementary Streams)
  * reads streams of variable blocksizes
@@ -37,10 +37,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "monitor.h"
 #include "xine_internal.h"
 #include "demux.h"
-#include "utils.h"
+#include "xineutils.h"
 
 #define NUM_PREVIEW_BUFFERS 400
 
@@ -577,7 +576,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
     return NULL;
   }
 
-  this        = xmalloc (sizeof (demux_pes_t));
+  this        = xine_xmalloc (sizeof (demux_pes_t));
   config      = xine->config;
   xine_debug  = config->lookup_int (config, "xine_debug", 0);
 
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c
index a214f0326..cbba4a79c 100644
--- a/src/demuxers/demux_qt.c
+++ b/src/demuxers/demux_qt.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_qt.c,v 1.11 2001/11/10 13:48:02 guenter Exp $
+ * $Id: demux_qt.c,v 1.12 2001/11/17 14:26:37 f1rmb Exp $
  *
  * demultiplexer for quicktime streams, based on:
  *
@@ -44,10 +44,9 @@
 #include <zlib.h>
 
 #include "xine_internal.h"
-#include "monitor.h"
+#include "xineutils.h"
 #include "demux.h"
 #include "buffer.h"
-#include "utils.h"
 
 #define	WINE_TYPEDEFS_ONLY
 #include "libw32dll/wine/avifmt.h"
@@ -3866,7 +3865,7 @@ static int quicktime_check_sig(input_plugin_t *input) {
   quicktime_atom_t   leaf_atom;
   int                result1 = 0, result2 = 0;
 
-  file = xmalloc (sizeof (quicktime_t));
+  file = xine_xmalloc (sizeof (quicktime_t));
 
   quicktime_init(file);
 
@@ -4377,7 +4376,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
     return NULL;
   }
 
-  this        = xmalloc (sizeof (demux_qt_t));
+  this        = xine_xmalloc (sizeof (demux_qt_t));
   config      = xine->config;
   xine_debug  = config->lookup_int (config, "xine_debug", 0);
 
diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c
index 5bf4e254c..137b56969 100644
--- a/src/demuxers/demux_ts.c
+++ b/src/demuxers/demux_ts.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_ts.c,v 1.27 2001/11/12 13:58:51 jcdutton Exp $
+ * $Id: demux_ts.c,v 1.28 2001/11/17 14:26:37 f1rmb Exp $
  *
  * Demultiplexer for MPEG2 Transport Streams.
  *
@@ -65,7 +65,7 @@
 #include <string.h>
 
 #include "xine_internal.h"
-#include "monitor.h"
+#include "xineutils.h"
 #include "demux.h"
 
 /*
@@ -1174,7 +1174,7 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) {
   /*
    * Initialise the generic plugin.
    */
-  this = xmalloc(sizeof(*this));
+  this = xine_xmalloc(sizeof(*this));
   config = xine->config;
   xine_debug = config->lookup_int(config, "xine_debug", 0);
   this->plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION;