Use protected visibility for all the functions exported by libxine.so, so that their binding is local to the library (has a similar effect to -Bsymbolic, but will work better with hidden visibility enabled, that is step two).

CVS patchset: 8289
CVS date: 2006/09/26 05:19:47

23 files changed, 160 insertions, 159 deletions

diff --git a/src/xine-engine/alphablend.h b/src/xine-engine/alphablend.h
index ee784c4b1..30806cd5e 100644
--- a/src/xine-engine/alphablend.h
+++ b/src/xine-engine/alphablend.h
@@ -36,8 +36,8 @@ typedef struct {
   int offset_x, offset_y;
 } alphablend_t;
 
-void _x_alphablend_init(alphablend_t *extra_data, xine_t *xine);
-void _x_alphablend_free(alphablend_t *extra_data);
+void _x_alphablend_init(alphablend_t *extra_data, xine_t *xine) XINE_PROTECTED;
+void _x_alphablend_free(alphablend_t *extra_data) XINE_PROTECTED;
 
 /* _MSC_VER port changes */
 #undef ATTRIBUTE_PACKED
@@ -84,25 +84,25 @@ typedef struct {
 void _x_blend_rgb16 (uint8_t * img, vo_overlay_t * img_overl,
 		  int img_width, int img_height,
 		  int dst_width, int dst_height,
-                  alphablend_t *extra_data);
+                  alphablend_t *extra_data) XINE_PROTECTED;
 
 void _x_blend_rgb24 (uint8_t * img, vo_overlay_t * img_overl,
 		  int img_width, int img_height,
 		  int dst_width, int dst_height,
-                  alphablend_t *extra_data);
+                  alphablend_t *extra_data) XINE_PROTECTED;
 
 void _x_blend_rgb32 (uint8_t * img, vo_overlay_t * img_overl,
 		  int img_width, int img_height,
 		  int dst_width, int dst_height,
-                  alphablend_t *extra_data);
+                  alphablend_t *extra_data) XINE_PROTECTED;
 
 void _x_blend_yuv (uint8_t *dst_base[3], vo_overlay_t * img_overl,
                 int dst_width, int dst_height, int dst_pitches[3],
-                alphablend_t *extra_data);
+                alphablend_t *extra_data) XINE_PROTECTED;
 
 void _x_blend_yuy2 (uint8_t * dst_img, vo_overlay_t * img_overl,
                  int dst_width, int dst_height, int dst_pitch,
-                 alphablend_t *extra_data);
+                 alphablend_t *extra_data) XINE_PROTECTED;
 
 /*
  * This function isn't too smart about blending. We want to avoid creating new
@@ -114,15 +114,15 @@ void _x_blend_yuy2 (uint8_t * dst_img, vo_overlay_t * img_overl,
 void _x_blend_xx44 (uint8_t *dst_img, vo_overlay_t *img_overl,
 		int dst_width, int dst_height, int dst_pitch, 
                 alphablend_t *extra_data,
-		xx44_palette_t *palette,int ia44);
+		xx44_palette_t *palette,int ia44) XINE_PROTECTED;
 
 /*
  * Functions to handle the xine-specific palette.
  */
 
-void _x_clear_xx44_palette(xx44_palette_t *p);
-void _x_init_xx44_palette(xx44_palette_t *p, unsigned num_entries);
-void _x_dispose_xx44_palette(xx44_palette_t *p);
+void _x_clear_xx44_palette(xx44_palette_t *p) XINE_PROTECTED;
+void _x_init_xx44_palette(xx44_palette_t *p, unsigned num_entries) XINE_PROTECTED;
+void _x_dispose_xx44_palette(xx44_palette_t *p) XINE_PROTECTED;
 
 /*
  * Convert the xine-specific palette to something useful.
@@ -130,7 +130,7 @@ void _x_dispose_xx44_palette(xx44_palette_t *p);
 
 void _x_xx44_to_xvmc_palette(const xx44_palette_t *p,unsigned char *xvmc_palette,
 			  unsigned first_xx44_entry, unsigned num_xx44_entries,
-			  unsigned num_xvmc_components, char *xvmc_components);
+			  unsigned num_xvmc_components, char *xvmc_components) XINE_PROTECTED;
 
 
 #endif
diff --git a/src/xine-engine/audio_out.h b/src/xine-engine/audio_out.h
index 7754ff3a7..c5f335dbb 100644
--- a/src/xine-engine/audio_out.h
+++ b/src/xine-engine/audio_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: audio_out.h,v 1.76 2006/03/07 08:03:29 tmattern Exp $
+ * $Id: audio_out.h,v 1.77 2006/09/26 05:19:48 dgp85 Exp $
  */
 #ifndef HAVE_AUDIO_OUT_H
 #define HAVE_AUDIO_OUT_H
@@ -261,7 +261,7 @@ struct audio_driver_class_s {
  * this initiates the audio_out sync routines
  * found in ./src/xine-engine/audio_out.c
  */
-xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_driver_t *driver, int grab_only) ;
+xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_driver_t *driver, int grab_only) XINE_PROTECTED;
 
 /*
  * audio output modes + capabilities
@@ -292,11 +292,11 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_driver_t *driver, int grab_o
 /*
  * converts the audio output mode into the number of channels
  */
-int _x_ao_mode2channels( int mode );
+int _x_ao_mode2channels( int mode ) XINE_PROTECTED;
 /*
  * converts the number of channels into the audio output mode
  */
-int _x_ao_channels2mode( int channels );
+int _x_ao_channels2mode( int channels ) XINE_PROTECTED;
 
 #define AO_CAP_MIXER_VOL        0x00000100 /* driver supports mixer control */
 #define AO_CAP_PCM_VOL          0x00000200 /* driver supports pcm control   */
diff --git a/src/xine-engine/broadcaster.h b/src/xine-engine/broadcaster.h
index 81f6e9584..bc0d2feab 100644
--- a/src/xine-engine/broadcaster.h
+++ b/src/xine-engine/broadcaster.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: broadcaster.h,v 1.2 2003/11/11 18:45:00 f1rmb Exp $
+ * $Id: broadcaster.h,v 1.3 2006/09/26 05:19:48 dgp85 Exp $
  * 
  * broadcaster.h
  *
