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

1 files changed, 8 insertions, 8 deletions

diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index a494f4a41..efdc470ba 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.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: input_dvd.c,v 1.34 2001/10/20 02:01:51 guenter Exp $
+ * $Id: input_dvd.c,v 1.35 2001/11/17 14:26:38 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -47,7 +47,7 @@
 #endif
 
 #include "xine_internal.h"
-#include "monitor.h"
+#include "xineutils.h"
 #include "input_plugin.h"
 #include "dvd_udf.h"
 #include "read_cache.h"
@@ -606,7 +606,7 @@ static mrl_t **dvd_plugin_get_dir (input_plugin_t *this_gen,
 	  ++this->mrls_allocated_entries;
 	  /* note: 1 extra pointer for terminating NULL */
 	  this->mrls = realloc(this->mrls, (this->mrls_allocated_entries+1) * sizeof(mrl_t*));
-	  this->mrls[nFiles2] = (mrl_t *) xmalloc(sizeof(mrl_t));
+	  this->mrls[nFiles2] = (mrl_t *) xine_xmalloc(sizeof(mrl_t));
 	}
 	
 	if(this->mrls[nFiles2]->mrl) {
@@ -615,7 +615,7 @@ static mrl_t **dvd_plugin_get_dir (input_plugin_t *this_gen,
 	}
 	else {
 	  this->mrls[nFiles2]->mrl = (char *)
-	    xmalloc(strlen(this->filelist[i]) + 7);
+	    xine_xmalloc(strlen(this->filelist[i]) + 7);
 	}
 
 	this->mrls[nFiles2]->origin = NULL;
@@ -747,13 +747,13 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) {
     return NULL;
   }
   
-  this       = (dvd_input_plugin_t *) xmalloc (sizeof (dvd_input_plugin_t));
+  this       = (dvd_input_plugin_t *) xine_xmalloc (sizeof (dvd_input_plugin_t));
   config     = xine->config;
   xine_debug = config->lookup_int (config, "xine_debug", 0);
   
   for (i = 0; i < MAX_DIR_ENTRIES; i++) {
-    this->filelist[i]       = (char *) xmalloc (256);
-    this->filelist2[i]      = (char *) xmalloc (256);
+    this->filelist[i]       = (char *) xine_xmalloc (256);
+    this->filelist2[i]      = (char *) xine_xmalloc (256);
   }
   
   this->input_plugin.interface_version = INPUT_PLUGIN_IFACE_VERSION;
@@ -783,7 +783,7 @@ input_plugin_t *init_input_plugin (int iface, xine_t *xine) {
 #endif
 
   this->mrls_allocated_entries = 0;
-  this->mrls = xmalloc(sizeof(mrl_t*));
+  this->mrls = xine_xmalloc(sizeof(mrl_t*));
 
   this->mrl     = NULL;
   this->config  = config;