4 files changed, 13 insertions, 11 deletions
diff --git a/src/libsputext/Makefile.am b/src/libsputext/Makefile.am
index 5dd12bbf3..46256cec6 100644
--- a/src/libsputext/Makefile.am
+++ b/src/libsputext/Makefile.am
@@ -2,6 +2,8 @@ include $(top_srcdir)/misc/Makefile.common
 
 libdir = $(XINE_PLUGINDIR)
 
+AM_CFLAGS = -DTOTO=`echo $* | sed -e 's/\.[csS]//g'`
+
 if HAVE_GICONV
 sputext_decoder = xineplug_decode_sputext.la xineplug_decode_spuogm.la xineplug_dmx_sputext.la
 endif
diff --git a/src/libsputext/demux_sputext.c b/src/libsputext/demux_sputext.c
index 3aecee27a..824159792 100644
--- a/src/libsputext/demux_sputext.c
+++ b/src/libsputext/demux_sputext.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_sputext.c,v 1.25 2003/11/04 00:24:52 f1rmb Exp $
+ * $Id: demux_sputext.c,v 1.26 2003/11/11 18:44:54 f1rmb Exp $
  *
  * code based on old libsputext/xine_decoder.c
  *
@@ -879,8 +879,8 @@ static int demux_sputext_seek (demux_plugin_t *this_gen,
   this->cur = 0;
   this->status = DEMUX_OK;
   
-  xine_demux_flush_engine (this->stream);
-  xine_demux_control_newpts(this->stream, 0, 0);
+  _x_demux_flush_engine (this->stream);
+  _x_demux_control_newpts(this->stream, 0, 0);
   
   return this->status;
 }
@@ -892,7 +892,7 @@ static void demux_sputext_send_headers(demux_plugin_t *this_gen) {
 
   lprintf("demux_sputext: send_headers() called\n");
   
-  xine_demux_control_start(this->stream);
+  _x_demux_control_start(this->stream);
   this->stream->stream_info[XINE_STREAM_INFO_HAS_VIDEO] = 0;
   this->stream->stream_info[XINE_STREAM_INFO_HAS_AUDIO] = 0;
 
@@ -1031,7 +1031,7 @@ static void *init_sputext_demux_class (xine_t *xine, void *data) {
   demux_sputext_class_t *this ;
 
   lprintf("demux_sputext: initializing\n");
-  
+
   this = xine_xmalloc (sizeof (demux_sputext_class_t));
 
   this->demux_class.open_plugin     = open_demux_plugin;
diff --git a/src/libsputext/xine_decoder.c b/src/libsputext/xine_decoder.c
index 553d26641..2e0157b5c 100644
--- a/src/libsputext/xine_decoder.c
+++ b/src/libsputext/xine_decoder.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: xine_decoder.c,v 1.64 2003/10/23 20:12:34 mroi Exp $
+ * $Id: xine_decoder.c,v 1.65 2003/11/11 18:44:54 f1rmb Exp $
  *
  */
 
@@ -238,7 +238,7 @@ static void spudec_decode_data (spu_decoder_t *this_gen, buf_element_t *buf) {
   start += (spu_offset / 90);
   end += (spu_offset / 90);
    
-  xine_get_current_info (this->stream->master, &extra_info, sizeof(extra_info) );
+  _x_get_current_info (this->stream->master, &extra_info, sizeof(extra_info) );
   
   if( !this->seek_count ) {
     this->seek_count = extra_info.seek_count;
@@ -345,7 +345,7 @@ static void spudec_decode_data (spu_decoder_t *this_gen, buf_element_t *buf) {
 
     xine_usec_sleep (50000);
             
-    xine_get_current_info (this->stream->master, &extra_info, sizeof(extra_info) );
+    _x_get_current_info (this->stream->master, &extra_info, sizeof(extra_info) );
   }
 #ifdef LOG
   printf("libsputext: seek_count mismatch\n");
diff --git a/src/libsputext/xine_decoder_ogm.c b/src/libsputext/xine_decoder_ogm.c
index f4dfe838c..98cee9746 100644
--- a/src/libsputext/xine_decoder_ogm.c
+++ b/src/libsputext/xine_decoder_ogm.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: xine_decoder_ogm.c,v 1.6 2003/10/23 20:12:34 mroi Exp $
+ * $Id: xine_decoder_ogm.c,v 1.7 2003/11/11 18:44:55 f1rmb Exp $
  *
  */
 
@@ -331,7 +331,7 @@ static void spudec_decode_data (spu_decoder_t *this_gen, buf_element_t *buf) {
   start += (spu_offset / 90);
   end += (spu_offset / 90);
    
-  xine_get_current_info (this->stream->master, &extra_info, sizeof(extra_info) );
+  _x_get_current_info (this->stream->master, &extra_info, sizeof(extra_info) );
   
   if( !this->seek_count ) {
     this->seek_count = extra_info.seek_count;
@@ -405,7 +405,7 @@ static void spudec_decode_data (spu_decoder_t *this_gen, buf_element_t *buf) {
 
     xine_usec_sleep (50000);
             
-    xine_get_current_info (this->stream->master, &extra_info, sizeof(extra_info) );
+    _x_get_current_info (this->stream->master, &extra_info, sizeof(extra_info) );
   }
 #ifdef LOG
   printf("libspuogm: seek_count mismatch\n");