@@ -36,9 +36,9 @@ extern "C" {
 
 typedef struct broadcaster_s broadcaster_t;
 
-broadcaster_t *_x_init_broadcaster(xine_stream_t *stream, int port);
-void _x_close_broadcaster(broadcaster_t *this);
-int _x_get_broadcaster_port(broadcaster_t *this);
+broadcaster_t *_x_init_broadcaster(xine_stream_t *stream, int port) XINE_PROTECTED;
+void _x_close_broadcaster(broadcaster_t *this) XINE_PROTECTED;
+int _x_get_broadcaster_port(broadcaster_t *this) XINE_PROTECTED;
 
 
 #ifdef __cplusplus
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index 2420a88e1..87e366017 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.157 2006/08/03 04:30:43 tmmm Exp $
+ * $Id: buffer.h,v 1.158 2006/09/26 05:19:48 dgp85 Exp $
  *
  *
  * contents:
@@ -603,24 +603,24 @@ struct fifo_buffer_s
  * allocate num_buffers of buf_size bytes each
  */
 
-fifo_buffer_t *_x_fifo_buffer_new (int num_buffers, uint32_t buf_size);
-fifo_buffer_t *_x_dummy_fifo_buffer_new (int num_buffers, uint32_t buf_size);
+fifo_buffer_t *_x_fifo_buffer_new (int num_buffers, uint32_t buf_size) XINE_PROTECTED;
+fifo_buffer_t *_x_dummy_fifo_buffer_new (int num_buffers, uint32_t buf_size) XINE_PROTECTED;
 
 
 /* return BUF_VIDEO_xxx given the fourcc
  * fourcc_int must be read in machine endianness
  * example: fourcc_int = *(uint32_t *)fourcc_char;
  */
-uint32_t _x_fourcc_to_buf_video( uint32_t fourcc_int );
+uint32_t _x_fourcc_to_buf_video( uint32_t fourcc_int ) XINE_PROTECTED;
 
 /* return codec name given BUF_VIDEO_xxx */
-char * _x_buf_video_name( uint32_t buf_type );
+char * _x_buf_video_name( uint32_t buf_type ) XINE_PROTECTED;
 
 /* return BUF_VIDEO_xxx given the formattag */
-uint32_t _x_formattag_to_buf_audio( uint32_t formattag );
+uint32_t _x_formattag_to_buf_audio( uint32_t formattag ) XINE_PROTECTED;
 
 /* return codec name given BUF_VIDEO_xxx */
-char * _x_buf_audio_name( uint32_t buf_type );
+char * _x_buf_audio_name( uint32_t buf_type ) XINE_PROTECTED;
 
 
 #ifndef ATTRIBUTE_PACKED
@@ -663,10 +663,10 @@ typedef struct __attribute__((__packed__)) {
 #endif
 
 /* convert xine_bmiheader struct from little endian */
-void _x_bmiheader_le2me( xine_bmiheader *bih );
+void _x_bmiheader_le2me( xine_bmiheader *bih ) XINE_PROTECTED;
 
 /* convert xine_waveformatex struct from little endian */
-void _x_waveformatex_le2me( xine_waveformatex *wavex );
+void _x_waveformatex_le2me( xine_waveformatex *wavex ) XINE_PROTECTED;
 
 #ifdef __cplusplus
 }
diff --git a/src/xine-engine/configfile.h b/src/xine-engine/configfile.h
index f1e7d8956..2a98be9f1 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.37 2005/01/30 16:51:20 tmattern Exp $
+ * $Id: configfile.h,v 1.38 2006/09/26 05:19:48 dgp85 Exp $
  *
  * config file management
  *
@@ -193,13 +193,13 @@ struct config_values_s {
 /*
  * allocate and init a new xine config object
  */
-config_values_t *_x_config_init (void);
+config_values_t *_x_config_init (void) XINE_PROTECTED;
 
 /*
  * interpret stream_setup part of mrls for config value changes
  */
 
-int _x_config_change_opt(config_values_t *config, const char *opt) ;
+int _x_config_change_opt(config_values_t *config, const char *opt) XINE_PROTECTED;
 
 
 #ifdef __cplusplus
diff --git a/src/xine-engine/info_helper.h b/src/xine-engine/info_helper.h
index 5cf4b9a00..7eaa93f9c 100644
--- a/src/xine-engine/info_helper.h
+++ b/src/xine-engine/info_helper.h
@@ -38,7 +38,7 @@
  *   value         the value to assign
  *
  */
-void _x_stream_info_set(xine_stream_t *stream, int info, int value);
+void _x_stream_info_set(xine_stream_t *stream, int info, int value) XINE_PROTECTED;
 
 /*
  * reset a stream info (internal ones only)
@@ -48,7 +48,7 @@ void _x_stream_info_set(xine_stream_t *stream, int info, int value);
  *   info          meta info id (see xine.h, XINE_STREAM_INFO_*)
  *
  */
-void _x_stream_info_reset(xine_stream_t *stream, int info);
+void _x_stream_info_reset(xine_stream_t *stream, int info) XINE_PROTECTED;
 
 /*
  * reset a stream info (public ones only)
@@ -58,7 +58,7 @@ void _x_stream_info_reset(xine_stream_t *stream, int info);
  *   info          meta info id (see xine.h, XINE_STREAM_INFO_*)
  *
  */
-void _x_stream_info_public_reset(xine_stream_t *stream, int info);
+void _x_stream_info_public_reset(xine_stream_t *stream, int info) XINE_PROTECTED;
 
 /*
  * retrieve stream info (internal ones only)
@@ -68,7 +68,7 @@ void _x_stream_info_public_reset(xine_stream_t *stream, int info);
  *   info          meta info id (see xine.h, XINE_STREAM_INFO_*)
  *
  */
-uint32_t _x_stream_info_get(xine_stream_t *stream, int info);
+uint32_t _x_stream_info_get(xine_stream_t *stream, int info) XINE_PROTECTED;
 
 /*
  * retrieve stream info (public ones only)
@@ -78,7 +78,7 @@ uint32_t _x_stream_info_get(xine_stream_t *stream, int info);
  *   info          meta info id (see xine.h, XINE_STREAM_INFO_*)
  *
  */
-uint32_t _x_stream_info_get_public(xine_stream_t *stream, int info);
+uint32_t _x_stream_info_get_public(xine_stream_t *stream, int info) XINE_PROTECTED;
 
 /*
  * set a stream meta info
@@ -89,7 +89,7 @@ uint32_t _x_stream_info_get_public(xine_stream_t *stream, int info);
  *  *str           null-terminated string (using current locale)
  *
  */
-void _x_meta_info_set(xine_stream_t *stream, int info, const char *str);
+void _x_meta_info_set(xine_stream_t *stream, int info, const char *str) XINE_PROTECTED;
 
 /*
  * set a stream meta info
@@ -100,7 +100,7 @@ void _x_meta_info_set(xine_stream_t *stream, int info, const char *str);
  *  *str           null-terminated string (using utf8)
  *
  */
-void _x_meta_info_set_utf8(xine_stream_t *stream, int info, const char *str);
+void _x_meta_info_set_utf8(xine_stream_t *stream, int info, const char *str) XINE_PROTECTED;
 
 /*
  * set a stream meta info
@@ -112,7 +112,7 @@ void _x_meta_info_set_utf8(xine_stream_t *stream, int info, const char *str);
  *  *enc           charset encoding of the string
  *
  */
-void _x_meta_info_set_generic(xine_stream_t *stream, int info, const char *str, const char *enc);
+void _x_meta_info_set_generic(xine_stream_t *stream, int info, const char *str, const char *enc) XINE_PROTECTED;
 
 /*
  * set a stream meta multiple info
@@ -127,7 +127,7 @@ void _x_meta_info_set_multi(xine_stream_t *stream, int info, ...)
 #ifdef __GNUC__
 __attribute__((sentinel))
 #endif
-;
+ XINE_PROTECTED;
 
 /*
  * set a stream meta info
@@ -139,7 +139,7 @@ __attribute__((sentinel))
  *   len           length of the metainfo
  *
  */
-void _x_meta_info_n_set(xine_stream_t *stream, int info, const char *buf, int len);
+void _x_meta_info_n_set(xine_stream_t *stream, int info, const char *buf, int len) XINE_PROTECTED;
 
 /*
  * reset a stream meta info (internal ones only)
@@ -149,7 +149,7 @@ void _x_meta_info_n_set(xine_stream_t *stream, int info, const char *buf, int le
  *   info          meta info id (see xine.h, XINE_META_INFO_*)
  *
  */
-void _x_meta_info_reset(xine_stream_t *stream, int info);
+void _x_meta_info_reset(xine_stream_t *stream, int info) XINE_PROTECTED;
 
 /*
  * reset a stream meta info (public ones only)
@@ -159,7 +159,7 @@ void _x_meta_info_reset(xine_stream_t *stream, int info);
  *   info          meta info id (see xine.h, XINE_META_INFO_*)
  *
  */
-void _x_meta_info_public_reset(xine_stream_t *stream, int info);
+void _x_meta_info_public_reset(xine_stream_t *stream, int info) XINE_PROTECTED;
 
 /*
  * retrieve stream meta info (internal ones only)
@@ -169,7 +169,7 @@ void _x_meta_info_public_reset(xine_stream_t *stream, int info);
  *   info          meta info id (see xine.h, XINE_META_INFO_*)
  *
  */
-const char *_x_meta_info_get(xine_stream_t *stream, int info);
+const char *_x_meta_info_get(xine_stream_t *stream, int info) XINE_PROTECTED;
 
 /*
  * retrieve stream meta info (public ones only)
@@ -179,6 +179,6 @@ const char *_x_meta_info_get(xine_stream_t *stream, int info);
  *   info          meta info id (see xine.h, XINE_META_INFO_*)
  *
  */
-const char *_x_meta_info_get_public(xine_stream_t *stream, int info);
+const char *_x_meta_info_get_public(xine_stream_t *stream, int info) XINE_PROTECTED;
 
 #endif /* INFO_HELPER_H */
diff --git a/src/xine-engine/io_helper.h b/src/xine-engine/io_helper.h
index 09267f882..3b7cac17a 100644
--- a/src/xine-engine/io_helper.h
+++ b/src/xine-engine/io_helper.h
@@ -58,7 +58,7 @@
  *   XIO_ABORTED   command aborted by an other thread
  *   XIO_TIMEOUT   the file descriptor is not ready after timeout_msec milliseconds
  */
-int _x_io_select (xine_stream_t *stream, int fd, int state, int timeout_msec);
+int _x_io_select (xine_stream_t *stream, int fd, int state, int timeout_msec) XINE_PROTECTED;
 
 
 /*
@@ -71,7 +71,7 @@ int _x_io_select (xine_stream_t *stream, int fd, int state, int timeout_msec);
  *
  * returns a socket descriptor or -1 if an error occured
  */
-int _x_io_tcp_connect(xine_stream_t *stream, const char *host, int port);
+int _x_io_tcp_connect(xine_stream_t *stream, const char *host, int port) XINE_PROTECTED;
 
 /*
  * wait for finish connection
@@ -87,7 +87,7 @@ int _x_io_tcp_connect(xine_stream_t *stream, const char *host, int port);
  *   XIO_ABORTED   command aborted by an other thread
  *   XIO_TIMEOUT   the file descriptor is not ready after timeout
  */
-int _x_io_tcp_connect_finish(xine_stream_t *stream, int fd, int timeout_msec);
+int _x_io_tcp_connect_finish(xine_stream_t *stream, int fd, int timeout_msec) XINE_PROTECTED;
 
 /*
  * read from tcp socket checking demux_action_pending
@@ -97,7 +97,7 @@ int _x_io_tcp_connect_finish(xine_stream_t *stream, int fd, int timeout_msec);
  *
  * aborts with zero if no data is available and *abort is set
  */
-off_t _x_io_tcp_read (xine_stream_t *stream, int s, char *buf, off_t todo);
+off_t _x_io_tcp_read (xine_stream_t *stream, int s, char *buf, off_t todo) XINE_PROTECTED;
 
 
 /*
@@ -108,7 +108,7 @@ off_t _x_io_tcp_read (xine_stream_t *stream, int s, char *buf, off_t todo);
  *
  * aborts with zero if no data is available and *abort is set
  */
-off_t _x_io_tcp_write (xine_stream_t *stream, int s, char *buf, off_t todo);
+off_t _x_io_tcp_write (xine_stream_t *stream, int s, char *buf, off_t todo) XINE_PROTECTED;
 
 /*
  * read from a file descriptor checking demux_action_pending
@@ -118,7 +118,7 @@ off_t _x_io_tcp_write (xine_stream_t *stream, int s, char *buf, off_t todo);
  *
  * aborts with zero if no data is available and *abort is set
  */
-off_t _x_io_file_read (xine_stream_t *stream, int fd, char *buf, off_t todo);
+off_t _x_io_file_read (xine_stream_t *stream, int fd, char *buf, off_t todo) XINE_PROTECTED;
 
 
 /*
@@ -129,13 +129,13 @@ off_t _x_io_file_read (xine_stream_t *stream, int fd, char *buf, off_t todo);
  *
  * aborts with zero if *abort is set
  */
-off_t _x_io_file_write (xine_stream_t *stream, int fd, char *buf, off_t todo);
+off_t _x_io_file_write (xine_stream_t *stream, int fd, char *buf, off_t todo) XINE_PROTECTED;
 
 /*
  * read a string from socket, return string length (same as strlen)
  * the string is always '\0' terminated but given buffer size is never exceeded
  * that is, _x_io_tcp_read_line(,,,X) <= (X-1) ; X > 0
  */
-int _x_io_tcp_read_line(xine_stream_t *stream, int sock, char *str, int size);
+int _x_io_tcp_read_line(xine_stream_t *stream, int sock, char *str, int size) XINE_PROTECTED;
 
 #endif
diff --git a/src/xine-engine/metronom.h b/src/xine-engine/metronom.h
index 2a8f0e94d..1628ba9fd 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.63 2005/09/19 16:14:02 valtri Exp $
+ * $Id: metronom.h,v 1.64 2006/09/26 05:19:49 dgp85 Exp $
  *
  * metronom: general pts => virtual calculation/assoc
  *                   
@@ -226,7 +226,7 @@ struct metronom_s {
 #define METRONOM_VPTS_OFFSET      6
 #define METRONOM_PREBUFFER        7
 
-metronom_t *_x_metronom_init (int have_video, int have_audio, xine_t *xine);
+metronom_t *_x_metronom_init (int have_video, int have_audio, xine_t *xine) XINE_PROTECTED;
 
 /* FIXME: reorder this structure on the next cleanup to remove the dummies */
 struct metronom_clock_s {
@@ -322,7 +322,7 @@ struct metronom_clock_s {
 #endif
 };
 
-metronom_clock_t *_x_metronom_clock_init(xine_t *xine);
+metronom_clock_t *_x_metronom_clock_init(xine_t *xine) XINE_PROTECTED;
 
 /*
  * clock options
diff --git a/src/xine-engine/osd.h b/src/xine-engine/osd.h
index a8cb80249..6c7be8f0b 100644
--- a/src/xine-engine/osd.h
+++ b/src/xine-engine/osd.h
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
  * OSD stuff (text and graphic primitives)
- * $Id: osd.h,v 1.26 2005/09/25 00:44:04 miguelfreitas Exp $
+ * $Id: osd.h,v 1.27 2006/09/26 05:19:49 dgp85 Exp $
  */
 
 #ifndef HAVE_OSD_H
@@ -266,7 +266,7 @@ osd_renderer_t *_x_osd_renderer_init( xine_stream_t *stream );
 #ifdef __OSD_C__
  
 /* This text descriptions are used for config screen */
-static char *textpalettes_str[NUMBER_OF_TEXT_PALETTES+1] = {
+static const char *textpalettes_str[NUMBER_OF_TEXT_PALETTES+1] = {
   "white-black-transparent",
   "white-none-transparent",
   "white-none-translucid",
@@ -294,7 +294,7 @@ static char *textpalettes_str[NUMBER_OF_TEXT_PALETTES+1] = {
     This can surelly be improved a lot. [Miguel]
 */
 
-static clut_t textpalettes_color[NUMBER_OF_TEXT_PALETTES][TEXT_PALETTE_SIZE] = {
+static const clut_t textpalettes_color[NUMBER_OF_TEXT_PALETTES][TEXT_PALETTE_SIZE] = {
 /* white, black border, transparent */
   {
     CLUT_Y_CR_CB_INIT(0x00, 0x00, 0x00), /*0*/
@@ -353,7 +353,7 @@ static clut_t textpalettes_color[NUMBER_OF_TEXT_PALETTES][TEXT_PALETTE_SIZE] = {
   },
 };
 
-static uint8_t textpalettes_trans[NUMBER_OF_TEXT_PALETTES][TEXT_PALETTE_SIZE] = {
+static const uint8_t textpalettes_trans[NUMBER_OF_TEXT_PALETTES][TEXT_PALETTE_SIZE] = {
   {0, 0, 3, 6, 8, 10, 12, 14, 15, 15, 15 },
   {0, 0, 0, 0, 0, 0, 2, 6, 9, 12, 15 },
   {0, 8, 9, 10, 11, 12, 13, 14, 15, 15, 15 },
diff --git a/src/xine-engine/plugin_catalog.h b/src/xine-engine/plugin_catalog.h
index 027dd082a..5bd1c4701 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.20 2006/01/27 07:46:15 tmattern Exp $
+ * $Id: plugin_catalog.h,v 1.21 2006/09/26 05:19:49 dgp85 Exp $
  *
  * xine-internal header: Definitions for plugin lists
  *
@@ -90,13 +90,13 @@ typedef struct plugin_catalog_s plugin_catalog_t;
  * decoder plugins are loaded on demand
  * video/audio output plugins have special load/probe functions
  */
-void _x_scan_plugins (xine_t *this);
+void _x_scan_plugins (xine_t *this) XINE_PROTECTED;
 
 
 /*
  * dispose all currently loaded plugins (shutdown)
  */
 
-void _x_dispose_plugins (xine_t *this);
+void _x_dispose_plugins (xine_t *this) XINE_PROTECTED;
 
 #endif
diff --git a/src/xine-engine/post.h b/src/xine-engine/post.h
index 40627c9a6..f8aba5cef 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.22 2004/12/20 21:22:21 mroi Exp $
+ * $Id: post.h,v 1.23 2006/09/26 05:19:49 dgp85 Exp $
  *
  * post plugin definitions
  *
@@ -122,7 +122,7 @@ struct post_plugin_s {
 };
 
 /* helper function to initialize a post_plugin_t */
-void _x_post_init(post_plugin_t *post, int num_audio_inputs, int num_video_inputs);
+void _x_post_init(post_plugin_t *post, int num_audio_inputs, int num_video_inputs) XINE_PROTECTED;
 
 struct post_in_s {
 
@@ -237,13 +237,13 @@ struct post_video_port_s {
  * port functions will be replaced with own implementations;
  * for convenience, this can also create a related post_in_t and post_out_t */
 post_video_port_t *_x_post_intercept_video_port(post_plugin_t *post, xine_video_port_t *port,
-						post_in_t **input, post_out_t **output);
+						post_in_t **input, post_out_t **output) XINE_PROTECTED;
 
 /* use this to decorate and to undecorate a frame so that its functions
  * can be replaced with own implementations, decoration is usually done in
  * get_frame(), undecoration in frame->free() */
-vo_frame_t *_x_post_intercept_video_frame(vo_frame_t *frame, post_video_port_t *port);
-vo_frame_t *_x_post_restore_video_frame(vo_frame_t *frame, post_video_port_t *port);
+vo_frame_t *_x_post_intercept_video_frame(vo_frame_t *frame, post_video_port_t *port) XINE_PROTECTED;
+vo_frame_t *_x_post_restore_video_frame(vo_frame_t *frame, post_video_port_t *port) XINE_PROTECTED;
 
 /* when you want to pass a frame call on to the original issuer of the frame,
  * you need to propagate potential changes up and down the pipe, so the usual
@@ -253,8 +253,8 @@ vo_frame_t *_x_post_restore_video_frame(vo_frame_t *frame, post_video_port_t *po
  *   frame->next->function(frame->next);
  *   _x_post_frame_copy_up(frame, frame->next);
  */
-void _x_post_frame_copy_down(vo_frame_t *from, vo_frame_t *to);
-void _x_post_frame_copy_up(vo_frame_t *to, vo_frame_t *from);
+void _x_post_frame_copy_down(vo_frame_t *from, vo_frame_t *to) XINE_PROTECTED;
+void _x_post_frame_copy_up(vo_frame_t *to, vo_frame_t *from) XINE_PROTECTED;
 
 /* when you shortcut a frames usual draw() travel so that it will never reach
  * the draw() function of the original issuer, you still have to do some
@@ -263,7 +263,7 @@ void _x_post_frame_u_turn(vo_frame_t *frame, xine_stream_t *stream);
 
 /* use this to create a new, trivially decorated overlay manager in which
  * port functions can be replaced with own implementations */
-void _x_post_intercept_overlay_manager(video_overlay_manager_t *manager, post_video_port_t *port);
+void _x_post_intercept_overlay_manager(video_overlay_manager_t *manager, post_video_port_t *port) XINE_PROTECTED;
 
 /* pointer retrieval functions */
 static inline post_video_port_t *_x_post_video_frame_to_port(vo_frame_t *frame) {
@@ -318,7 +318,7 @@ struct post_audio_port_s {
 /* use this to create a new decorated audio port in which
  * port functions will be replaced with own implementations */
 post_audio_port_t *_x_post_intercept_audio_port(post_plugin_t *post, xine_audio_port_t *port,
-						post_in_t **input, post_out_t **output);
+						post_in_t **input, post_out_t **output) XINE_PROTECTED;
 
 
 /* this will allow pending rewire operations, calling this at the beginning
@@ -341,7 +341,7 @@ static inline void _x_post_unlock(post_plugin_t *post) {
 
 /* the standard disposal operation; returns 1 if the plugin is really
  * disposed and you should free everything you malloc()ed yourself */
-int _x_post_dispose(post_plugin_t *post);
+int _x_post_dispose(post_plugin_t *post) XINE_PROTECTED;
 
 
 /* macros to handle usage counter */
diff --git a/src/xine-engine/refcounter.c b/src/xine-engine/refcounter.c
index 11c6ceb11..18c2ad1ce 100644
--- a/src/xine-engine/refcounter.c
+++ b/src/xine-engine/refcounter.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: refcounter.c,v 1.1 2004/10/14 23:25:24 tmattern Exp $
+ * $Id: refcounter.c,v 1.2 2006/09/26 05:19:49 dgp85 Exp $
  *
  */
 #define LOG_MODULE "refcounter"
@@ -26,8 +26,8 @@
 #define LOG
 */
  
-#include "refcounter.h"
 #include "xine_internal.h"
+#include "refcounter.h"
 
 refcounter_t* _x_new_refcounter(void *object, void (*destructor)(void *))
 {
diff --git a/src/xine-engine/refcounter.h b/src/xine-engine/refcounter.h
index 98a9f26ae..640366b1f 100644
--- a/src/xine-engine/refcounter.h
+++ b/src/xine-engine/refcounter.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: refcounter.h,v 1.1 2004/10/14 23:25:24 tmattern Exp $
+ * $Id: refcounter.h,v 1.2 2006/09/26 05:19:49 dgp85 Exp $
  *
  */
 #ifndef HAVE_REFCOUNTER_H
@@ -38,12 +38,12 @@ typedef struct {
 
 typedef void (*refcounter_destructor)(void*);
 
-refcounter_t* _x_new_refcounter(void *object, refcounter_destructor destructor);
+refcounter_t* _x_new_refcounter(void *object, refcounter_destructor destructor) XINE_PROTECTED;
 
-int _x_refcounter_inc(refcounter_t *refcounter);
+int _x_refcounter_inc(refcounter_t *refcounter) XINE_PROTECTED;
 
-int _x_refcounter_dec(refcounter_t *refcounter);
+int _x_refcounter_dec(refcounter_t *refcounter) XINE_PROTECTED;
 
-void _x_refcounter_dispose(refcounter_t *refcounter);
+void _x_refcounter_dispose(refcounter_t *refcounter) XINE_PROTECTED;
 
 #endif /* HAVE_REFCOUNTER_H */
diff --git a/src/xine-engine/resample.c b/src/xine-engine/resample.c
index a081a01ea..a7b16917c 100644
--- a/src/xine-engine/resample.c
+++ b/src/xine-engine/resample.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: resample.c,v 1.9 2006/06/20 00:35:08 dgp85 Exp $
+ * $Id: resample.c,v 1.10 2006/09/26 05:19:49 dgp85 Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -25,6 +25,7 @@
 #endif
 
 #include <inttypes.h>
+#include "attributes.h"
 #include "resample.h"
 
 /* contributed by paul flinders */
diff --git a/src/xine-engine/resample.h b/src/xine-engine/resample.h
index 8fe0afc2b..e5aad1afa 100644
--- a/src/xine-engine/resample.h
+++ b/src/xine-engine/resample.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: resample.h,v 1.5 2003/12/09 00:02:37 f1rmb Exp $
+ * $Id: resample.h,v 1.6 2006/09/26 05:19:49 dgp85 Exp $
  *
  * utilitiy functions for audio drivers
  *
@@ -28,30 +28,30 @@
 #define HAVE_RESAMPLE_H
 
 void _x_audio_out_resample_stereo(int16_t* input_samples, uint32_t in_samples, 
-				  int16_t* output_samples, uint32_t out_samples);
+				  int16_t* output_samples, uint32_t out_samples) XINE_PROTECTED;
 
 void _x_audio_out_resample_mono(int16_t* input_samples, uint32_t in_samples, 
-				int16_t* output_samples, uint32_t out_samples);
+				int16_t* output_samples, uint32_t out_samples) XINE_PROTECTED;
 
 void _x_audio_out_resample_4channel(int16_t* input_samples, uint32_t in_samples, 
-				    int16_t* output_samples, uint32_t out_samples);
+				    int16_t* output_samples, uint32_t out_samples) XINE_PROTECTED;
 
 void _x_audio_out_resample_5channel(int16_t* input_samples, uint32_t in_samples, 
-				    int16_t* output_samples, uint32_t out_samples);
+				    int16_t* output_samples, uint32_t out_samples) XINE_PROTECTED;
 
 void _x_audio_out_resample_6channel(int16_t* input_samples, uint32_t in_samples, 
-				    int16_t* output_samples, uint32_t out_samples);
+				    int16_t* output_samples, uint32_t out_samples) XINE_PROTECTED;
 
 void _x_audio_out_resample_8to16(int8_t* input_samples, 
-				 int16_t* output_samples, uint32_t samples);
+				 int16_t* output_samples, uint32_t samples) XINE_PROTECTED;
 
 void _x_audio_out_resample_16to8(int16_t* input_samples, 
-				 int8_t*  output_samples, uint32_t samples);
+				 int8_t*  output_samples, uint32_t samples) XINE_PROTECTED;
 
 void _x_audio_out_resample_monotostereo(int16_t* input_samples, 
-					int16_t* output_samples, uint32_t frames);
+					int16_t* output_samples, uint32_t frames) XINE_PROTECTED;
 
 void _x_audio_out_resample_stereotomono(int16_t* input_samples, 
-					int16_t* output_samples, uint32_t frames);
+					int16_t* output_samples, uint32_t frames) XINE_PROTECTED;
                             
 #endif
diff --git a/src/xine-engine/scratch.c b/src/xine-engine/scratch.c
index b8f72ee93..259aec441 100644
--- a/src/xine-engine/scratch.c
+++ b/src/xine-engine/scratch.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: scratch.c,v 1.19 2006/09/09 19:35:40 dgp85 Exp $
+ * $Id: scratch.c,v 1.20 2006/09/26 05:19:49 dgp85 Exp $
  *
  * top-level xine functions
  *
@@ -37,8 +37,8 @@
 #define LOG
 */
 
-#include "scratch.h"
 #include "xineutils.h"
+#include "scratch.h"
 
 static void __attribute__((__format__(__printf__, 2, 0)))
   scratch_printf (scratch_buffer_t *this, const char *format, va_list argp)
diff --git a/src/xine-engine/scratch.h b/src/xine-engine/scratch.h
index 2fd5e580b..d23d68503 100644
--- a/src/xine-engine/scratch.h
+++ b/src/xine-engine/scratch.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: scratch.h,v 1.10 2006/07/05 12:55:44 valtri Exp $
+ * $Id: scratch.h,v 1.11 2006/09/26 05:19:49 dgp85 Exp $
  *
  * scratch buffer for log output
  *
@@ -52,6 +52,6 @@ struct scratch_buffer_s {
 
 };
 
-scratch_buffer_t *_x_new_scratch_buffer (int num_lines);
+scratch_buffer_t *_x_new_scratch_buffer (int num_lines) XINE_PROTECTED;
 
 #endif
diff --git a/src/xine-engine/spu_decoder.h b/src/xine-engine/spu_decoder.h
index eaa2f8ec2..66ab5e54a 100644
--- a/src/xine-engine/spu_decoder.h
+++ b/src/xine-engine/spu_decoder.h
@@ -139,6 +139,6 @@ struct spu_decoder_s {
  *   int success = process_spu(spu);
  * } while (!success && thread_vacant);
  */
-int _x_spu_decoder_sleep(xine_stream_t *, int64_t next_spu_vpts);
+int _x_spu_decoder_sleep(xine_stream_t *, int64_t next_spu_vpts) XINE_PROTECTED;
 
 #endif /* HAVE_SPUDEC_H */
diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h
index 12d6b6f02..7b42c43ed 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.113 2005/09/24 19:08:26 miguelfreitas Exp $
+ * $Id: video_out.h,v 1.114 2006/09/26 05:19:49 dgp85 Exp $
  *
  *
  * xine version of video_out.h 
@@ -445,7 +445,7 @@ struct video_overlay_manager_s {
  * build a video_out_port from
  * a given video driver
  */
-xine_video_port_t *_x_vo_new_port (xine_t *xine, vo_driver_t *driver, int grabonly) ;
+xine_video_port_t *_x_vo_new_port (xine_t *xine, vo_driver_t *driver, int grabonly) XINE_PROTECTED;
 
 #ifdef __cplusplus
 }
diff --git a/src/xine-engine/video_overlay.h b/src/xine-engine/video_overlay.h
index 67562759f..1e7a2bcca 100644
--- a/src/xine-engine/video_overlay.h
+++ b/src/xine-engine/video_overlay.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_overlay.h,v 1.20 2005/09/24 19:08:26 miguelfreitas Exp $
+ * $Id: video_overlay.h,v 1.21 2006/09/26 05:19:49 dgp85 Exp $
  *
  */
 
@@ -101,6 +101,6 @@ typedef struct video_overlay_event_s {
   video_overlay_object_t   object; /* The image data. */
 } video_overlay_event_t;
 
-video_overlay_manager_t *_x_video_overlay_new_manager(xine_t *);
+video_overlay_manager_t *_x_video_overlay_new_manager(xine_t *) XINE_PROTECTED;
 
 #endif
diff --git a/src/xine-engine/vo_scale.h b/src/xine-engine/vo_scale.h
index a5fd8d9e4..917b6c99e 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.13 2004/09/22 20:29:18 miguelfreitas Exp $
+ * $Id: vo_scale.h,v 1.14 2006/09/26 05:19:49 dgp85 Exp $
  * 
  * vo_scale.h
  *
@@ -162,21 +162,21 @@ typedef struct vo_scale_s vo_scale_t;
  * taking into account aspect ratio and zoom factor
  */
 
-void _x_vo_scale_compute_ideal_size (vo_scale_t *self);
+void _x_vo_scale_compute_ideal_size (vo_scale_t *self) XINE_PROTECTED;
 
 
 /*
  * make ideal width/height "fit" into the gui
  */
 
-void _x_vo_scale_compute_output_size (vo_scale_t *self);
+void _x_vo_scale_compute_output_size (vo_scale_t *self) XINE_PROTECTED;
 
 /*
  * return true if a redraw is needed due resizing, zooming,
  * aspect ratio changing, etc.
  */
 
-int _x_vo_scale_redraw_needed (vo_scale_t *self);
+int _x_vo_scale_redraw_needed (vo_scale_t *self) XINE_PROTECTED;
 
 /*
  *
@@ -184,20 +184,20 @@ int _x_vo_scale_redraw_needed (vo_scale_t *self);
  
 void _x_vo_scale_translate_gui2video(vo_scale_t *self,
 				     int x, int y,
-				     int *vid_x, int *vid_y);
+				     int *vid_x, int *vid_y) XINE_PROTECTED;
 
 /*
  * Returns description of a given ratio code
  */
 
-char *_x_vo_scale_aspect_ratio_name(int a);
+char *_x_vo_scale_aspect_ratio_name(int a) XINE_PROTECTED;
 
 /* 
  * initialize rescaling struct
  */
  
 void _x_vo_scale_init(vo_scale_t *self, int support_zoom, 
-		      int scaling_disabled, config_values_t *config );
+		      int scaling_disabled, config_values_t *config ) XINE_PROTECTED;
 
 #ifdef __cplusplus
 }
diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h
index fc76527f0..a4414302e 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.176 2006/09/08 21:11:29 miguelfreitas Exp $
+ * $Id: xine_internal.h,v 1.177 2006/09/26 05:19:49 dgp85 Exp $
  *
  */
 
@@ -356,7 +356,7 @@ struct xine_stream_s {
  * private function prototypes:
  */
 
-void _x_handle_stream_end      (xine_stream_t *stream, int non_user);
+void _x_handle_stream_end      (xine_stream_t *stream, int non_user) XINE_PROTECTED;
 
 /* report message to UI. usually these are async errors */
 
@@ -368,34 +368,34 @@ __attribute__((sentinel))
 
 /* flush the message queues */
 
-void _x_flush_events_queues (xine_stream_t *stream);
+void _x_flush_events_queues (xine_stream_t *stream) XINE_PROTECTED;
 
 
 /* find and instantiate input and demux plugins */
 
-input_plugin_t *_x_find_input_plugin (xine_stream_t *stream, const char *mrl);
-demux_plugin_t *_x_find_demux_plugin (xine_stream_t *stream, input_plugin_t *input);
-demux_plugin_t *_x_find_demux_plugin_by_name (xine_stream_t *stream, const char *name, input_plugin_t *input);
-demux_plugin_t *_x_find_demux_plugin_last_probe(xine_stream_t *stream, const char *last_demux_name, input_plugin_t *input);
-input_plugin_t *_x_rip_plugin_get_instance (xine_stream_t *stream, const char *filename);
-input_plugin_t *_x_cache_plugin_get_instance (xine_stream_t *stream, int readahead_size);
-void _x_free_input_plugin (xine_stream_t *stream, input_plugin_t *input);
-void _x_free_demux_plugin (xine_stream_t *stream, demux_plugin_t *demux);
+input_plugin_t *_x_find_input_plugin (xine_stream_t *stream, const char *mrl) XINE_PROTECTED;
+demux_plugin_t *_x_find_demux_plugin (xine_stream_t *stream, input_plugin_t *input) XINE_PROTECTED;
+demux_plugin_t *_x_find_demux_plugin_by_name (xine_stream_t *stream, const char *name, input_plugin_t *input) XINE_PROTECTED;
+demux_plugin_t *_x_find_demux_plugin_last_probe(xine_stream_t *stream, const char *last_demux_name, input_plugin_t *input) XINE_PROTECTED;
+input_plugin_t *_x_rip_plugin_get_instance (xine_stream_t *stream, const char *filename) XINE_PROTECTED;
+input_plugin_t *_x_cache_plugin_get_instance (xine_stream_t *stream, int readahead_size) XINE_PROTECTED;
+void _x_free_input_plugin (xine_stream_t *stream, input_plugin_t *input) XINE_PROTECTED;
+void _x_free_demux_plugin (xine_stream_t *stream, demux_plugin_t *demux) XINE_PROTECTED;
 
 /* create decoder fifos and threads */
 
-int _x_video_decoder_init           (xine_stream_t *stream);
-void _x_video_decoder_shutdown      (xine_stream_t *stream);
+int _x_video_decoder_init           (xine_stream_t *stream) XINE_PROTECTED;
+void _x_video_decoder_shutdown      (xine_stream_t *stream) XINE_PROTECTED;
 
-int _x_audio_decoder_init           (xine_stream_t *stream);
-void _x_audio_decoder_shutdown      (xine_stream_t *stream);
+int _x_audio_decoder_init           (xine_stream_t *stream) XINE_PROTECTED;
+void _x_audio_decoder_shutdown      (xine_stream_t *stream) XINE_PROTECTED;
 
 /* extra_info operations */
-void _x_extra_info_reset( extra_info_t *extra_info );
+void _x_extra_info_reset( extra_info_t *extra_info ) XINE_PROTECTED;
 
-void _x_extra_info_merge( extra_info_t *dst, extra_info_t *src );
+void _x_extra_info_merge( extra_info_t *dst, extra_info_t *src ) XINE_PROTECTED;
 
-void _x_get_current_info (xine_stream_t *stream, extra_info_t *extra_info, int size);
+void _x_get_current_info (xine_stream_t *stream, extra_info_t *extra_info, int size) XINE_PROTECTED;
                         
                         
 /* demuxer helper functions from demux.c */
@@ -409,36 +409,36 @@ void _x_get_current_info (xine_stream_t *stream, extra_info_t *extra_info, int s
  *          indication must be sent. relative discontinuities are likely
  *          to cause "jumps" on metronom.
  */
-void _x_demux_flush_engine         (xine_stream_t *stream);
+void _x_demux_flush_engine         (xine_stream_t *stream) XINE_PROTECTED;
 
-void _x_demux_control_nop          (xine_stream_t *stream, uint32_t flags);
-void _x_demux_control_newpts       (xine_stream_t *stream, int64_t pts, uint32_t flags);
-void _x_demux_control_headers_done (xine_stream_t *stream);
-void _x_demux_control_start        (xine_stream_t *stream);
-void _x_demux_control_end          (xine_stream_t *stream, uint32_t flags);
-int _x_demux_start_thread          (xine_stream_t *stream);
-int _x_demux_stop_thread           (xine_stream_t *stream);
-int _x_demux_read_header           (input_plugin_t *input, unsigned char *buffer, off_t size);
-int _x_demux_check_extension       (char *mrl, char *extensions);
+void _x_demux_control_nop          (xine_stream_t *stream, uint32_t flags) XINE_PROTECTED;
+void _x_demux_control_newpts       (xine_stream_t *stream, int64_t pts, uint32_t flags) XINE_PROTECTED;
+void _x_demux_control_headers_done (xine_stream_t *stream) XINE_PROTECTED;
+void _x_demux_control_start        (xine_stream_t *stream) XINE_PROTECTED;
+void _x_demux_control_end          (xine_stream_t *stream, uint32_t flags) XINE_PROTECTED;
+int _x_demux_start_thread          (xine_stream_t *stream) XINE_PROTECTED;
+int _x_demux_stop_thread           (xine_stream_t *stream) XINE_PROTECTED;
+int _x_demux_read_header           (input_plugin_t *input, unsigned char *buffer, off_t size) XINE_PROTECTED;
+int _x_demux_check_extension       (char *mrl, char *extensions) XINE_PROTECTED;
 
-off_t _x_read_abort (xine_stream_t *stream, int fd, char *buf, off_t todo);
+off_t _x_read_abort (xine_stream_t *stream, int fd, char *buf, off_t todo) XINE_PROTECTED;
 
-int _x_action_pending (xine_stream_t *stream);
+int _x_action_pending (xine_stream_t *stream) XINE_PROTECTED;
 
 void _x_demux_send_data(fifo_buffer_t *fifo, uint8_t *data, int size,
                         int64_t pts, uint32_t type, uint32_t decoder_flags,
                         int input_normpos, int input_time, int total_time,
-                        uint32_t frame_number);
+                        uint32_t frame_number) XINE_PROTECTED;
 
 int _x_demux_read_send_data(fifo_buffer_t *fifo, input_plugin_t *input, 
                             int size, int64_t pts, uint32_t type, 
                             uint32_t decoder_flags, off_t input_normpos, 
                             int input_time, int total_time,
-                            uint32_t frame_number);
+                            uint32_t frame_number) XINE_PROTECTED;
 
 void _x_demux_send_mrl_reference (xine_stream_t *stream, int alternative,
 				  const char *mrl, const char *title,
-				  int start_time, int duration);
+				  int start_time, int duration) XINE_PROTECTED;
 
 
 /* 
@@ -448,14 +448,14 @@ void _x_demux_send_mrl_reference (xine_stream_t *stream, int alternative,
 
 /* on-demand loading of audio/video/spu decoder plugins */
 
-video_decoder_t *_x_get_video_decoder  (xine_stream_t *stream, uint8_t stream_type); 
-void             _x_free_video_decoder (xine_stream_t *stream, video_decoder_t *decoder);
-audio_decoder_t *_x_get_audio_decoder  (xine_stream_t *stream, uint8_t stream_type); 
-void             _x_free_audio_decoder (xine_stream_t *stream, audio_decoder_t *decoder);
-spu_decoder_t   *_x_get_spu_decoder    (xine_stream_t *stream, uint8_t stream_type); 
-void             _x_free_spu_decoder   (xine_stream_t *stream, spu_decoder_t *decoder);
+video_decoder_t *_x_get_video_decoder  (xine_stream_t *stream, uint8_t stream_type) XINE_PROTECTED;
+void             _x_free_video_decoder (xine_stream_t *stream, video_decoder_t *decoder) XINE_PROTECTED;
+audio_decoder_t *_x_get_audio_decoder  (xine_stream_t *stream, uint8_t stream_type) XINE_PROTECTED;
+void             _x_free_audio_decoder (xine_stream_t *stream, audio_decoder_t *decoder) XINE_PROTECTED;
+spu_decoder_t   *_x_get_spu_decoder    (xine_stream_t *stream, uint8_t stream_type) XINE_PROTECTED;
+void             _x_free_spu_decoder   (xine_stream_t *stream, spu_decoder_t *decoder) XINE_PROTECTED;
 /* check for decoder availability - but don't try to initialize it */
-int              _x_decoder_available  (xine_t *xine, uint32_t buftype);
+int              _x_decoder_available  (xine_t *xine, uint32_t buftype) XINE_PROTECTED;
 
 /*
  * load_video_output_plugin
@@ -464,7 +464,7 @@ int              _x_decoder_available  (xine_t *xine, uint32_t buftype);
  */
 
 vo_driver_t *_x_load_video_output_plugin(xine_t *this,
-					 char *id, int visual_type, void *visual);
+					 char *id, int visual_type, void *visual) XINE_PROTECTED;
 
 /*
  * audio output plugin dynamic loading stuff
@@ -476,22 +476,22 @@ vo_driver_t *_x_load_video_output_plugin(xine_t *this,
  * load a specific audio output plugin
  */
 
-ao_driver_t *_x_load_audio_output_plugin (xine_t *self, char *id);
+ao_driver_t *_x_load_audio_output_plugin (xine_t *self, char *id) XINE_PROTECTED;
 
 
-void _x_set_speed (xine_stream_t *stream, int speed) ;
+void _x_set_speed (xine_stream_t *stream, int speed) XINE_PROTECTED;
 
-int _x_get_speed (xine_stream_t *stream) ;
+int _x_get_speed (xine_stream_t *stream) XINE_PROTECTED;
 
-void _x_set_fine_speed (xine_stream_t *stream, int speed) ;
+void _x_set_fine_speed (xine_stream_t *stream, int speed) XINE_PROTECTED;
 
-int _x_get_fine_speed (xine_stream_t *stream) ;
+int _x_get_fine_speed (xine_stream_t *stream) XINE_PROTECTED;
 
-void _x_select_spu_channel (xine_stream_t *stream, int channel) ;
+void _x_select_spu_channel (xine_stream_t *stream, int channel) XINE_PROTECTED;
 
-int _x_get_audio_channel (xine_stream_t *stream) ;
+int _x_get_audio_channel (xine_stream_t *stream) XINE_PROTECTED;
 
-int _x_get_spu_channel (xine_stream_t *stream) ;
+int _x_get_spu_channel (xine_stream_t *stream) XINE_PROTECTED;
 
 /*
  * internal events
diff --git a/src/xine-engine/xine_plugin.h b/src/xine-engine/xine_plugin.h
index df914a3f1..f55c5be63 100644
--- a/src/xine-engine/xine_plugin.h
+++ b/src/xine-engine/xine_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: xine_plugin.h,v 1.20 2006/06/15 14:14:09 dgp85 Exp $
+ * $Id: xine_plugin.h,v 1.21 2006/09/26 05:19:49 dgp85 Exp $
  *
  * generic plugin definitions
  *
@@ -103,6 +103,6 @@ typedef struct {
  *   };
  *
  */
-void xine_register_plugins(xine_t *self, plugin_info_t *info);
+void xine_register_plugins(xine_t *self, plugin_info_t *info) XINE_PROTECTED;
 
 #endif