rename internal API function (_x_<function>).

CVS patchset: 5721
CVS date: 2003/11/11 18:44:50

12 files changed, 71 insertions, 68 deletions

diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index 9498c9f5a..dff92f57f 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -18,7 +18,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.170 2003/11/08 22:39:32 tmattern Exp $
+ * $Id: input_dvd.c,v 1.171 2003/11/11 18:44:53 f1rmb Exp $
  *
  */
 
@@ -558,7 +558,7 @@ static buf_element_t *dvd_plugin_read_block (input_plugin_t *this_gen,
     if(result == DVDNAV_STATUS_ERR) {
       printf("input_dvd: Error getting next block from DVD (%s)\n",
 	      dvdnav_err_to_string(this->dvdnav));
-      xine_message(this->stream, XINE_MSG_READ_ERROR,
+      _x_message(this->stream, XINE_MSG_READ_ERROR,
                    dvdnav_err_to_string(this->dvdnav), NULL);
       if (block != buf->mem) dvdnav_free_cache_block(this->dvdnav, block);
       buf->free_buffer(buf);
@@ -701,7 +701,7 @@ static buf_element_t *dvd_plugin_read_block (input_plugin_t *this_gen,
       }
       break;
     case DVDNAV_HOP_CHANNEL:
-      xine_demux_flush_engine(this->stream);
+      _x_demux_flush_engine(this->stream);
       break;
     case DVDNAV_NAV_PACKET:
       {
@@ -1378,7 +1378,7 @@ static int dvd_plugin_open (input_plugin_t *this_gen) {
       if(ret == DVDNAV_STATUS_ERR) {
 	if (this->stream->xine->verbosity >= XINE_VERBOSITY_LOG) 
 	  printf("input_dvd: Error opening DVD device\n");
-	xine_message (this->stream, XINE_MSG_READ_ERROR,
+	_x_message (this->stream, XINE_MSG_READ_ERROR,
 		      intended_dvd_device, NULL);
         return 0;
       }
@@ -1390,7 +1390,7 @@ static int dvd_plugin_open (input_plugin_t *this_gen) {
     if(ret == DVDNAV_STATUS_ERR) {
       if (this->stream->xine->verbosity >= XINE_VERBOSITY_LOG) 
 	printf("input_dvd: Error opening DVD device\n");
-      xine_message (this->stream, XINE_MSG_READ_ERROR,
+      _x_message (this->stream, XINE_MSG_READ_ERROR,
 		    intended_dvd_device, NULL);
       return 0;
     }
@@ -1727,6 +1727,9 @@ static void *init_class (xine_t *xine, void *data) {
 
 /*
  * $Log: input_dvd.c,v $
+ * Revision 1.171  2003/11/11 18:44:53  f1rmb
+ * rename internal API function (_x_<function>).
+ *
  * Revision 1.170  2003/11/08 22:39:32  tmattern
  * Use info helper functions.
  *
@@ -1939,7 +1942,7 @@ static void *init_class (xine_t *xine, void *data) {
  *
  * Revision 1.124  2002/12/22 23:35:42  miguelfreitas
  * it doesn't make sense to reimplement flush here.
- * (this is why xine_demux_flush_engine was created, to avoid redundant code)
+ * (this is why _x_demux_flush_engine was created, to avoid redundant code)
  *
  * Revision 1.123  2002/12/21 12:56:47  miguelfreitas
  * - add buf->decoder_info_ptr: portability for systems where pointer has
@@ -2137,7 +2140,7 @@ static void *init_class (xine_t *xine, void *data) {
  * Revision 1.73  2002/09/05 05:51:14  jcdutton
  * XV Video out at least loads now and we see the xine logo again.
  * The DVD plugin now loads, but audio and spu info is lost.
- * What happened to xine_get_spu_channel and xine_get_audio_channel?
+ * What happened to _x_get_spu_channel and _x_get_audio_channel?
  *
  * Revision 1.72  2002/09/04 23:31:08  guenter
  * merging in the new_api branch ... unfortunately video_out / vo_scale is broken now ... matthias/miguel: please fix it :-)
diff --git a/src/input/input_file.c b/src/input/input_file.c
index 1e053cb51..c0e476413 100644
--- a/src/input/input_file.c
+++ b/src/input/input_file.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_file.c,v 1.85 2003/10/26 10:48:24 mroi Exp $
+ * $Id: input_file.c,v 1.86 2003/11/11 18:44:54 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -119,7 +119,7 @@ static buf_element_t *file_plugin_read_block (input_plugin_t *this_gen, fifo_buf
       if (num_bytes < 0) {
 	xine_log (this->stream->xine, XINE_LOG_MSG,
 		  _("input_file: read error (%s)\n"), strerror(errno));
-	xine_message(this->stream, XINE_MSG_READ_ERROR,
+	_x_message(this->stream, XINE_MSG_READ_ERROR,
                      this->mrl, NULL);
       }
       buf->free_buffer (buf);
diff --git a/src/input/input_http.c b/src/input/input_http.c
index 9debf821f..3cf37526b 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -19,7 +19,7 @@
  *
  * input plugin for http network streams
  *
- * $Id: input_http.c,v 1.66 2003/11/08 22:20:36 tmattern Exp $
+ * $Id: input_http.c,v 1.67 2003/11/11 18:44:54 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -431,10 +431,10 @@ static off_t http_plugin_read (input_plugin_t *this_gen,
   if( n && this->shoutcast_mode) {
     if ((this->shoutcast_pos + n) >= this->shoutcast_metaint) {
       int i = this->shoutcast_metaint - this->shoutcast_pos;
-      i = xio_tcp_read (this->stream, this->fh, &buf[num_bytes], i);
+      i = _x_io_tcp_read (this->stream, this->fh, &buf[num_bytes], i);
       if (i < 0) {
         if (!this->stream->demux_action_pending) 
-	  xine_message (this->stream, XINE_MSG_READ_ERROR, this->host, NULL);
+	  _x_message (this->stream, XINE_MSG_READ_ERROR, this->host, NULL);
         xine_log (this->stream->xine, XINE_LOG_MSG, _("input_http: read error %d\n"), errno);
         return 0;
       }
@@ -450,12 +450,12 @@ static off_t http_plugin_read (input_plugin_t *this_gen,
   }
 
   if( n ) {
-    n = xio_tcp_read (this->stream, this->fh, &buf[num_bytes], n);
+    n = _x_io_tcp_read (this->stream, this->fh, &buf[num_bytes], n);
 
     /* read errors */
     if (n < 0) {
       if (!this->stream->demux_action_pending) 
-	xine_message(this->stream, XINE_MSG_READ_ERROR, this->host, NULL);
+	_x_message(this->stream, XINE_MSG_READ_ERROR, this->host, NULL);
       xine_log (this->stream->xine, XINE_LOG_MSG, _("input_http: read error %d\n"), errno);
       return 0;
     }
@@ -695,7 +695,7 @@ static int http_plugin_open (input_plugin_t *this_gen ) {
       if (http_plugin_basicauth (this_klass->proxyuser,
 			         this_klass->proxypassword,
 				 this->proxyauth, BUFSIZE)) {
-	xine_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "proxy error", NULL);
+	_x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "proxy error", NULL);
 	return 0;
       }
   }
@@ -710,7 +710,7 @@ static int http_plugin_open (input_plugin_t *this_gen ) {
 
   if ( (this->user != NULL) && strcmp (this_klass->proxyhost, ""))
     if (http_plugin_basicauth (this->user, this->password, this->auth, BUFSIZE)) {
-      xine_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "basic auth error", NULL);
+      _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "basic auth error", NULL);
       return 0;
     }
 
@@ -727,9 +727,9 @@ static int http_plugin_open (input_plugin_t *this_gen ) {
 #endif
   
   if ( (this_klass->proxyhost != NULL) && strcmp (this_klass->proxyhost, "") )
-    this->fh = xio_tcp_connect (this->stream, this_klass->proxyhost, this_klass->proxyport);
+    this->fh = _x_io_tcp_connect (this->stream, this_klass->proxyhost, this_klass->proxyport);
   else
-    this->fh = xio_tcp_connect (this->stream, this->host, this->port);
+    this->fh = _x_io_tcp_connect (this->stream, this->host, this->port);
 
   this->curpos = 0;
 
@@ -741,7 +741,7 @@ static int http_plugin_open (input_plugin_t *this_gen ) {
   progress = 0;
   do {
     report_progress(this->stream, progress);
-    res = xio_select (this->stream, this->fh, XIO_WRITE_READY, 500);
+    res = _x_io_select (this->stream, this->fh, XIO_WRITE_READY, 500);
     progress += 2;
   } while ((res == XIO_TIMEOUT) && (progress < 100));
   if (res != XIO_READY)
@@ -782,8 +782,8 @@ static int http_plugin_open (input_plugin_t *this_gen ) {
   strcat (this->buf, "\015\012");
 
   length = strlen(this->buf);
-  if (xio_tcp_write (this->stream, this->fh, this->buf, length) != length) {
-    xine_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "couldn't send request", NULL);
+  if (_x_io_tcp_write (this->stream, this->fh, this->buf, length) != length) {
+    _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "couldn't send request", NULL);
     printf ("input_http: couldn't send request\n");
     return 0;
   }
@@ -802,7 +802,7 @@ static int http_plugin_open (input_plugin_t *this_gen ) {
        printf ("input_http: read...\n");
     */
 
-    if (xio_tcp_read (this->stream, this->fh, &this->buf[len], 1) <= 0) {
+    if (_x_io_tcp_read (this->stream, this->fh, &this->buf[len], 1) <= 0) {
       return 0;
     }
 
@@ -831,7 +831,7 @@ static int http_plugin_open (input_plugin_t *this_gen ) {
 	  
 	  /* icecast ? */
 	  if (sscanf(this->buf, "ICY %d OK", &httpcode) != 1)	{
-	    xine_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "invalid http answer", NULL);
+	    _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "invalid http answer", NULL);
 	    xine_log (this->stream->xine, XINE_LOG_MSG, 
 		      _("input_http: invalid http answer\n"));
 	    return 0;
@@ -846,7 +846,7 @@ static int http_plugin_open (input_plugin_t *this_gen ) {
 		    _("input_http: 3xx redirection: >%d %s<\n"),
 		    httpcode, httpstatus);
 	} else if (httpcode < 200 || httpcode >= 300) {
-	  xine_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "http status not 2xx: ",
+	  _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "http status not 2xx: ",
 	               httpstatus, NULL);
       	  xine_log (this->stream->xine, XINE_LOG_MSG,
 		    _("input_http: http status not 2xx: >%d %s<\n"),
@@ -909,7 +909,7 @@ static int http_plugin_open (input_plugin_t *this_gen ) {
     this->mrlbuf2[3] = ' ';
     if (read_shoutcast_header(this)) {
       /* problem when reading shoutcast header */
-      xine_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "can't read shoutcast header", NULL);
+      _x_message(this->stream, XINE_MSG_CONNECTION_REFUSED, "can't read shoutcast header", NULL);
       printf ("can't read shoutcast header\n");
       return 0;
     }
diff --git a/src/input/input_net.c b/src/input/input_net.c
index cac1fcc1b..17854b86b 100644
--- a/src/input/input_net.c
+++ b/src/input/input_net.c
@@ -20,7 +20,7 @@
  * Read from a tcp network stream over a lan (put a tweaked mp1e encoder the
  * other end and you can watch tv anywhere in the house ..)
  *
- * $Id: input_net.c,v 1.53 2003/10/26 10:48:24 mroi Exp $
+ * $Id: input_net.c,v 1.54 2003/11/11 18:44:54 f1rmb Exp $
  *
  * how to set up mp1e for use with this plugin:
  * 
@@ -274,7 +274,7 @@ static off_t net_plugin_read (input_plugin_t *this_gen,
   }
 
   if( (len-total) > 0 ) {
-    n = xine_read_abort (this->stream, this->fh, &buf[total], len-total);
+    n = _x_read_abort (this->stream, this->fh, &buf[total], len-total);
 
 #ifdef LOG
     printf ("input_net: got %lld bytes (%lld/%lld bytes read)\n",
@@ -282,7 +282,7 @@ static off_t net_plugin_read (input_plugin_t *this_gen,
 #endif
   
     if (n < 0) {
-      xine_message(this->stream, XINE_MSG_READ_ERROR, this->host_port, NULL);
+      _x_message(this->stream, XINE_MSG_READ_ERROR, this->host_port, NULL);
       return 0;
     }
 
diff --git a/src/input/input_pvr.c b/src/input/input_pvr.c
index 6fef52cbf..6c3fd0c0f 100644
--- a/src/input/input_pvr.c
+++ b/src/input/input_pvr.c
@@ -38,7 +38,7 @@
  * usage: 
  *   xine pvr:/<prefix_to_tmp_files>\!<prefix_to_saved_files>\!<max_page_age>
  *
- * $Id: input_pvr.c,v 1.33 2003/09/02 14:29:29 miguelfreitas Exp $
+ * $Id: input_pvr.c,v 1.34 2003/11/11 18:44:54 f1rmb Exp $
  */
 
 /**************************************************************************
@@ -798,7 +798,7 @@ static int pvr_play_file(pvr_input_plugin_t *this, fifo_buffer_t *fifo, uint8_t
 
   /* now we are done on input/demuxer thread, engine may be paused safely */
   if( this->pvr_play_paused ) {
-    xine_set_speed (this->stream, XINE_SPEED_PAUSE);
+    _x_set_speed (this->stream, XINE_SPEED_PAUSE);
     this->pvr_play_paused = 0;
   }
 
@@ -1020,7 +1020,7 @@ static void pvr_event_handler (pvr_input_plugin_t *this) {
         pvrscr_speed_tunning(this->scr, 1.0 );
         pvr_break_rec_page(this);
         pthread_mutex_unlock(&this->lock);
-        xine_demux_flush_engine (this->stream);
+        _x_demux_flush_engine (this->stream);
       } else {
         /* no session change, break the page and store a new show_time */
         pthread_mutex_lock(&this->lock);
@@ -1079,7 +1079,7 @@ static void pvr_event_handler (pvr_input_plugin_t *this) {
         pthread_mutex_unlock(&this->dev_lock);
         
         /* FIXME: also flush the device */
-        /* xine_demux_flush_engine(this->stream); */
+        /* _x_demux_flush_engine(this->stream); */
       }
       break;
     
diff --git a/src/input/input_stdin_fifo.c b/src/input/input_stdin_fifo.c
index 5a406e811..ccbd5bfe4 100644
--- a/src/input/input_stdin_fifo.c
+++ b/src/input/input_stdin_fifo.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_stdin_fifo.c,v 1.52 2003/11/08 22:21:48 tmattern Exp $
+ * $Id: input_stdin_fifo.c,v 1.53 2003/11/11 18:44:54 f1rmb Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -96,7 +96,7 @@ static off_t stdin_plugin_read (input_plugin_t *this_gen,
   }
 
   if( (len-total) > 0 ) {
-    n = xio_file_read (this->stream, this->fh, &buf[total], len - total);
+    n = _x_io_file_read (this->stream, this->fh, &buf[total], len - total);
 
 #ifdef LOG
     printf ("stdin: got %lld bytes (%lld/%lld bytes read)\n",
@@ -104,7 +104,7 @@ static off_t stdin_plugin_read (input_plugin_t *this_gen,
 #endif
   
     if (n < 0) {
-      xine_message(this->stream, XINE_MSG_READ_ERROR, NULL);
+      _x_message(this->stream, XINE_MSG_READ_ERROR, NULL);
       return 0;
     }
 
diff --git a/src/input/input_v4l.c b/src/input/input_v4l.c
index 23b559170..783c6a52b 100644
--- a/src/input/input_v4l.c
+++ b/src/input/input_v4l.c
@@ -1522,7 +1522,7 @@ static void v4l_event_handler (v4l_input_plugin_t *this) {
 		     (float)v4l2_data->frequency);
 	       set_frequency(this, this->frequency);
 	       
-	       xine_demux_flush_engine(this->stream); 
+	       _x_demux_flush_engine(this->stream); 
 	    }
 	    break;
 /*	 default:
diff --git a/src/input/librtsp/rtsp.c b/src/input/librtsp/rtsp.c
index 89d693b7c..17df49179 100644
--- a/src/input/librtsp/rtsp.c
+++ b/src/input/librtsp/rtsp.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: rtsp.c,v 1.10 2003/04/13 19:02:07 miguelfreitas Exp $
+ * $Id: rtsp.c,v 1.11 2003/11/11 18:44:54 f1rmb Exp $
  *
  * a minimalistic implementation of rtsp protocol,
  * *not* RFC 2326 compilant yet.
@@ -211,7 +211,7 @@ static ssize_t read_stream(rtsp_t *s, void *buf, size_t count) {
   return total;
 #else
 
-  return xine_read_abort(s->stream, s->s, buf, count );
+  return _x_read_abort(s->stream, s->s, buf, count );
 
 #endif
 }
diff --git a/src/input/mms.c b/src/input/mms.c
index 8286f2119..a5322223d 100644
--- a/src/input/mms.c
+++ b/src/input/mms.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: mms.c,v 1.34 2003/10/16 21:47:32 tmattern Exp $
+ * $Id: mms.c,v 1.35 2003/11/11 18:44:54 f1rmb Exp $
  *
  * MMS over TCP protocol
  *   based on work from major mms
@@ -353,7 +353,7 @@ static int get_answer (mms_t *this) {
     off_t len;
     uint32_t length;
 
-    len = xio_tcp_read (this->stream, this->s, this->buf, 12);
+    len = _x_io_tcp_read (this->stream, this->s, this->buf, 12);
     if (len < 0) {
       lprintf ("get_answer: read error\n");
       return 0;
@@ -370,7 +370,7 @@ static int get_answer (mms_t *this) {
       return 0;
     }
     
-    len = xio_tcp_read (this->stream, this->s, this->buf + 12, length + 4) ;
+    len = _x_io_tcp_read (this->stream, this->s, this->buf + 12, length + 4) ;
     if (len < 0) {
       lprintf ("get_answer: read error\n");
       return 0;
@@ -406,7 +406,7 @@ static int get_header (mms_t *this) {
 
   while (1) {
 
-    len = xio_tcp_read (this->stream, this->s, pre_header, 8) ;
+    len = _x_io_tcp_read (this->stream, this->s, pre_header, 8) ;
     if (len < 0) {
       lprintf ("get_header: read error\n");
       return 0;
@@ -438,7 +438,7 @@ static int get_header (mms_t *this) {
         return 0;
       }
       
-      len = xio_tcp_read (this->stream, this->s, &this->asf_header[this->asf_header_len], packet_len);
+      len = _x_io_tcp_read (this->stream, this->s, &this->asf_header[this->asf_header_len], packet_len);
       if (len < 0) {
         lprintf ("get_header: read error\n");
         return 0;
@@ -461,7 +461,7 @@ static int get_header (mms_t *this) {
       uint32_t packet_len;
       int command;
 
-      len = xio_tcp_read (this->stream, this->s, (uint8_t *) &packet_len, 4);
+      len = _x_io_tcp_read (this->stream, this->s, (uint8_t *) &packet_len, 4);
       if (len < 0) {
         lprintf ("get_header: read error\n");
         return 0;
@@ -479,7 +479,7 @@ static int get_header (mms_t *this) {
         return 0;
       }
       
-      len = xio_tcp_read (this->stream, this->s, this->buf, packet_len);
+      len = _x_io_tcp_read (this->stream, this->s, this->buf, packet_len);
       if (len < 0) {
         lprintf ("get_header: read error\n");
         return 0;
@@ -697,7 +697,7 @@ static int mms_tcp_connect(mms_t *this) {
    * try to connect 
    */
   lprintf("try to connect to %s on port %d \n", this->host, this->port);
-  this->s = xio_tcp_connect (this->stream, this->host, this->port);
+  this->s = _x_io_tcp_connect (this->stream, this->host, this->port);
 
   
   if (this->s == -1) {
@@ -709,7 +709,7 @@ static int mms_tcp_connect(mms_t *this) {
   progress = 0;
   do {
     report_progress(this->stream, progress);
-    res = xio_select (this->stream, this->s, XIO_WRITE_READY, 500);
+    res = _x_io_select (this->stream, this->s, XIO_WRITE_READY, 500);
     progress += 1;
   } while ((res == XIO_TIMEOUT) && (progress < 30));
   if (res != XIO_READY) {
@@ -1033,7 +1033,7 @@ static int get_media_packet (mms_t *this) {
   unsigned char  pre_header[8];
   off_t len;
   
-  len = xio_tcp_read (this->stream, this->s, pre_header, 8) ;
+  len = _x_io_tcp_read (this->stream, this->s, pre_header, 8) ;
   if (len < 0) {
     lprintf ("get_media_packet: read error\n");
     return 0;
@@ -1063,7 +1063,7 @@ static int get_media_packet (mms_t *this) {
       return 0;
     }
 
-    len = xio_tcp_read (this->stream, this->s, this->buf, packet_len);
+    len = _x_io_tcp_read (this->stream, this->s, this->buf, packet_len);
     if (len < 0) {
       lprintf ("get_media_packet: read error\n");
       return 0;
@@ -1082,7 +1082,7 @@ static int get_media_packet (mms_t *this) {
     int command;
 
     this->buf_size = 0;
-    len = xio_tcp_read (this->stream, this->s, (uint8_t *)&packet_len, 4);
+    len = _x_io_tcp_read (this->stream, this->s, (uint8_t *)&packet_len, 4);
     if (len < 0) {
       lprintf ("get_media_packet: read error\n");
       return 0;
@@ -1099,7 +1099,7 @@ static int get_media_packet (mms_t *this) {
       return 0;
     }
 
-    len = xio_tcp_read (this->stream, this->s, this->buf, packet_len);
+    len = _x_io_tcp_read (this->stream, this->s, this->buf, packet_len);
     if (len < 0) {
       lprintf ("\nlibmms: get_media_packet: read error\n");
       return 0;
diff --git a/src/input/mmsh.c b/src/input/mmsh.c
index 1670b3789..9598ecf7a 100644
--- a/src/input/mmsh.c
+++ b/src/input/mmsh.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: mmsh.c,v 1.19 2003/10/31 01:55:03 tmattern Exp $
+ * $Id: mmsh.c,v 1.20 2003/11/11 18:44:54 f1rmb Exp $
  *
  * MMS over HTTP protocol
  *   written by Thibaut Mattern
@@ -255,7 +255,7 @@ static int send_command (mmsh_t *this, char *cmd)  {
   printf ("libmmsh: send_command:\n%s\n", cmd);
 #endif
   length = strlen(cmd);
-  if (xio_tcp_write(this->stream, this->s, cmd, length) != length) {
+  if (_x_io_tcp_write(this->stream, this->s, cmd, length) != length) {
     printf ("libmmsh: send error\n");
     return 0;
   }
@@ -275,7 +275,7 @@ static int get_answer (mmsh_t *this) {
 
   while (!done) {
 
-    if (xio_tcp_read(this->stream, this->s, &(this->buf[len]), 1) != 1) {
+    if (_x_io_tcp_read(this->stream, this->s, &(this->buf[len]), 1) != 1) {
       printf ("libmmsh: alert: end of stream\n");
       return 0;
     }
@@ -368,7 +368,7 @@ static int get_chunk_header (mmsh_t *this) {
   printf ("libmmsh: get_chunk\n");
 #endif
   /* chunk header */
-  len = xio_tcp_read(this->stream, this->s, chunk_header, CHUNK_HEADER_LENGTH);
+  len = _x_io_tcp_read(this->stream, this->s, chunk_header, CHUNK_HEADER_LENGTH);
   if (len != CHUNK_HEADER_LENGTH) {
 #ifdef LOG
     printf ("libmmsh: chunk header read failed, %d != %d\n", len, CHUNK_HEADER_LENGTH);
@@ -415,7 +415,7 @@ static int get_header (mmsh_t *this) {
           printf ("libmmsh: the asf header exceed %d bytes\n", ASF_HEADER_SIZE);
           return 0;
         } else {
-          len = xio_tcp_read(this->stream, this->s, this->asf_header + this->asf_header_len,
+          len = _x_io_tcp_read(this->stream, this->s, this->asf_header + this->asf_header_len,
                              this->chunk_length);
           this->asf_header_len += len;
           if (len != this->chunk_length) {
@@ -431,7 +431,7 @@ static int get_header (mmsh_t *this) {
   }
 
   /* read the first data chunk */
-  len = xio_tcp_read(this->stream, this->s, this->buf, this->chunk_length);
+  len = _x_io_tcp_read(this->stream, this->s, this->buf, this->chunk_length);
   if (len != this->chunk_length) {
     return 0;
   } else {
@@ -663,7 +663,7 @@ static int mmsh_tcp_connect(mmsh_t *this) {
 #ifdef LOG
   printf("libmmsh: try to connect to %s on port %d \n", this->host, this->port);
 #endif
-  this->s = xio_tcp_connect (this->stream, this->host, this->port);
+  this->s = _x_io_tcp_connect (this->stream, this->host, this->port);
 
   if (this->s == -1) {
     printf ("libmmsh: failed to connect '%s'\n", this->host);
@@ -674,7 +674,7 @@ static int mmsh_tcp_connect(mmsh_t *this) {
   progress = 0;
   do {
     report_progress(this->stream, progress);
-    res = xio_select (this->stream, this->s, XIO_WRITE_READY, 500);
+    res = _x_io_select (this->stream, this->s, XIO_WRITE_READY, 500);
     progress += 1;
   } while ((res == XIO_TIMEOUT) && (progress < 30));
   if (res != XIO_READY) {
@@ -938,7 +938,7 @@ static int get_media_packet (mmsh_t *this) {
         return 0;
     }
 
-    len = xine_read_abort (this->stream, this->s, this->buf, this->chunk_length);
+    len = _x_read_abort (this->stream, this->s, this->buf, this->chunk_length);
       
     if (len == this->chunk_length) {
       /* explicit padding with 0 */
diff --git a/src/input/pnm.c b/src/input/pnm.c
index b77cc69c8..4a09efb1e 100644
--- a/src/input/pnm.c
+++ b/src/input/pnm.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: pnm.c,v 1.15 2003/06/20 16:17:28 hadess Exp $
+ * $Id: pnm.c,v 1.16 2003/11/11 18:44:54 f1rmb Exp $
  *
  * pnm protocol implementation 
  * based upon code from joschka
@@ -299,7 +299,7 @@ static ssize_t rm_read(pnm_t *p, void *buf, size_t count) {
   return total;
 #else
 
-  return xine_read_abort(p->stream, p->s, buf, count );
+  return _x_read_abort(p->stream, p->s, buf, count );
 
 #endif
 }
diff --git a/src/input/vcd/xineplug_inp_vcd.c b/src/input/vcd/xineplug_inp_vcd.c
index 966e03f7c..537c14875 100644
--- a/src/input/vcd/xineplug_inp_vcd.c
+++ b/src/input/vcd/xineplug_inp_vcd.c
@@ -1,5 +1,5 @@
 /*
-  $Id: xineplug_inp_vcd.c,v 1.6 2003/10/21 16:10:31 mroi Exp $
+  $Id: xineplug_inp_vcd.c,v 1.7 2003/11/11 18:44:54 f1rmb Exp $
  
   Copyright (C) 2002,2003 Rocky Bernstein <rocky@panix.com>
   
@@ -586,7 +586,7 @@ vcd_read_ahead_cb(void *this_gen, xine_cfg_entry_t *entry)
 static void 
 vcd_flush_buffers(void)
 {
-  xine_demux_flush_engine(my_vcd.stream);
+  _x_demux_flush_engine(my_vcd.stream);
 }
 
 /*!
@@ -1047,7 +1047,7 @@ vcd_handle_events (void)
           default: 
             LOG_MSG("%s %d\n", _("Unknown event type: "), event->type);
           }
-          xine_demux_flush_engine(my_vcd.stream);
+          _x_demux_flush_engine(my_vcd.stream);
           vcdplayer_play(this, itemid);
           return true;
         }
@@ -1066,7 +1066,7 @@ vcd_handle_events (void)
           lid_t next_num=vcdplayer_selection2lid(this, itemid.num);
           if (VCDINFO_INVALID_LID != next_num) {
             itemid.num = next_num;
-            xine_demux_flush_engine(my_vcd.stream);
+            _x_demux_flush_engine(my_vcd.stream);
             vcdplayer_play(this, itemid);
             return true;
           }
@@ -1126,7 +1126,7 @@ vcd_get_optional_data (input_plugin_t *this_gen,
   case INPUT_OPTIONAL_DATA_AUDIOLANG: 
     {
       int8_t   channel;
-      channel = (int8_t) xine_get_audio_channel(my_vcd.stream);
+      channel = (int8_t) _x_get_audio_channel(my_vcd.stream);
 
       dbg_print(INPUT_DBG_EXT, "AUDIO CHANNEL = %d\n", channel);
       if (-1 == channel) {
@@ -1152,7 +1152,7 @@ vcd_get_optional_data (input_plugin_t *this_gen,
     {
       /*uint16_t lang;*/
       int8_t   channel;
-      channel = (int8_t) xine_get_spu_channel(my_vcd.stream);
+      channel = (int8_t) _x_get_spu_channel(my_vcd.stream);
       dbg_print(INPUT_DBG_EXT, "SPU CHANNEL = %d\n", channel);
       if (-1 == channel) {
         sprintf(data, " %s", "auto");