diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-09-26 05:19:47 +0000 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-09-26 05:19:47 +0000 |
| commit | 1b23ad7e208929b8b99e37de64282f74070f37b6 (patch) | |
| tree | 3b36d1df9b2f7357d2f541435bb4855ce9860ee5 | |
| parent | 8e0cafbd9c5afcbb083d891bb138313aac76b04a (diff) | |
| download | xine-lib-1b23ad7e208929b8b99e37de64282f74070f37b6.tar.gz xine-lib-1b23ad7e208929b8b99e37de64282f74070f37b6.tar.bz2 | |
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
38 files changed, 387 insertions, 369 deletions
diff --git a/include/xine.h.in b/include/xine.h.in index 5e39461d6..8b31d0ad1 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.156 2006/09/11 17:11:38 valtri Exp $ + * $Id: xine.h.in,v 1.157 2006/09/26 05:19:47 dgp85 Exp $ * * public xine-lib (libxine) interface and documentation * @@ -59,11 +59,11 @@ extern "C" { #ifdef XINE_COMPILE #include <inttypes.h> +#include "attributes.h" #else #include <xine/os_types.h> #endif - /* This enables some experimental features. These are not part of the * official libxine API, so use them only, if you absolutely need them. * Although we make efforts to keep even this part of the API as stable @@ -104,12 +104,12 @@ typedef xine_video_port_t xine_vo_driver_t; */ /* dynamic info from actually linked libxine */ -const char *xine_get_version_string (void); -void xine_get_version (int *major, int *minor, int *sub); +const char *xine_get_version_string (void) XINE_PROTECTED; +void xine_get_version (int *major, int *minor, int *sub) XINE_PROTECTED; /* compare given version to libxine version, return 1 if compatible, 0 otherwise */ -int xine_check_version (int major, int minor, int sub) ; +int xine_check_version (int major, int minor, int sub) XINE_PROTECTED; /* static info - which libxine release this header came from */ #define XINE_MAJOR_VERSION @XINE_MAJOR@ @@ -133,12 +133,12 @@ int xine_check_version (int major, int minor, int sub) ; * call xine_exit() - do not try to free() the xine pointer * yourself and do not try to access any internal data structures */ -xine_t *xine_new (void); +xine_t *xine_new (void) XINE_PROTECTED; /* * post_init the xine engine */ -void xine_init (xine_t *self); +void xine_init (xine_t *self) XINE_PROTECTED; /* * helper functions to find and init audio/video drivers @@ -156,12 +156,12 @@ void xine_init (xine_t *self); * and free resources allocated by them */ xine_audio_port_t *xine_open_audio_driver (xine_t *self, const char *id, - void *data); + void *data) XINE_PROTECTED; xine_video_port_t *xine_open_video_driver (xine_t *self, const char *id, - int visual, void *data); + int visual, void *data) XINE_PROTECTED; -void xine_close_audio_driver (xine_t *self, xine_audio_port_t *driver); -void xine_close_video_driver (xine_t *self, xine_video_port_t *driver); +void xine_close_audio_driver (xine_t *self, xine_audio_port_t *driver) XINE_PROTECTED; +void xine_close_video_driver (xine_t *self, xine_video_port_t *driver) XINE_PROTECTED; /* valid visual types */ #define XINE_VISUAL_TYPE_NONE 0 @@ -179,7 +179,7 @@ void xine_close_video_driver (xine_t *self, xine_video_port_t *driver); * free all resources, close all plugins, close engine. * self pointer is no longer valid after this call. */ -void xine_exit (xine_t *self); +void xine_exit (xine_t *self) XINE_PROTECTED; /********************************************************************* @@ -198,7 +198,7 @@ void xine_exit (xine_t *self); * without further notice. */ xine_stream_t *xine_stream_new (xine_t *self, - xine_audio_port_t *ao, xine_video_port_t *vo); + xine_audio_port_t *ao, xine_video_port_t *vo) XINE_PROTECTED; /* * Make one stream the slave of another. @@ -219,7 +219,7 @@ xine_stream_t *xine_stream_new (xine_t *self, * returns 1 on success, 0 on failure */ int xine_stream_master_slave(xine_stream_t *master, xine_stream_t *slave, - int affection); + int affection) XINE_PROTECTED; /* affection is some of the following ORed together: */ /* playing the master plays the slave */ @@ -237,7 +237,7 @@ int xine_stream_master_slave(xine_stream_t *master, xine_stream_t *slave, * * returns 1 if OK, 0 on error (use xine_get_error for details) */ -int xine_open (xine_stream_t *stream, const char *mrl); +int xine_open (xine_stream_t *stream, const char *mrl) XINE_PROTECTED; /* * play a stream from a given position @@ -249,7 +249,7 @@ int xine_open (xine_stream_t *stream, const char *mrl); * * returns 1 if OK, 0 on error (use xine_get_error for details) */ -int xine_play (xine_stream_t *stream, int start_pos, int start_time); +int xine_play (xine_stream_t *stream, int start_pos, int start_time) XINE_PROTECTED; /* * set xine to a trick mode for fast forward, backwards playback, @@ -258,7 +258,7 @@ int xine_play (xine_stream_t *stream, int start_pos, int start_time); * * returns 1 if OK, 0 on error (use xine_get_error for details) */ -int xine_trick_mode (xine_stream_t *stream, int mode, int value); +int xine_trick_mode (xine_stream_t *stream, int mode, int value) XINE_PROTECTED; /* trick modes */ #define XINE_TRICK_MODE_OFF 0 @@ -271,31 +271,31 @@ int xine_trick_mode (xine_stream_t *stream, int mode, int value); * stop stream playback * xine_stream_t stays valid for new xine_open or xine_play */ -void xine_stop (xine_stream_t *stream); +void xine_stop (xine_stream_t *stream) XINE_PROTECTED; /* * stop stream playback, free all stream-related resources * xine_stream_t stays valid for new xine_open */ -void xine_close (xine_stream_t *stream); +void xine_close (xine_stream_t *stream) XINE_PROTECTED; /* * ask current/recent input plugin to eject media - may or may not work, * depending on input plugin capabilities */ -int xine_eject (xine_stream_t *stream); +int xine_eject (xine_stream_t *stream) XINE_PROTECTED; /* * stop playback, dispose all stream-related resources * xine_stream_t no longer valid when after this */ -void xine_dispose (xine_stream_t *stream); +void xine_dispose (xine_stream_t *stream) XINE_PROTECTED; /* * set/get engine parameters. */ -void xine_engine_set_param(xine_t *self, int param, int value); -int xine_engine_get_param(xine_t *self, int param); +void xine_engine_set_param(xine_t *self, int param, int value) XINE_PROTECTED; +int xine_engine_get_param(xine_t *self, int param) XINE_PROTECTED; #define XINE_ENGINE_PARAM_VERBOSITY 1 @@ -303,8 +303,8 @@ int xine_engine_get_param(xine_t *self, int param); * set/get xine stream parameters * e.g. playback speed, constants see below */ -void xine_set_param (xine_stream_t *stream, int param, int value); -int xine_get_param (xine_stream_t *stream, int param); +void xine_set_param (xine_stream_t *stream, int param, int value) XINE_PROTECTED; +int xine_get_param (xine_stream_t *stream, int param) XINE_PROTECTED; /* * xine stream parameters @@ -423,7 +423,7 @@ int xine_get_param (xine_stream_t *stream, int param); int xine_get_current_frame (xine_stream_t *stream, int *width, int *height, int *ratio_code, int *format, - uint8_t *img); + uint8_t *img) XINE_PROTECTED; /* xine image formats */ #define XINE_IMGFMT_YV12 (('2'<<24)|('1'<<16)|('V'<<8)|'Y') @@ -435,7 +435,7 @@ int xine_get_current_frame (xine_stream_t *stream, * note: this is mostly internal data. * one can use vpts with xine_osd_show() and xine_osd_hide(). */ -int64_t xine_get_current_vpts(xine_stream_t *stream); +int64_t xine_get_current_vpts(xine_stream_t *stream) XINE_PROTECTED; /********************************************************************* @@ -457,7 +457,7 @@ int64_t xine_get_current_vpts(xine_stream_t *stream); * */ -xine_video_port_t *xine_new_framegrab_video_port (xine_t *self); +xine_video_port_t *xine_new_framegrab_video_port (xine_t *self) XINE_PROTECTED; typedef struct { @@ -477,11 +477,11 @@ typedef struct { } xine_video_frame_t; int xine_get_next_video_frame (xine_video_port_t *port, - xine_video_frame_t *frame); + xine_video_frame_t *frame) XINE_PROTECTED; -void xine_free_video_frame (xine_video_port_t *port, xine_video_frame_t *frame); +void xine_free_video_frame (xine_video_port_t *port, xine_video_frame_t *frame) XINE_PROTECTED; -xine_audio_port_t *xine_new_framegrab_audio_port (xine_t *self); +xine_audio_port_t *xine_new_framegrab_audio_port (xine_t *self) XINE_PROTECTED; typedef struct { @@ -499,9 +499,9 @@ typedef struct { } xine_audio_frame_t; int xine_get_next_audio_frame (xine_audio_port_t *port, - xine_audio_frame_t *frame); + xine_audio_frame_t *frame) XINE_PROTECTED; -void xine_free_audio_frame (xine_audio_port_t *port, xine_audio_frame_t *frame); +void xine_free_audio_frame (xine_audio_port_t *port, xine_audio_frame_t *frame) XINE_PROTECTED; /* * maybe future aproach: @@ -513,7 +513,7 @@ int xine_get_video_frame (xine_stream_t *stream, int *ratio_code, int *duration, /* msec */ int *format, - uint8_t *img); + uint8_t *img) XINE_PROTECTED; /* TODO: xine_get_audio_frame */ @@ -568,13 +568,13 @@ struct xine_post_s { xine_post_t *xine_post_init(xine_t *xine, const char *name, int inputs, xine_audio_port_t **audio_target, - xine_video_port_t **video_target); + xine_video_port_t **video_target) XINE_PROTECTED; /* get a list of all available post plugins */ -const char *const *xine_list_post_plugins(xine_t *xine); +const char *const *xine_list_post_plugins(xine_t *xine) XINE_PROTECTED; /* get a list of all post plugins of one type */ -const char *const *xine_list_post_plugins_typed(xine_t *xine, int type); +const char *const *xine_list_post_plugins_typed(xine_t *xine, int type) XINE_PROTECTED; /* * post plugin input/output @@ -628,22 +628,22 @@ struct xine_post_out_s { }; /* get a list of all inputs of a post plugin */ -const char *const *xine_post_list_inputs(xine_post_t *self); +const char *const *xine_post_list_inputs(xine_post_t *self) XINE_PROTECTED; /* get a list of all outputs of a post plugin */ -const char *const *xine_post_list_outputs(xine_post_t *self); +const char *const *xine_post_list_outputs(xine_post_t *self) XINE_PROTECTED; /* retrieve one specific input of a post plugin */ -xine_post_in_t *xine_post_input(xine_post_t *self, const char *name); +xine_post_in_t *xine_post_input(xine_post_t *self, const char *name) XINE_PROTECTED; /* retrieve one specific output of a post plugin */ -xine_post_out_t *xine_post_output(xine_post_t *self, const char *name); +xine_post_out_t *xine_post_output(xine_post_t *self, const char *name) XINE_PROTECTED; /* * wire an input to an output * returns 1 on success, 0 on failure */ -int xine_post_wire(xine_post_out_t *source, xine_post_in_t *target); +int xine_post_wire(xine_post_out_t *source, xine_post_in_t *target) XINE_PROTECTED; /* * wire a video port to a video output @@ -654,7 +654,7 @@ int xine_post_wire(xine_post_out_t *source, xine_post_in_t *target); * * returns 1 on success, 0 on failure */ -int xine_post_wire_video_port(xine_post_out_t *source, xine_video_port_t *vo); +int xine_post_wire_video_port(xine_post_out_t *source, xine_video_port_t *vo) XINE_PROTECTED; /* * wire an audio port to an audio output @@ -665,20 +665,20 @@ int xine_post_wire_video_port(xine_post_out_t *source, xine_video_port_t *vo); * * returns 1 on success, 0 on failure */ -int xine_post_wire_audio_port(xine_post_out_t *source, xine_audio_port_t *ao); +int xine_post_wire_audio_port(xine_post_out_t *source, xine_audio_port_t *ao) XINE_PROTECTED; /* * Extracts an output for a stream. Use this to rewire the outputs of streams. */ -xine_post_out_t * xine_get_video_source(xine_stream_t *stream); -xine_post_out_t * xine_get_audio_source(xine_stream_t *stream); +xine_post_out_t * xine_get_video_source(xine_stream_t *stream) XINE_PROTECTED; +xine_post_out_t * xine_get_audio_source(xine_stream_t *stream) XINE_PROTECTED; /* * disposes the post plugin * please make sure that no other post plugin and no stream is * connected to any of this plugin's inputs */ -void xine_post_dispose(xine_t *xine, xine_post_t *self); +void xine_post_dispose(xine_t *xine, xine_post_t *self) XINE_PROTECTED; /* post plugin types */ @@ -783,41 +783,41 @@ typedef struct { * * frontends can display xine log output using these functions */ -int xine_get_log_section_count(xine_t *self); +int xine_get_log_section_count(xine_t *self) XINE_PROTECTED; /* return a NULL terminated array of log sections names */ -const char *const *xine_get_log_names(xine_t *self); +const char *const *xine_get_log_names(xine_t *self) XINE_PROTECTED; /* print some log information to <buf> section */ #ifndef __GNUC__ void xine_log (xine_t *self, int buf, - const char *format, ...); + const char *format, ...) XINE_PROTECTED; void xine_vlog(xine_t *self, int buf, - const char *format, va_list args); + const char *format, va_list args) XINE_PROTECTED; #else void xine_log (xine_t *self, int buf, - const char *format, ...) __attribute__ ((__format__(printf, 3, 4))); + const char *format, ...) __attribute__ ((__format__(printf, 3, 4))) XINE_PROTECTED; void xine_vlog(xine_t *self, int buf, - const char *format, va_list args) __attribute__ ((__format__(printf, 3, 0))); + const char *format, va_list args) __attribute__ ((__format__(printf, 3, 0))) XINE_PROTECTED; #endif /* get log messages of specified section */ -const char *const *xine_get_log (xine_t *self, int buf); +const char *const *xine_get_log (xine_t *self, int buf) XINE_PROTECTED; /* log callback will be called whenever something is logged */ typedef void (*xine_log_cb_t) (void *user_data, int section); void xine_register_log_cb (xine_t *self, xine_log_cb_t cb, - void *user_data); + void *user_data) XINE_PROTECTED; /* * error handling / engine status */ /* return last error */ -int xine_get_error (xine_stream_t *stream); +int xine_get_error (xine_stream_t *stream) XINE_PROTECTED; /* get current xine engine status (constants see below) */ -int xine_get_status (xine_stream_t *stream); +int xine_get_status (xine_stream_t *stream) XINE_PROTECTED; /* * engine status codes @@ -844,9 +844,9 @@ int xine_get_status (xine_stream_t *stream); * returns 1 on success, 0 on failure */ int xine_get_audio_lang (xine_stream_t *stream, int channel, - char *lang); + char *lang) XINE_PROTECTED; int xine_get_spu_lang (xine_stream_t *stream, int channel, - char *lang); + char *lang) XINE_PROTECTED; /*_x_ increasing this number means an incompatible ABI breakage! */ #define XINE_LANG_MAX 32 @@ -863,7 +863,8 @@ int xine_get_spu_lang (xine_stream_t *stream, int channel, int xine_get_pos_length (xine_stream_t *stream, int *pos_stream, /* 0..65535 */ int *pos_time, /* milliseconds */ - int *length_time);/* milliseconds */ + int *length_time) /* milliseconds */ + XINE_PROTECTED; /* * get information about the stream such as @@ -872,8 +873,8 @@ int xine_get_pos_length (xine_stream_t *stream, * * constants see below */ -uint32_t xine_get_stream_info (xine_stream_t *stream, int info); -const char *xine_get_meta_info (xine_stream_t *stream, int info); +uint32_t xine_get_stream_info (xine_stream_t *stream, int info) XINE_PROTECTED; +const char *xine_get_meta_info (xine_stream_t *stream, int info) XINE_PROTECTED; /* xine_get_stream_info */ #define XINE_STREAM_INFO_BITRATE 0 @@ -988,7 +989,7 @@ typedef struct { #define XINE_MRL_TYPE_file_hidden (1 << 16) /* get a list of browsable input plugin ids */ -const char *const *xine_get_browsable_input_plugin_ids (xine_t *self) ; +const char *const *xine_get_browsable_input_plugin_ids (xine_t *self) XINE_PROTECTED; /* * ask input plugin named <plugin_id> to return @@ -1001,70 +1002,70 @@ const char *const *xine_get_browsable_input_plugin_ids (xine_t *self) ; xine_mrl_t **xine_get_browse_mrls (xine_t *self, const char *plugin_id, const char *start_mrl, - int *num_mrls); + int *num_mrls) XINE_PROTECTED; /* get a list of plugins that support the autoplay feature */ -const char *const *xine_get_autoplay_input_plugin_ids (xine_t *self); +const char *const *xine_get_autoplay_input_plugin_ids (xine_t *self) XINE_PROTECTED; /* get autoplay MRL list from input plugin named <plugin_id> */ char **xine_get_autoplay_mrls (xine_t *self, const char *plugin_id, - int *num_mrls); + int *num_mrls) XINE_PROTECTED; /* get a list of file extensions for file types supported by xine * the list is separated by spaces * * the pointer returned can be free()ed when no longer used */ -char *xine_get_file_extensions (xine_t *self); +char *xine_get_file_extensions (xine_t *self) XINE_PROTECTED; /* get a list of mime types supported by xine * * the pointer returned can be free()ed when no longer used */ -char *xine_get_mime_types (xine_t *self); +char *xine_get_mime_types (xine_t *self) XINE_PROTECTED; /* get the demuxer identifier that handles a given mime type * * the pointer returned can be free()ed when no longer used * returns NULL if no demuxer is available to handle this. */ -char *xine_get_demux_for_mime_type (xine_t *self, const char *mime_type); +char *xine_get_demux_for_mime_type (xine_t *self, const char *mime_type) XINE_PROTECTED; /* get a description string for a plugin */ const char *xine_get_input_plugin_description (xine_t *self, - const char *plugin_id); + const char *plugin_id) XINE_PROTECTED; const char *xine_get_demux_plugin_description (xine_t *self, - const char *plugin_id); + const char *plugin_id) XINE_PROTECTED; const char *xine_get_spu_plugin_description (xine_t *self, - const char *plugin_id); + const char *plugin_id) XINE_PROTECTED; const char *xine_get_audio_plugin_description (xine_t *self, - const char *plugin_id); + const char *plugin_id) XINE_PROTECTED; const char *xine_get_video_plugin_description (xine_t *self, - const char *plugin_id); + const char *plugin_id) XINE_PROTECTED; const char *xine_get_audio_driver_plugin_description (xine_t *self, - const char *plugin_id); + const char *plugin_id) XINE_PROTECTED; const char *xine_get_video_driver_plugin_description (xine_t *self, - const char *plugin_id); + const char *plugin_id) XINE_PROTECTED; const char *xine_get_post_plugin_description (xine_t *self, - const char *plugin_id); + const char *plugin_id) XINE_PROTECTED; /* get lists of available audio and video output plugins */ -const char *const *xine_list_audio_output_plugins (xine_t *self) ; -const char *const *xine_list_video_output_plugins (xine_t *self) ; +const char *const *xine_list_audio_output_plugins (xine_t *self) XINE_PROTECTED; +const char *const *xine_list_video_output_plugins (xine_t *self) XINE_PROTECTED; /* get list of available demultiplexor plugins */ -const char *const *xine_list_demuxer_plugins(xine_t *self); +const char *const *xine_list_demuxer_plugins(xine_t *self) XINE_PROTECTED; /* get list of available input plugins */ -const char *const *xine_list_input_plugins(xine_t *self); +const char *const *xine_list_input_plugins(xine_t *self) XINE_PROTECTED; /* get list of available subpicture plugins */ -const char *const *xine_list_spu_plugins(xine_t *self); +const char *const *xine_list_spu_plugins(xine_t *self) XINE_PROTECTED; /* get list of available audio and video decoder plugins */ -const char *const *xine_list_audio_decoder_plugins(xine_t *self); -const char *const *xine_list_video_decoder_plugins(xine_t *self); +const char *const *xine_list_audio_decoder_plugins(xine_t *self) XINE_PROTECTED; +const char *const *xine_list_video_decoder_plugins(xine_t *self) XINE_PROTECTED; /* unload unused plugins */ -void xine_plugins_garbage_collector(xine_t *self); +void xine_plugins_garbage_collector(xine_t *self) XINE_PROTECTED; /********************************************************************* @@ -1074,12 +1075,12 @@ void xine_plugins_garbage_collector(xine_t *self); #ifndef XINE_DISABLE_DEPRECATED_FEATURES /* talk to video output driver - old method */ int xine_gui_send_vo_data (xine_stream_t *self, - int type, void *data); + int type, void *data) XINE_PROTECTED; #endif /* new (preferred) method to talk to video driver. */ int xine_port_send_gui_data (xine_video_port_t *vo, - int type, void *data); + int type, void *data) XINE_PROTECTED; typedef struct { @@ -1268,7 +1269,7 @@ struct xine_health_check_s { }; typedef struct xine_health_check_s xine_health_check_t; -xine_health_check_t* xine_health_check(xine_health_check_t*, int check_num); +xine_health_check_t* xine_health_check(xine_health_check_t*, int check_num) XINE_PROTECTED; /********************************************************************* @@ -1348,7 +1349,7 @@ const char *xine_config_register_string (xine_t *self, const char *help, int exp_level, xine_config_cb_t changed_cb, - void *cb_data); + void *cb_data) XINE_PROTECTED; int xine_config_register_range (xine_t *self, const char *key, @@ -1358,7 +1359,7 @@ int xine_config_register_range (xine_t *self, const char *help, int exp_level, xine_config_cb_t changed_cb, - void *cb_data); + void *cb_data) XINE_PROTECTED; int xine_config_register_enum (xine_t *self, const char *key, @@ -1368,7 +1369,7 @@ int xine_config_register_enum (xine_t *self, const char *help, int exp_level, xine_config_cb_t changed_cb, - void *cb_data); + void *cb_data) XINE_PROTECTED; int xine_config_register_num (xine_t *self, const char *key, @@ -1377,7 +1378,7 @@ int xine_config_register_num (xine_t *self, const char *help, int exp_level, xine_config_cb_t changed_cb, - void *cb_data); + void *cb_data) XINE_PROTECTED; int xine_config_register_bool (xine_t *self, const char *key, @@ -1386,7 +1387,7 @@ int xine_config_register_bool (xine_t *self, const char *help, int exp_level, xine_config_cb_t changed_cb, - void *cb_data); + void *cb_data) XINE_PROTECTED; /* * the following functions will copy data from the internal xine_config @@ -1396,14 +1397,14 @@ int xine_config_register_bool (xine_t *self, */ /* get first config item */ -int xine_config_get_first_entry (xine_t *self, xine_cfg_entry_t *entry); +int xine_config_get_first_entry (xine_t *self, xine_cfg_entry_t *entry) XINE_PROTECTED; /* get next config item (iterate through the items) */ -int xine_config_get_next_entry (xine_t *self, xine_cfg_entry_t *entry); +int xine_config_get_next_entry (xine_t *self, xine_cfg_entry_t *entry) XINE_PROTECTED; /* search for a config entry by key */ int xine_config_lookup_entry (xine_t *self, const char *key, - xine_cfg_entry_t *entry); + xine_cfg_entry_t *entry) XINE_PROTECTED; /* * update a config entry (which was returned from lookup_entry() ) @@ -1412,14 +1413,14 @@ int xine_config_lookup_entry (xine_t *self, const char *key, * config database. */ void xine_config_update_entry (xine_t *self, - const xine_cfg_entry_t *entry); + const xine_cfg_entry_t *entry) XINE_PROTECTED; /* * load/save config data from/to afile (e.g. $HOME/.xine/config) */ -void xine_config_load (xine_t *self, const char *cfg_filename); -void xine_config_save (xine_t *self, const char *cfg_filename); -void xine_config_reset (xine_t *self); +void xine_config_load (xine_t *self, const char *cfg_filename) XINE_PROTECTED; +void xine_config_save (xine_t *self, const char *cfg_filename) XINE_PROTECTED; +void xine_config_reset (xine_t *self) XINE_PROTECTED; /********************************************************************* @@ -1822,8 +1823,8 @@ typedef struct xine_event_queue_s xine_event_queue_t; * * use xine_event_dispose_queue to unregister and free the queue */ -xine_event_queue_t *xine_event_new_queue (xine_stream_t *stream); -void xine_event_dispose_queue (xine_event_queue_t *queue); +xine_event_queue_t *xine_event_new_queue (xine_stream_t *stream) XINE_PROTECTED; +void xine_event_dispose_queue (xine_event_queue_t *queue) XINE_PROTECTED; /* * receive events (poll) @@ -1831,9 +1832,9 @@ void xine_event_dispose_queue (xine_event_queue_t *queue); * use xine_event_free on the events received from these calls * when they're no longer needed */ -xine_event_t *xine_event_get (xine_event_queue_t *queue); -xine_event_t *xine_event_wait (xine_event_queue_t *queue); -void xine_event_free (xine_event_t *event); +xine_event_t *xine_event_get (xine_event_queue_t *queue) XINE_PROTECTED; +xine_event_t *xine_event_wait (xine_event_queue_t *queue) XINE_PROTECTED; +void xine_event_free (xine_event_t *event) XINE_PROTECTED; /* * receive events (callback) @@ -1847,7 +1848,7 @@ typedef void (*xine_event_listener_cb_t) (void *user_data, const xine_event_t *event); void xine_event_create_listener_thread (xine_event_queue_t *queue, xine_event_listener_cb_t callback, - void *user_data); + void *user_data) XINE_PROTECTED; /* * send an event to all queues @@ -1855,7 +1856,7 @@ void xine_event_create_listener_thread (xine_event_queue_t *queue, * the event will be copied so you can free or reuse * *event as soon as xine_event_send returns. */ -void xine_event_send (xine_stream_t *stream, const xine_event_t *event); +void xine_event_send (xine_stream_t *stream, const xine_event_t *event) XINE_PROTECTED; /********************************************************************* @@ -1890,42 +1891,42 @@ void xine_event_send (xine_stream_t *stream, const xine_event_t *event); typedef struct xine_osd_s xine_osd_t; xine_osd_t *xine_osd_new (xine_stream_t *self, int x, int y, - int width, int height); -uint32_t xine_osd_get_capabilities (xine_osd_t *self); -void xine_osd_draw_point (xine_osd_t *self, int x, int y, int color); + int width, int height) XINE_PROTECTED; +uint32_t xine_osd_get_capabilities (xine_osd_t *self) XINE_PROTECTED; +void xine_osd_draw_point (xine_osd_t *self, int x, int y, int color) XINE_PROTECTED; void xine_osd_draw_line (xine_osd_t *self, int x1, int y1, - int x2, int y2, int color); + int x2, int y2, int color) XINE_PROTECTED; void xine_osd_draw_rect (xine_osd_t *self, int x1, int y1, int x2, int y2, - int color, int filled ); + int color, int filled ) XINE_PROTECTED; /* x1 and y1 specifies the upper left corner of the text to be rendered */ void xine_osd_draw_text (xine_osd_t *self, int x1, int y1, - const char *text, int color_base); + const char *text, int color_base) XINE_PROTECTED; void xine_osd_draw_bitmap (xine_osd_t *self, uint8_t *bitmap, int x1, int y1, int width, int height, - uint8_t *palette_map); + uint8_t *palette_map) XINE_PROTECTED; /* for freetype2 fonts the height is the maximum height for the whole font and not * only for the specified text */ void xine_osd_get_text_size (xine_osd_t *self, const char *text, - int *width, int *height); + int *width, int *height) XINE_PROTECTED; /* with freetype2 support compiled in, you can also specify a font file as 'fontname' here */ int xine_osd_set_font (xine_osd_t *self, const char *fontname, - int size); + int size) XINE_PROTECTED; /* * specifying encoding of texts * "" ... means current locale encoding (default) * NULL ... means latin1 */ -void xine_osd_set_encoding(xine_osd_t *self, const char *encoding); +void xine_osd_set_encoding(xine_osd_t *self, const char *encoding) XINE_PROTECTED; /* set position were overlay will be blended */ -void xine_osd_set_position (xine_osd_t *self, int x, int y); -void xine_osd_show (xine_osd_t *self, int64_t vpts); -void xine_osd_show_unscaled (xine_osd_t *self, int64_t vpts); -void xine_osd_hide (xine_osd_t *self, int64_t vpts); +void xine_osd_set_position (xine_osd_t *self, int x, int y) XINE_PROTECTED; +void xine_osd_show (xine_osd_t *self, int64_t vpts) XINE_PROTECTED; +void xine_osd_show_unscaled (xine_osd_t *self, int64_t vpts) XINE_PROTECTED; +void xine_osd_hide (xine_osd_t *self, int64_t vpts) XINE_PROTECTED; /* empty drawing area */ -void xine_osd_clear (xine_osd_t *self); +void xine_osd_clear (xine_osd_t *self) XINE_PROTECTED; /* * set on existing text palette * (-1 to set used specified palette) @@ -1943,19 +1944,19 @@ void xine_osd_clear (xine_osd_t *self); */ void xine_osd_set_text_palette (xine_osd_t *self, int palette_number, - int color_base ); + int color_base ) XINE_PROTECTED; /* get palette (color and transparency) */ void xine_osd_get_palette (xine_osd_t *self, uint32_t *color, - uint8_t *trans); + uint8_t *trans) XINE_PROTECTED; void xine_osd_set_palette (xine_osd_t *self, const uint32_t *const color, - const uint8_t *const trans ); + const uint8_t *const trans ) XINE_PROTECTED; /* * close osd rendering engine * loaded fonts are unloaded * osd objects are closed */ -void xine_osd_free (xine_osd_t *self); +void xine_osd_free (xine_osd_t *self) XINE_PROTECTED; #ifndef XINE_DISABLE_DEPRECATED_FEATURES @@ -1973,13 +1974,13 @@ typedef enum { } xine_tvsystem; /* connect to nvtvd server and save current TV and X settings */ -int xine_tvmode_init (xine_t *self); +int xine_tvmode_init (xine_t *self) XINE_PROTECTED; /* Turn tvmode on/off (1/0)*/ -int xine_tvmode_use(xine_t *self, int use_tvmode); +int xine_tvmode_use(xine_t *self, int use_tvmode) XINE_PROTECTED; /* Set which tv system to use: XINE_TVSYSTEM_PAL or XINE_TVSYSTEM_NTSC */ -void xine_tvmode_set_tvsystem(xine_t *self, xine_tvsystem system); +void xine_tvmode_set_tvsystem(xine_t *self, xine_tvsystem system) XINE_PROTECTED; /* try to change TV state if enabled * type select 'regular' (0) or 'TV' (1) state @@ -1988,16 +1989,16 @@ void xine_tvmode_set_tvsystem(xine_t *self, xine_tvsystem system); * fps frame rate the mode should match best or 0 if unknown * returns: finally selected state */ -int xine_tvmode_switch (xine_t *self, int type, int width, int height, double fps); +int xine_tvmode_switch (xine_t *self, int type, int width, int height, double fps) XINE_PROTECTED; /* adapt (maximum) output size to visible area if necessary and return pixel * aspect and real frame rate if available */ void xine_tvmode_size (xine_t *self, int *width, int *height, - double *pixelratio, double *fps); + double *pixelratio, double *fps) XINE_PROTECTED; /* restore old TV and X settings and close nvtvd connection */ -void xine_tvmode_exit (xine_t *self); +void xine_tvmode_exit (xine_t *self) XINE_PROTECTED; #endif 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 diff --git a/src/xine-utils/array.c b/src/xine-utils/array.c index 4c8784b7c..4fcecbb4b 100644 --- a/src/xine-utils/array.c +++ b/src/xine-utils/array.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: array.c,v 1.2 2006/02/14 19:09:02 dsalt Exp $ + * $Id: array.c,v 1.3 2006/09/26 05:19:49 dgp85 Exp $ * */ #ifdef HAVE_CONFIG_H @@ -26,6 +26,7 @@ #include <stdlib.h> #include <string.h> +#include "attributes.h" #include "array.h" #define MIN_CHUNK_SIZE 32 diff --git a/src/xine-utils/array.h b/src/xine-utils/array.h index f0e0bb521..45fc7b137 100644 --- a/src/xine-utils/array.h +++ b/src/xine-utils/array.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: array.h,v 1.1 2006/01/16 08:04:44 tmattern Exp $ + * $Id: array.h,v 1.2 2006/09/26 05:19:49 dgp85 Exp $ * * Array that can grow automatically when you add elements. * Inserting an element in the middle of the array implies memory moves. @@ -29,31 +29,31 @@ typedef struct xine_array_s xine_array_t; /* Constructor */ -xine_array_t *xine_array_new(size_t initial_size); +xine_array_t *xine_array_new(size_t initial_size) XINE_PROTECTED; /* Destructor */ -void xine_array_delete(xine_array_t *array); +void xine_array_delete(xine_array_t *array) XINE_PROTECTED; /* Returns the number of element stored in the array */ -size_t xine_array_size(xine_array_t *array); +size_t xine_array_size(xine_array_t *array) XINE_PROTECTED; /* Removes all elements from an array */ -void xine_array_clear(xine_array_t *array); +void xine_array_clear(xine_array_t *array) XINE_PROTECTED; /* Adds the element at the end of the array */ -void xine_array_add(xine_array_t *array, void *value); +void xine_array_add(xine_array_t *array, void *value) XINE_PROTECTED; /* Inserts an element into an array at the position specified */ -void xine_array_insert(xine_array_t *array, unsigned int position, void *value); +void xine_array_insert(xine_array_t *array, unsigned int position, void *value) XINE_PROTECTED; /* Removes one element from an array at the position specified */ -void xine_array_remove(xine_array_t *array, unsigned int position); +void xine_array_remove(xine_array_t *array, unsigned int position) XINE_PROTECTED; /* Get the element at the position specified */ -void *xine_array_get(xine_array_t *array, unsigned int position); +void *xine_array_get(xine_array_t *array, unsigned int position) XINE_PROTECTED; /* Set the element at the position specified */ -void xine_array_set(xine_array_t *array, unsigned int position, void *value); +void xine_array_set(xine_array_t *array, unsigned int position, void *value) XINE_PROTECTED; #endif diff --git a/src/xine-utils/attributes.h b/src/xine-utils/attributes.h index c468b7ba5..4bf5a21af 100644 --- a/src/xine-utils/attributes.h +++ b/src/xine-utils/attributes.h @@ -42,5 +42,16 @@ #endif /* __attribute __*/ #endif +#ifdef XINE_COMPILE +# include "config.h" +#endif + +/* Export protected only for libxine functions */ +#if defined(XINE_LIBRARY_COMPILE) && defined(SUPPORT_ATTRIBUTE_VISIBILITY) +# define XINE_PROTECTED __attribute__((visibility("protected"))) +#else +# define XINE_PROTECTED +#endif + #endif /* ATTRIBUTE_H_ */ diff --git a/src/xine-utils/list.c b/src/xine-utils/list.c index 6d5d876bf..2c790c3db 100644 --- a/src/xine-utils/list.c +++ b/src/xine-utils/list.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: list.c,v 1.11 2006/04/05 22:12:20 valtri Exp $ + * $Id: list.c,v 1.12 2006/09/26 05:19:49 dgp85 Exp $ * */ @@ -26,6 +26,7 @@ #endif #include <stdlib.h> +#include "attributes.h" #include "list.h" #define MIN_CHUNK_SIZE 32 diff --git a/src/xine-utils/list.h b/src/xine-utils/list.h index 5b5f3532e..9b9506a84 100644 --- a/src/xine-utils/list.h +++ b/src/xine-utils/list.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: list.h,v 1.3 2006/04/05 22:12:20 valtri Exp $ + * $Id: list.h,v 1.4 2006/09/26 05:19:49 dgp85 Exp $ * * Doubly-linked linked list. * @@ -50,25 +50,25 @@ typedef struct xine_list_s xine_list_t; typedef void* xine_list_iterator_t; /* Constructor */ -xine_list_t *xine_list_new(void); +xine_list_t *xine_list_new(void) XINE_PROTECTED; /* Destructor */ -void xine_list_delete(xine_list_t *list); +void xine_list_delete(xine_list_t *list) XINE_PROTECTED; /* Returns the number of element stored in the list */ -unsigned int xine_list_size(xine_list_t *list); +unsigned int xine_list_size(xine_list_t *list) XINE_PROTECTED; /* Returns true if the number of elements is zero, false otherwise */ -unsigned int xine_list_empty(xine_list_t *list); +unsigned int xine_list_empty(xine_list_t *list) XINE_PROTECTED; /* Adds the element at the beginning of the list */ -void xine_list_push_front(xine_list_t *list, void *value); +void xine_list_push_front(xine_list_t *list, void *value) XINE_PROTECTED; /* Adds the element at the end of the list */ -void xine_list_push_back(xine_list_t *list, void *value); +void xine_list_push_back(xine_list_t *list, void *value) XINE_PROTECTED; /* Remove all elements from a list */ -void xine_list_clear(xine_list_t *list); +void xine_list_clear(xine_list_t *list) XINE_PROTECTED; /* Insert the element elem into the list at the position specified by the iterator (before the element, if any, that was previously at the iterator's @@ -76,31 +76,31 @@ void xine_list_clear(xine_list_t *list); the inserted element. */ xine_list_iterator_t xine_list_insert(xine_list_t *list, xine_list_iterator_t position, - void *value); + void *value) XINE_PROTECTED; /* Remove one element from a list.*/ -void xine_list_remove(xine_list_t *list, xine_list_iterator_t position); +void xine_list_remove(xine_list_t *list, xine_list_iterator_t position) XINE_PROTECTED; /* Returns an iterator that references the first element of the list */ -xine_list_iterator_t xine_list_front(xine_list_t *list); +xine_list_iterator_t xine_list_front(xine_list_t *list) XINE_PROTECTED; /* Returns an iterator that references the last element of the list */ -xine_list_iterator_t xine_list_back(xine_list_t *list); +xine_list_iterator_t xine_list_back(xine_list_t *list) XINE_PROTECTED; /* Perform a linear search of a given value, and returns an iterator that references this value or NULL if not found */ -xine_list_iterator_t xine_list_find(xine_list_t *list, void *value); +xine_list_iterator_t xine_list_find(xine_list_t *list, void *value) XINE_PROTECTED; /* Increments the iterator's value, so it specifies the next element in the list or NULL at the end of the list */ -xine_list_iterator_t xine_list_next(xine_list_t *list, xine_list_iterator_t ite); +xine_list_iterator_t xine_list_next(xine_list_t *list, xine_list_iterator_t ite) XINE_PROTECTED; /* Increments the iterator's value, so it specifies the previous element in the list or NULL at the beginning of the list */ -xine_list_iterator_t xine_list_prev(xine_list_t *list, xine_list_iterator_t ite); +xine_list_iterator_t xine_list_prev(xine_list_t *list, xine_list_iterator_t ite) XINE_PROTECTED; /* Returns the value at the position specified by the iterator */ -void *xine_list_get_value(xine_list_t *list, xine_list_iterator_t ite); +void *xine_list_get_value(xine_list_t *list, xine_list_iterator_t ite) XINE_PROTECTED; #endif diff --git a/src/xine-utils/pool.c b/src/xine-utils/pool.c index 3532def56..39dbccb0c 100644 --- a/src/xine-utils/pool.c +++ b/src/xine-utils/pool.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: pool.c,v 1.1 2006/01/27 07:53:28 tmattern Exp $ + * $Id: pool.c,v 1.2 2006/09/26 05:19:49 dgp85 Exp $ * */ #ifdef HAVE_CONFIG_H @@ -25,6 +25,7 @@ #endif #include <assert.h> +#include "attributes.h" #include "pool.h" #include "array.h" diff --git a/src/xine-utils/pool.h b/src/xine-utils/pool.h index d2fa39497..5f6e4bd7e 100644 --- a/src/xine-utils/pool.h +++ b/src/xine-utils/pool.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: pool.h,v 1.1 2006/01/27 07:53:28 tmattern Exp $ + * $Id: pool.h,v 1.2 2006/09/26 05:19:49 dgp85 Exp $ * * Object Pool */ @@ -38,13 +38,13 @@ xine_pool_t *xine_pool_new(size_t object_size, void (create_object)(void *object), void (prepare_object)(void *object), void (return_object)(void *object), - void (delete_object)(void *object)); + void (delete_object)(void *object)) XINE_PROTECTED; /* Deletes a pool */ -void xine_pool_delete(xine_pool_t *pool); +void xine_pool_delete(xine_pool_t *pool) XINE_PROTECTED; /* Get an object from the pool */ -void *xine_pool_get(xine_pool_t *pool); +void *xine_pool_get(xine_pool_t *pool) XINE_PROTECTED; /* Returns an object to the pool */ -void xine_pool_put(xine_pool_t *pool, void *object); +void xine_pool_put(xine_pool_t *pool, void *object) XINE_PROTECTED; diff --git a/src/xine-utils/ring_buffer.c b/src/xine-utils/ring_buffer.c index dbad685d1..0dfd370f1 100644 --- a/src/xine-utils/ring_buffer.c +++ b/src/xine-utils/ring_buffer.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: ring_buffer.c,v 1.4 2006/06/23 18:24:22 dsalt Exp $ + * $Id: ring_buffer.c,v 1.5 2006/09/26 05:19:49 dgp85 Exp $ * */ #ifdef HAVE_CONFIG_H @@ -30,6 +30,7 @@ #include <assert.h> #include <stdio.h> #include <string.h> +#include "attributes.h" #include "pool.h" #include "list.h" #include "ring_buffer.h" diff --git a/src/xine-utils/ring_buffer.h b/src/xine-utils/ring_buffer.h index ece5e7beb..fc826ba21 100644 --- a/src/xine-utils/ring_buffer.h +++ b/src/xine-utils/ring_buffer.h @@ -17,24 +17,24 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: ring_buffer.h,v 1.2 2006/01/27 19:37:15 tmattern Exp $ + * $Id: ring_buffer.h,v 1.3 2006/09/26 05:19:49 dgp85 Exp $ * * Fifo + Ring Buffer */ typedef struct xine_ring_buffer_s xine_ring_buffer_t; /* Creates a new ring buffer */ -xine_ring_buffer_t *xine_ring_buffer_new(size_t size); +xine_ring_buffer_t *xine_ring_buffer_new(size_t size) XINE_PROTECTED; /* Deletes a ring buffer */ -void xine_ring_buffer_delete(xine_ring_buffer_t *ring_buffer); +void xine_ring_buffer_delete(xine_ring_buffer_t *ring_buffer) XINE_PROTECTED; /* Returns a new chunk of the specified size */ /* Might block if the ring buffer is full */ -void *xine_ring_buffer_alloc(xine_ring_buffer_t *ring_buffer, size_t size); +void *xine_ring_buffer_alloc(xine_ring_buffer_t *ring_buffer, size_t size) XINE_PROTECTED; /* Put a chunk into the ring */ -void xine_ring_buffer_put(xine_ring_buffer_t *ring_buffer, void *chunk); +void xine_ring_buffer_put(xine_ring_buffer_t *ring_buffer, void *chunk) XINE_PROTECTED; /* Get a chunk of a specified size from the ring buffer * Might block if the ring buffer is empty @@ -43,15 +43,15 @@ void xine_ring_buffer_put(xine_ring_buffer_t *ring_buffer, void *chunk); * rsize is not equal to size at the end of stream, the caller MUST check * rsize value. */ -void *xine_ring_buffer_get(xine_ring_buffer_t *ring_buffer, size_t size, size_t *rsize); +void *xine_ring_buffer_get(xine_ring_buffer_t *ring_buffer, size_t size, size_t *rsize) XINE_PROTECTED; /* Releases the chunk, makes memory available for the alloc function */ -void xine_ring_buffer_release(xine_ring_buffer_t *ring_buffer, void *chunk); +void xine_ring_buffer_release(xine_ring_buffer_t *ring_buffer, void *chunk) XINE_PROTECTED; /* Closes the ring buffer * The writer uses this function to signal the end of stream to the reader. * The reader MUST check the rsize value returned by the get function. */ -void xine_ring_buffer_close(xine_ring_buffer_t *ring_buffer); +void xine_ring_buffer_close(xine_ring_buffer_t *ring_buffer) XINE_PROTECTED; diff --git a/src/xine-utils/sorted_array.c b/src/xine-utils/sorted_array.c index fe5edf277..c69d92d40 100644 --- a/src/xine-utils/sorted_array.c +++ b/src/xine-utils/sorted_array.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: sorted_array.c,v 1.2 2006/06/23 18:24:22 dsalt Exp $ + * $Id: sorted_array.c,v 1.3 2006/09/26 05:19:49 dgp85 Exp $ * */ #ifdef HAVE_CONFIG_H @@ -26,6 +26,7 @@ #include <stdlib.h> #include <string.h> +#include "attributes.h" #include "sorted_array.h" /* Array internal struct */ diff --git a/src/xine-utils/sorted_array.h b/src/xine-utils/sorted_array.h index 5ca537f88..767a2913c 100644 --- a/src/xine-utils/sorted_array.h +++ b/src/xine-utils/sorted_array.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: sorted_array.h,v 1.2 2006/06/23 18:24:22 dsalt Exp $ + * $Id: sorted_array.h,v 1.3 2006/09/26 05:19:49 dgp85 Exp $ * * Sorted array which grows automatically when you add elements. * A binary search is used to find the position of a new element. @@ -66,32 +66,32 @@ typedef struct xine_sarray_s xine_sarray_t; typedef int (*xine_sarray_comparator_t)(void*, void*); /* Constructor */ -xine_sarray_t *xine_sarray_new(size_t initial_size, xine_sarray_comparator_t comparator); +xine_sarray_t *xine_sarray_new(size_t initial_size, xine_sarray_comparator_t comparator) XINE_PROTECTED; /* Destructor */ -void xine_sarray_delete(xine_sarray_t *sarray); +void xine_sarray_delete(xine_sarray_t *sarray) XINE_PROTECTED; /* Returns the number of element stored in the array */ -size_t xine_sarray_size(const xine_sarray_t *sarray); +size_t xine_sarray_size(const xine_sarray_t *sarray) XINE_PROTECTED; /* Removes all elements from an array */ -void xine_sarray_clear(xine_sarray_t *sarray); +void xine_sarray_clear(xine_sarray_t *sarray) XINE_PROTECTED; /* Adds the element into the array Returns the insertion position */ -int xine_sarray_add(xine_sarray_t *sarray, void *value); +int xine_sarray_add(xine_sarray_t *sarray, void *value) XINE_PROTECTED; /* Removes one element from an array at the position specified */ -void xine_sarray_remove(xine_sarray_t *sarray, unsigned int position); +void xine_sarray_remove(xine_sarray_t *sarray, unsigned int position) XINE_PROTECTED; /* Get the element at the position specified */ -void *xine_sarray_get(xine_sarray_t *sarray, unsigned int position); +void *xine_sarray_get(xine_sarray_t *sarray, unsigned int position) XINE_PROTECTED; /* Returns the index of the search key, if it is contained in the list. Otherwise, (-(insertion point) - 1) or ~(insertion point). The insertion point is defined as the point at which the key would be inserted into the array. */ -int xine_sarray_binary_search(xine_sarray_t *sarray, void *key); +int xine_sarray_binary_search(xine_sarray_t *sarray, void *key) XINE_PROTECTED; #endif diff --git a/src/xine-utils/xine_buffer.h b/src/xine-utils/xine_buffer.h index 197807d57..02a9e2cb1 100644 --- a/src/xine-utils/xine_buffer.h +++ b/src/xine-utils/xine_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: xine_buffer.h,v 1.6 2006/06/23 18:24:22 dsalt Exp $ + * $Id: xine_buffer.h,v 1.7 2006/09/26 05:19:49 dgp85 Exp $ * * * generic dynamic buffer functions. The goals @@ -64,40 +64,40 @@ * chunk_size bytes. This will prevent permanent * reallocation on slow growing buffers. */ -void *xine_buffer_init(int chunk_size); +void *xine_buffer_init(int chunk_size) XINE_PROTECTED; /* * frees a buffer, the macro ensures, that a freed * buffer pointer is set to NULL */ #define xine_buffer_free(buf) buf=_xine_buffer_free(buf) -void *_xine_buffer_free(void *buf); +void *_xine_buffer_free(void *buf) XINE_PROTECTED; /* * duplicates a buffer */ -void *xine_buffer_dup(const void *buf); +void *xine_buffer_dup(const void *buf) XINE_PROTECTED; /* * will copy len bytes of data into buf at position index. */ #define xine_buffer_copyin(buf,i,data,len) \ buf=_xine_buffer_copyin(buf,i,data,len) -void *_xine_buffer_copyin(void *buf, int index, const void *data, int len); +void *_xine_buffer_copyin(void *buf, int index, const void *data, int len) XINE_PROTECTED; /* * will copy len bytes out of buf+index into data. * no checks are made in data. It is treated as an ordinary * user-malloced data chunk. */ -void xine_buffer_copyout(const void *buf, int index, void *data, int len); +void xine_buffer_copyout(const void *buf, int index, void *data, int len) XINE_PROTECTED; /* * set len bytes in buf+index to b. */ #define xine_buffer_set(buf,i,b,len) \ buf=_xine_buffer_set(buf,i,b,len) -void *_xine_buffer_set(void *buf, int index, uint8_t b, int len); +void *_xine_buffer_set(void *buf, int index, uint8_t b, int len) XINE_PROTECTED; /* * concatenates given buf (which should contain a null terminated string) @@ -105,26 +105,26 @@ void *_xine_buffer_set(void *buf, int index, uint8_t b, int len); */ #define xine_buffer_strcat(buf,data) \ buf=_xine_buffer_strcat(buf,data) -void *_xine_buffer_strcat(void *buf, const char *data); +void *_xine_buffer_strcat(void *buf, const char *data) XINE_PROTECTED; /* * copies given string to buf+index */ #define xine_buffer_strcpy(buf,index,data) \ buf=_xine_buffer_strcpy(buf,index,data) -void *_xine_buffer_strcpy(void *buf, int index, const char *data); +void *_xine_buffer_strcpy(void *buf, int index, const char *data) XINE_PROTECTED; /* * returns a pointer to the first occurence of ch. * note, that the returned pointer cannot be used * in any other xine_buffer_* functions. */ -char *xine_buffer_strchr(const void *buf, int ch); +char *xine_buffer_strchr(const void *buf, int ch) XINE_PROTECTED; /* * get allocated memory size */ -int xine_buffer_get_size(const void *buf); +int xine_buffer_get_size(const void *buf) XINE_PROTECTED; /* * ensures a specified buffer size if the user want to @@ -133,6 +133,6 @@ int xine_buffer_get_size(const void *buf); */ #define xine_buffer_ensure_size(buf,data) \ buf=_xine_buffer_ensure_size(buf,data) -void *_xine_buffer_ensure_size(void *buf, int size); +void *_xine_buffer_ensure_size(void *buf, int size) XINE_PROTECTED; #endif diff --git a/src/xine-utils/xmllexer.h b/src/xine-utils/xmllexer.h index abc0189e9..bd69204ff 100644 --- a/src/xine-utils/xmllexer.h +++ b/src/xine-utils/xmllexer.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: xmllexer.h,v 1.6 2006/02/14 02:25:01 dsalt Exp $ + * $Id: xmllexer.h,v 1.7 2006/09/26 05:19:49 dgp85 Exp $ * */ @@ -48,8 +48,8 @@ /* public functions */ -void lexer_init(const char * buf, int size); -int lexer_get_token(char * tok, int tok_size); -char *lexer_decode_entities (const char *tok); +void lexer_init(const char * buf, int size) XINE_PROTECTED; +int lexer_get_token(char * tok, int tok_size) XINE_PROTECTED; +char *lexer_decode_entities (const char *tok) XINE_PROTECTED; #endif diff --git a/src/xine-utils/xmlparser.h b/src/xine-utils/xmlparser.h index 35155fa79..a19c81ec3 100644 --- a/src/xine-utils/xmlparser.h +++ b/src/xine-utils/xmlparser.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: xmlparser.h,v 1.4 2006/02/14 02:25:01 dsalt Exp $ + * $Id: xmlparser.h,v 1.5 2006/09/26 05:19:49 dgp85 Exp $ * */ #ifndef XML_PARSER_H @@ -48,17 +48,17 @@ typedef struct xml_node_s { struct xml_node_s *next; } xml_node_t; -void xml_parser_init(const char * buf, int size, int mode); +void xml_parser_init(const char * buf, int size, int mode) XINE_PROTECTED; -int xml_parser_build_tree(xml_node_t **root_node); +int xml_parser_build_tree(xml_node_t **root_node) XINE_PROTECTED; -void xml_parser_free_tree(xml_node_t *root_node); +void xml_parser_free_tree(xml_node_t *root_node) XINE_PROTECTED; -char *xml_parser_get_property (const xml_node_t *node, const char *name); +char *xml_parser_get_property (const xml_node_t *node, const char *name) XINE_PROTECTED; int xml_parser_get_property_int (const xml_node_t *node, const char *name, - int def_value); + int def_value) XINE_PROTECTED; int xml_parser_get_property_bool (const xml_node_t *node, const char *name, - int def_value); + int def_value) XINE_PROTECTED; /* for output: * returns an escaped string (free() it when done) @@ -70,12 +70,12 @@ typedef enum { XML_ESCAPE_SINGLE_QUOTE, XML_ESCAPE_DOUBLE_QUOTE } xml_escape_quote_t; -char *xml_escape_string (const char *s, xml_escape_quote_t quote_type); +char *xml_escape_string (const char *s, xml_escape_quote_t quote_type) XINE_PROTECTED; /* for debugging purposes: dump read-in xml tree in a nicely * indented fashion */ -void xml_parser_dump_tree (const xml_node_t *node) ; +void xml_parser_dump_tree (const xml_node_t *node) XINE_PROTECTED; #endif |