public header cleanup:

* regulate mutual inclusion based on XINE_COMPILE
* src/xine-engine/spu_decoder.h was unused
  -> make it the spu decoder API header and remove src/libspudec/spu_decoder_api.h
* mark some xine_stream_t members as unused for next cleanup

CVS patchset: 4883
CVS date: 2003/05/20 13:50:55

24 files changed, 249 insertions, 296 deletions

diff --git a/include/xine.h.in b/include/xine.h.in
index 9c43ac71c..d72ed71de 100644
--- a/include/xine.h.in
+++ b/include/xine.h.in
@@ -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.h.in,v 1.84 2003/05/15 20:23:16 miguelfreitas Exp $
+ * $Id: xine.h.in,v 1.85 2003/05/20 13:50:56 mroi Exp $
  *
  * public xine-lib (libxine) interface and documentation
  *
@@ -1601,12 +1601,12 @@ void        xine_osd_get_palette   (xine_osd_t *self, uint32_t *color,
 /*********************************************************************
  * TV-mode API, to make it possible to use nvtvd to view movies      *
  *********************************************************************/
+
 typedef enum {
 	XINE_TVSYSTEM_PAL    = 0,
 	XINE_TVSYSTEM_NTSC   = 1,
 } xine_tvsystem;
 
-
 /* connect to nvtvd server and save current TV and X settings */
 int xine_tvmode_init (xine_t *self);
 
diff --git a/src/demuxers/demux.h b/src/demuxers/demux.h
index 1a979ac43..52dd0568f 100644
--- a/src/demuxers/demux.h
+++ b/src/demuxers/demux.h
@@ -17,19 +17,22 @@
  * 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.h,v 1.30 2003/04/26 20:15:52 guenter Exp $
+ * $Id: demux.h,v 1.31 2003/05/20 13:50:56 mroi Exp $
  */
 
 #ifndef HAVE_DEMUX_H
 #define HAVE_DEMUX_H
 
-#include "buffer.h"
-#include "video_out.h"
-#include "xine_internal.h"
-#if defined(XINE_COMPILE)
-#include "input/input_plugin.h"
+#ifdef XINE_COMPILE
+#  include "input/input_plugin.h"
+#  include "buffer.h"
+#  include "video_out.h"
+#  include "xine_internal.h"
 #else
-#include "input_plugin.h"
+#  include <xine/input_plugin.h>
+#  include <xine/buffer.h>
+#  include <xine/video_out.h>
+#  include <xine/xine_internal.h>
 #endif
 
 #define DEMUXER_PLUGIN_IFACE_VERSION    21
diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h
index 47244bf8e..507c5e974 100644
--- a/src/input/input_plugin.h
+++ b/src/input/input_plugin.h
@@ -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_plugin.h,v 1.48 2003/04/26 22:34:32 guenter Exp $
+ * $Id: input_plugin.h,v 1.49 2003/05/20 13:50:56 mroi Exp $
  */
 
 #ifndef HAVE_INPUT_PLUGIN_H
@@ -25,9 +25,16 @@
 
 #include <inttypes.h>
 #include <sys/types.h>
-#include "xineutils.h"
-#include "buffer.h"
-#include "configfile.h"
+
+#ifdef XINE_COMPILE
+#  include "xineutils.h"
+#  include "buffer.h"
+#  include "configfile.h"
+#else
+#  include <xine/xineutils.h>
+#  include <xine/buffer.h>
+#  include <xine/configfile.h>
+#endif
 
 #define INPUT_PLUGIN_IFACE_VERSION   13
  
diff --git a/src/libspudec/Makefile.am b/src/libspudec/Makefile.am
index 264c17161..749d99709 100644
--- a/src/libspudec/Makefile.am
+++ b/src/libspudec/Makefile.am
@@ -26,4 +26,3 @@ endif
 xineplug_decode_spu_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 noinst_HEADERS = spu.h
-include_HEADERS = spu_decoder_api.h
diff --git a/src/libspudec/spu_decoder_api.h b/src/libspudec/spu_decoder_api.h
deleted file mode 100644
index 7eb33ed61..000000000
--- a/src/libspudec/spu_decoder_api.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * spu_decoder_api.h
- *
- * Copyright (C) James Courtier-Dutton James@superbug.demon.co.uk - July 2001
- *
- * This file is part of xine, a unix video player.
- * 
- * xine is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * xine is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with GNU Make; see the file COPYING. If not, write to
- * the Free Software Foundation, 
- *
- */
-
-#ifndef HAVE_SPU_API_H
-#define HAVE_SPU_API_H
-
-#define SPU_DECODER_IFACE_VERSION 14
-
-/*
- * generic xine spu decoder plugin interface
- */
-
-typedef struct spu_decoder_class_s spu_decoder_class_t;
-typedef struct spu_decoder_s spu_decoder_t;
-
-struct spu_decoder_class_s {
-
-  /*
-   * open a new instance of this plugin class
-   */
-  spu_decoder_t* (*open_plugin) (spu_decoder_class_t *this, xine_stream_t *stream);
-  
-  /*
-   * return short, human readable identifier for this plugin class
-   */
-  char* (*get_identifier) (spu_decoder_class_t *this);
-
-  /*
-   * return human readable (verbose = 1 line) description for 
-   * this plugin class
-   */
-  char* (*get_description) (spu_decoder_class_t *this);
-  
-  /*
-   * free all class-related resources
-   */
-  void (*dispose) (spu_decoder_class_t *this);
-};
-  
- 
-struct spu_decoder_s {
-
-  /*
-   * decode data from buf and feed the overlay to overlay manager
-   */  
-  void (*decode_data) (spu_decoder_t *this, buf_element_t *buf);
-
-  /*
-   * reset decoder after engine flush (prepare for new
-   * SPU data not related to recently decoded data)
-   */
-  void (*reset) (spu_decoder_t *this);
-    
-  /*
-   * inform decoder that a time reference discontinuity has happened.
-   * that is, it must forget any currently held pts value
-   */
-  void (*discontinuity) (spu_decoder_t *this);
-
-  /*
-   * close down, free all resources
-   */
-  void (*dispose) (spu_decoder_t *this);
-
-  /*
-   * When the SPU decoder also handles data used in user interaction,
-   * you can query the related information here. The typical example
-   * for this is DVD NAV packets which are handled by the SPU decoder
-   * and can be received readily parsed from here.
-   * The caller and the decoder must agree on the structure which is
-   * passed here.
-   * This function pointer may be NULL, if the plugin does not have
-   * such functionality.
-   */
-  int  (*get_interact_info) (spu_decoder_t *this, void *data);
-
-  /*
-   * When the SPU decoder also handles menu overlays for user inter-
-   * action, you can set a menu button here. The typical example for
-   * this is DVD menus.
-   * This function pointer may be NULL, if the plugin does not have
-   * such functionality.
-   */
-  void (*set_button) (spu_decoder_t *this_gen, int32_t button, int32_t mode);
-
-  void *node; /* used by plugin loader */
-};
-
-#endif /* HAVE_SPUDEC_H */
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index e1b8ecd68..7d5f3ac70 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -11,10 +11,13 @@ NVTVCLIENT_LIB = $(top_builddir)/src/xine-engine/nvtv/libnvclient.la
 
 libxine_la_SOURCES = xine.c metronom.c configfile.c buffer.c \
 	load_plugins.c video_decoder.c buffer_types.c \
-	audio_decoder.c video_out.c audio_out.c resample.c events.c lrb.c \
+	audio_decoder.c video_out.c audio_out.c resample.c events.c \
 	video_overlay.c osd.c scratch.c locale.c demux.c vo_scale.c \
 	xine_interface.c post.c tvmode.c broadcaster.c
 
+# FIXME: these are currently unused:
+EXTRA_DIST = lrb.c lrb.h
+
 if HAVE_NVTV
 libxine_la_DEPENDENCIES = @INTLLIBS@ $(XINEUTILS_LIB) $(NVTVCLIENT_LIB)
 libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @INTLLIBS@ $(ZLIB_LIBS) \
@@ -31,7 +34,7 @@ libxine_la_LDFLAGS =  \
 
 include_HEADERS  = buffer.h metronom.h configfile.h vo_scale.h \
         audio_out.h resample.h video_out.h xine_internal.h spu_decoder.h \
-	lrb.h video_overlay.h osd.h scratch.h xine_plugin.h xineintl.h  \
+	video_overlay.h osd.h scratch.h xine_plugin.h xineintl.h  \
 	plugin_catalog.h audio_decoder.h video_decoder.h post.h broadcaster.h
 
 noinst_HEADERS = bswap.h
diff --git a/src/xine-engine/audio_decoder.h b/src/xine-engine/audio_decoder.h
index a194694f1..5d1513bb8 100644
--- a/src/xine-engine/audio_decoder.h
+++ b/src/xine-engine/audio_decoder.h
@@ -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: audio_decoder.h,v 1.8 2002/12/21 12:56:51 miguelfreitas Exp $
+ * $Id: audio_decoder.h,v 1.9 2003/05/20 13:50:56 mroi Exp $
  *
  * xine audio decoder plugin interface
  *
@@ -27,7 +27,12 @@
 #define HAVE_AUDIO_DECODER_H
 
 #include <inttypes.h>
-#include "buffer.h"
+
+#ifdef XINE_COMPILE
+#  include "buffer.h"
+#else
+#  include <xine/buffer.h>
+#endif
 
 #define AUDIO_DECODER_IFACE_VERSION 13
 
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index e3339e753..8299cad9d 100644
--- a/src/xine-engine/buffer.h
+++ b/src/xine-engine/buffer.h
@@ -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: buffer.h,v 1.113 2003/05/15 20:23:18 miguelfreitas Exp $
+ * $Id: buffer.h,v 1.114 2003/05/20 13:50:57 mroi Exp $
  *
  *
  * contents:
@@ -46,7 +46,12 @@ extern "C" {
 #include <pthread.h>
 #include <inttypes.h>
 #include <sys/types.h>
-#include "attributes.h"
+
+#ifdef XINE_COMPILE
+#  include "attributes.h"
+#else
+#  include <xine/attributes.h>
+#endif
 
 #define BUF_MAX_CALLBACKS 5
 
diff --git a/src/xine-engine/configfile.h b/src/xine-engine/configfile.h
index 4905e51eb..0d6546b90 100644
--- a/src/xine-engine/configfile.h
+++ b/src/xine-engine/configfile.h
@@ -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: configfile.h,v 1.21 2003/04/25 15:34:45 mroi Exp $
+ * $Id: configfile.h,v 1.22 2003/05/20 13:50:56 mroi Exp $
  *
  * config file management
  *
@@ -31,9 +31,13 @@ extern "C" {
 #endif
 
 #include <inttypes.h>
+#include <pthread.h>
 
-#include "xine.h"
-#include "pthread.h"
+#ifdef XINE_COMPILE
+#  include "xine.h"
+#else
+#  include <xine.h>
+#endif
 
 typedef struct cfg_entry_s cfg_entry_t;
 typedef struct config_values_s config_values_t;
diff --git a/src/xine-engine/lrb.h b/src/xine-engine/lrb.h
index ead6a855d..9282c49c5 100644
--- a/src/xine-engine/lrb.h
+++ b/src/xine-engine/lrb.h
@@ -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: lrb.h,v 1.2 2002/10/23 17:12:32 guenter Exp $
+ * $Id: lrb.h,v 1.3 2003/05/20 13:50:56 mroi Exp $
  *
  * lrb : limited ring buffer
  * used for temporal buffer, limited to n elements
@@ -27,7 +27,11 @@
 #ifndef HAVE_LRB_H
 #define HAVE_LRB_H
 
-#include "buffer.h"
+#ifdef XINE_COMPILE
+#  include "buffer.h"
+#else
+#  include <xine/buffer.h>
+#endif
 
 typedef struct {
 
diff --git a/src/xine-engine/metronom.h b/src/xine-engine/metronom.h
index 2df24d87e..25e9e8621 100644
--- a/src/xine-engine/metronom.h
+++ b/src/xine-engine/metronom.h
@@ -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: metronom.h,v 1.49 2003/05/15 20:23:18 miguelfreitas Exp $
+ * $Id: metronom.h,v 1.50 2003/05/20 13:50:56 mroi Exp $
  *
  * metronom: general pts => virtual calculation/assoc
  *                   
@@ -50,8 +50,14 @@ extern "C" {
 #include <inttypes.h>
 #include <sys/time.h>
 #include <pthread.h>
-#include "video_out.h"
-#include "xine.h"
+
+#ifdef XINE_COMPILE
+#  include "video_out.h"
+#  include "xine.h"
+#else
+#  include <xine/video_out.h>
+#  include <xine.h>
+#endif
 
 typedef struct metronom_s metronom_t ;
 typedef struct metronom_clock_s metronom_clock_t;
diff --git a/src/xine-engine/osd.h b/src/xine-engine/osd.h
index ce5ef93b8..21e0bf0e8 100644
--- a/src/xine-engine/osd.h
+++ b/src/xine-engine/osd.h
@@ -18,15 +18,19 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
  * OSD stuff (text and graphic primitives)
- * $Id: osd.h,v 1.15 2003/04/06 15:50:57 holstsn Exp $
+ * $Id: osd.h,v 1.16 2003/05/20 13:50:56 mroi Exp $
  */
 
 #ifndef HAVE_OSD_H
 #define HAVE_OSD_H
 
-#include "video_overlay.h"
-#ifdef __OSD_C__
-#include "video_out/alphablend.h"
+#ifdef XINE_COMPILE
+#  include "video_overlay.h"
+#  ifdef __OSD_C__
+#    include "video_out/alphablend.h"
+#  endif
+#else
+#  include <xine/video_overlay.h>
 #endif
 
 typedef struct osd_object_s osd_object_t;
diff --git a/src/xine-engine/plugin_catalog.h b/src/xine-engine/plugin_catalog.h
index 8497b8741..f96e7b1d2 100644
--- a/src/xine-engine/plugin_catalog.h
+++ b/src/xine-engine/plugin_catalog.h
@@ -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: plugin_catalog.h,v 1.11 2003/01/03 22:38:29 miguelfreitas Exp $
+ * $Id: plugin_catalog.h,v 1.12 2003/05/20 13:50:56 mroi Exp $
  *
  * xine-internal header: Definitions for plugin lists
  *
@@ -26,8 +26,13 @@
 #ifndef _PLUGIN_CATALOG_H
 #define _PLUGIN_CATALOG_H
 
-#include "xine_plugin.h"
-#include "xineutils.h"
+#ifdef XINE_COMPILE
+#  include "xine_plugin.h"
+#  include "xineutils.h"
+#else
+#  include <xine/xine_plugin.h>
+#  include <xine/xineutils.h>
+#endif
 
 #define DECODER_MAX 256
 #define PLUGIN_MAX  256
diff --git a/src/xine-engine/post.h b/src/xine-engine/post.h
index b919bf2d0..ebdb74288 100644
--- a/src/xine-engine/post.h
+++ b/src/xine-engine/post.h
@@ -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: post.h,v 1.5 2002/12/29 14:04:43 mroi Exp $
+ * $Id: post.h,v 1.6 2003/05/20 13:50:57 mroi Exp $
  *
  * post plugin definitions
  *
@@ -26,10 +26,17 @@
 #ifndef XINE_POST_H
 #define XINE_POST_H
 
-#include "xine.h"
-#include "video_out.h"
-#include "audio_out.h"
-#include "xineutils.h"
+#ifdef XINE_COMPILE
+#  include "xine.h"
+#  include "video_out.h"
+#  include "audio_out.h"
+#  include "xineutils.h"
+#else
+#  include <xine.h>
+#  include <xine/video_out.h>
+#  include <xine/audio_out.h>
+#  include <xine/xineutils.h>
+#endif
 
 #define POST_PLUGIN_IFACE_VERSION 2
 
diff --git a/src/xine-engine/spu_decoder.h b/src/xine-engine/spu_decoder.h
index 09cd9008c..bae6267b1 100644
--- a/src/xine-engine/spu_decoder.h
+++ b/src/xine-engine/spu_decoder.h
@@ -1,144 +1,117 @@
-/* 
- * Copyright (C) 2000-2002 the xine project
- * 
+/*
+ * spu_decoder_api.h
+ *
  * Copyright (C) James Courtier-Dutton James@superbug.demon.co.uk - July 2001
  *
- * This file is part of xine, a free video player.
+ * This file is part of xine, a unix video player.
  * 
  * xine is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * xine is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  * 
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * along with GNU Make; see the file COPYING. If not, write to
+ * the Free Software Foundation, 
  *
- * $Id: spu_decoder.h,v 1.6 2002/10/23 17:12:34 guenter Exp $
  */
-#ifndef HAVE_SPU_OUT_H
-#define HAVE_SPU_OUT_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#ifndef HAVE_SPU_API_H
+#define HAVE_SPU_API_H
 
 #include <inttypes.h>
 
-#if defined(XINE_COMPILE)
-#include "metronom.h"
-#include "configfile.h"
+#ifdef XINE_COMPILE
+#  include "buffer.h"
+#else
+#  include <xine/buffer.h>
 #endif
 
-
-#define SPU_OUT_IFACE_VERSION  1
+#define SPU_DECODER_IFACE_VERSION 14
 
 /*
- * spu_functions_s contains the functions every spu output
- * driver plugin has to implement.
+ * generic xine spu decoder plugin interface
  */
 
-typedef struct spu_functions_s spu_functions_t;
+typedef struct spu_decoder_class_s spu_decoder_class_t;
+typedef struct spu_decoder_s spu_decoder_t;
 
-struct spu_functions_s {
+struct spu_decoder_class_s {
 
-  /* 
-   *
-   * find out what output modes + capatilities are supported by 
-   * this plugin (constants for the bit vector to return see above)
-   *
-   * See SPU_CAP_* bellow.
+  /*
+   * open a new instance of this plugin class
    */
-  uint32_t (*get_capabilities) (spu_functions_t *this);
-
+  spu_decoder_t* (*open_plugin) (spu_decoder_class_t *this, xine_stream_t *stream);
+  
   /*
-   * connect this driver to the xine engine
+   * return short, human readable identifier for this plugin class
    */
-  void (*connect) (spu_functions_t *this, metronom_t *metronom);
+  char* (*get_identifier) (spu_decoder_class_t *this);
 
   /*
-   * open the driver and make it ready to receive spu data 
-   * buffers may be flushed(!)
-   *
-   * return value: <=0 : failure, 1 : ok
+   * return human readable (verbose = 1 line) description for 
+   * this plugin class
    */
-
-  int (*open)(spu_functions_t *this, uint32_t bits, uint32_t rate, int mode);
-
+  char* (*get_description) (spu_decoder_class_t *this);
+  
   /*
-   * write spu data to output buffer - may block
-   * spu driver must sync sample playback with metronom
+   * free all class-related resources
    */
+  void (*dispose) (spu_decoder_class_t *this);
+};
+  
+ 
+struct spu_decoder_s {
 
-  void (*write_spu_data)(spu_functions_t *this,
-			   int16_t* spu_data, uint32_t num_samples, 
-			   int64_t pts);
+  /*
+   * decode data from buf and feed the overlay to overlay manager
+   */  
+  void (*decode_data) (spu_decoder_t *this, buf_element_t *buf);
 
   /*
-   * this is called when the decoder no longer uses the spu
-   * output driver - the driver should get ready to get opened() again
+   * reset decoder after engine flush (prepare for new
+   * SPU data not related to recently decoded data)
    */
-
-  void (*close)(spu_functions_t *this);
-
+  void (*reset) (spu_decoder_t *this);
+    
   /*
-   * shut down this spu output driver plugin and
-   * free all resources allocated
+   * inform decoder that a time reference discontinuity has happened.
+   * that is, it must forget any currently held pts value
    */
+  void (*discontinuity) (spu_decoder_t *this);
 
-  void (*exit) (spu_functions_t *this);
+  /*
+   * close down, free all resources
+   */
+  void (*dispose) (spu_decoder_t *this);
 
   /*
-   * Get, Set a property of spu driver.
-   *
-   * get_property() return 1 in success, 0 on failure.
-   * set_property() return value on success, ~value on failure.
-   *
-   * See AC_PROP_* bellow for available properties.
+   * When the SPU decoder also handles data used in user interaction,
+   * you can query the related information here. The typical example
+   * for this is DVD NAV packets which are handled by the SPU decoder
+   * and can be received readily parsed from here.
+   * The caller and the decoder must agree on the structure which is
+   * passed here.
+   * This function pointer may be NULL, if the plugin does not have
+   * such functionality.
    */
-  int (*get_property) (spu_functions_t *this, int property);
+  int  (*get_interact_info) (spu_decoder_t *this, void *data);
 
-  int (*set_property) (spu_functions_t *this,  int property, int value);
+  /*
+   * When the SPU decoder also handles menu overlays for user inter-
+   * action, you can set a menu button here. The typical example for
+   * this is DVD menus.
+   * This function pointer may be NULL, if the plugin does not have
+   * such functionality.
+   */
+  void (*set_button) (spu_decoder_t *this_gen, int32_t button, int32_t mode);
 
+  void *node; /* used by plugin loader */
 };
 
-
-/*
- * to build a dynamic spu output plugin,
- * you have to implement these functions:
- *
- *
- * spu_functions_t *init_spu_out_plugin (config_values_t *config)
- *
- * init this plugin, check if device is available
- *
- * spu_info_t *get_spu_out_plugin_info ()
- *
- * peek at some (static) information about the plugin without initializing it
- *
- */
-
-/*
- * spu output modes + capabilities
- */
-
-/* none yet */
-
-typedef struct spu_info_s {
-
-  int     interface_version;
-  char   *id;
-  char   *description;
-  int     priority;
-} spu_info_t ;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
+#endif /* HAVE_SPUDEC_H */
diff --git a/src/xine-engine/video_decoder.h b/src/xine-engine/video_decoder.h
index e4b891e6b..bf5936b70 100644
--- a/src/xine-engine/video_decoder.h
+++ b/src/xine-engine/video_decoder.h
@@ -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: video_decoder.h,v 1.8 2002/12/21 12:56:52 miguelfreitas Exp $
+ * $Id: video_decoder.h,v 1.9 2003/05/20 13:50:57 mroi Exp $
  *
  * xine video decoder plugin interface
  *
@@ -27,7 +27,12 @@
 #define HAVE_VIDEO_DECODER_H
 
 #include <inttypes.h>
-#include "buffer.h"
+
+#ifdef XINE_COMPILE
+#  include "buffer.h"
+#else
+#  include <xine/buffer.h>
+#endif
 
 #define VIDEO_DECODER_IFACE_VERSION 14
 
diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h
index 92a8bdc77..c8f06212a 100644
--- a/src/xine-engine/video_out.h
+++ b/src/xine-engine/video_out.h
@@ -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: video_out.h,v 1.86 2003/04/25 15:34:46 mroi Exp $
+ * $Id: video_out.h,v 1.87 2003/05/20 13:50:57 mroi Exp $
  *
  *
  * xine version of video_out.h 
@@ -43,7 +43,11 @@ extern "C" {
 #include "config.h"
 #endif
 
-#include "xine.h"
+#ifdef XINE_COMPILE
+#  include "xine.h"
+#else
+#  include <xine.h>
+#endif
 
 #include <inttypes.h>
 #include <pthread.h>
diff --git a/src/xine-engine/video_overlay.h b/src/xine-engine/video_overlay.h
index f65faac7f..04c417255 100644
--- a/src/xine-engine/video_overlay.h
+++ b/src/xine-engine/video_overlay.h
@@ -17,14 +17,18 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: video_overlay.h,v 1.13 2002/11/20 13:51:36 mroi Exp $
+ * $Id: video_overlay.h,v 1.14 2003/05/20 13:50:57 mroi Exp $
  *
  */
 
 #ifndef HAVE_VIDEO_OVERLAY_H
 #define HAVE_VIDEO_OVERLAY_H
 
-#include "xine_internal.h"
+#ifdef XINE_COMPILE
+#  include "xine_internal.h"
+#else
+#  include <xine/xine_internal.h>
+#endif
 
 #ifdef	__GNUC__
 #define CLUT_Y_CR_CB_INIT(_y,_cr,_cb)	{y: (_y), cr: (_cr), cb: (_cb)}
diff --git a/src/xine-engine/vo_scale.h b/src/xine-engine/vo_scale.h
index 546cf2ee1..16d44f3f2 100644
--- a/src/xine-engine/vo_scale.h
+++ b/src/xine-engine/vo_scale.h
@@ -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: vo_scale.h,v 1.7 2003/04/25 15:34:48 mroi Exp $
+ * $Id: vo_scale.h,v 1.8 2003/05/20 13:50:57 mroi Exp $
  * 
  * vo_scale.h
  *
@@ -35,8 +35,11 @@ extern "C" {
 #include "config.h"
 #endif
 
-/* Added during _MSC_VER port */
-#include <configfile.h>
+#ifdef XINE_COMPILE
+#  include "configfile.h"
+#else
+#  include <xine/configfile.h>
+#endif
 
 typedef struct {
   int x, y;
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index eec327b37..5e2bc832e 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.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.c,v 1.247 2003/05/15 20:23:18 miguelfreitas Exp $
+ * $Id: xine.c,v 1.248 2003/05/20 13:50:57 mroi Exp $
  *
  * top-level xine functions
  *
@@ -47,7 +47,7 @@
 #include "video_out.h"
 #include "demuxers/demux.h"
 #include "buffer.h"
-#include "libspudec/spu_decoder_api.h"
+#include "spu_decoder.h"
 /* TODO: who uses spu_decoder.h ? */
 #include "spu_decoder.h"
 #include "input/input_plugin.h"
@@ -372,7 +372,6 @@ xine_stream_t *xine_stream_new (xine_t *this,
     stream->stream_info[i]       = 0;
     stream->meta_info[i]         = NULL;
   }
-  stream->spu_out                = NULL;
   stream->spu_decoder_plugin     = NULL;
   stream->spu_decoder_streamtype = -1;
   stream->audio_out              = ao;
diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h
index d8f234048..2610288f3 100644
--- a/src/xine-engine/xine_internal.h
+++ b/src/xine-engine/xine_internal.h
@@ -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_internal.h,v 1.137 2003/05/15 20:23:18 miguelfreitas Exp $
+ * $Id: xine_internal.h,v 1.138 2003/05/20 13:50:57 mroi Exp $
  *
  */
 
@@ -40,38 +40,37 @@ typedef struct extra_info_s extra_info_t;
  */
 
 #ifdef XINE_COMPILE
-#include "include/xine.h"
+#  include "xine.h"
+#  include "input/input_plugin.h"
+#  include "demuxers/demux.h"
+#  include "video_out.h"
+#  include "audio_out.h"
+#  include "metronom.h"
+#  include "osd.h"
+#  include "xineintl.h"
+#  include "plugin_catalog.h"
+#  include "video_decoder.h"
+#  include "audio_decoder.h"
+#  include "spu_decoder.h"
+#  include "scratch.h"
+#  include "broadcaster.h"
 #else
-#include "xine.h"
+#  include <xine.h>
+#  include <xine/input_plugin.h>
+#  include <xine/demux.h>
+#  include <xine/video_out.h>
+#  include <xine/audio_out.h>
+#  include <xine/metronom.h>
+#  include <xine/osd.h>
+#  include <xine/xineintl.h>
+#  include <xine/plugin_catalog.h>
+#  include <xine/video_decoder.h>
+#  include <xine/audio_decoder.h>
+#  include <xine/spu_decoder.h>
+#  include <xine/scratch.h>
+#  include <xine/broadcaster.h>
 #endif
 
-#ifdef XINE_COMPILE
-#include "input/input_plugin.h"
-#include "demuxers/demux.h"
-#else
-#include "input_plugin.h"
-#include "demux.h"
-#endif
-
-#include "video_out.h"
-#include "audio_out.h"
-#include "metronom.h"
-#include "spu_decoder.h"
-#include "lrb.h"
-
-#ifdef XINE_COMPILE
-#include "libspudec/spu_decoder_api.h"
-#else
-#include "spu_decoder_api.h"
-#endif
-
-#include "osd.h"
-#include "scratch.h"
-#include "xineintl.h"
-#include "plugin_catalog.h"
-#include "video_decoder.h"
-#include "audio_decoder.h"
-#include "broadcaster.h"
 
 #define XINE_MAX_EVENT_LISTENERS         50
 #define XINE_MAX_EVENT_TYPES             100
@@ -175,7 +174,12 @@ struct xine_stream_s {
   
   xine_audio_port_t         *audio_out;
   fifo_buffer_t             *audio_fifo;
+  /* FIXME: the next member appears to be unused. Should it be removed? */
+#if 0
   lrb_t                     *audio_temp;
+#else
+  void                      *audio_temp;
+#endif
   pthread_t                  audio_thread;
   audio_decoder_t           *audio_decoder_plugin;
   int                        audio_decoder_streamtype;
@@ -190,8 +194,11 @@ struct xine_stream_s {
   int                        audio_channel_user;
   int                        audio_channel_auto;
 
-  spu_functions_t           *spu_out;
+  /* FIXME: remove these two members on the next structure cleanup,
+   * they are unused */
+  void                      *spu_out;
   pthread_t                  spu_thread;
+  
   spu_decoder_t             *spu_decoder_plugin;
   int                        spu_decoder_streamtype;
   uint32_t                   spu_track_map[50];
diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am
index 669db2cc9..d20c9d39b 100644
--- a/src/xine-utils/Makefile.am
+++ b/src/xine-utils/Makefile.am
@@ -31,9 +31,10 @@ libxineutils_la_LIBADD = $(THREAD_LIBS) $(xv_libs)
 
 include_HEADERS = attributes.h \
 	compat.h \
-	ppcasm_string.h \
 	xineutils.h \
 	xine_check.h \
 	xmllexer.h \
 	xmlparser.h \
 	xine_buffer.h
+
+noinst_HEADERS = ppcasm_string.h
diff --git a/src/xine-utils/xine_check.h b/src/xine-utils/xine_check.h
index 64c72eef1..149035037 100644
--- a/src/xine-utils/xine_check.h
+++ b/src/xine-utils/xine_check.h
@@ -1,7 +1,12 @@
 #ifndef XINE_CHECK_H
 #define XINE_CHECK_H
 #include <stdio.h>
-#include "xine.h"
+
+#ifdef XINE_COMPILE
+#  include "xine.h"
+#else
+#  include <xine.h>
+#endif
 
 #define XINE_HEALTH_CHECK_OK            0
 #define XINE_HEALTH_CHECK_FAIL          1
diff --git a/src/xine-utils/xineutils.h b/src/xine-utils/xineutils.h
index 33275b05c..23edb48e6 100644
--- a/src/xine-utils/xineutils.h
+++ b/src/xine-utils/xineutils.h
@@ -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: xineutils.h,v 1.49 2003/04/22 23:30:58 tchamp Exp $
+ * $Id: xineutils.h,v 1.50 2003/05/20 13:54:57 mroi Exp $
  *
  */
 #ifndef XINEUTILS_H
@@ -33,11 +33,20 @@ extern "C" {
 #include <stdarg.h>
 #include <inttypes.h>
 #include <pthread.h>
-#include "attributes.h"
-#include "compat.h"
-#include "xmlparser.h"
-#include "xine_buffer.h"
-#include "configfile.h"
+
+#ifdef XINE_COMPILE
+#  include "attributes.h"
+#  include "compat.h"
+#  include "xmlparser.h"
+#  include "xine_buffer.h"
+#  include "configfile.h"
+#else
+#  include <xine/attributes.h>
+#  include <xine/compat.h>
+#  include <xine/xmlparser.h>
+#  include <xine/xine_buffer.h>
+#  include <xine/configfile.h>
+#endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"