diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-07-26 12:11:17 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-07-26 12:11:17 +0000 |
| commit | 7f4ef4ee218a5d9094da9e00c4f0a151e8aca0bd (patch) | |
| tree | fb314b7d884226343cef982d9677d7fe3925eb2f | |
| parent | 051da02876d616d265da03463fb8ce1c905adc17 (diff) | |
| download | xine-lib-7f4ef4ee218a5d9094da9e00c4f0a151e8aca0bd.tar.gz xine-lib-7f4ef4ee218a5d9094da9e00c4f0a151e8aca0bd.tar.bz2 | |
Temporary big hack for multi inclusion problems.
CVS patchset: 352
CVS date: 2001/07/26 12:11:17
| -rw-r--r-- | include/xine.h.tmpl.in | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/include/xine.h.tmpl.in b/include/xine.h.tmpl.in index f072393a8..ef320a200 100644 --- a/include/xine.h.tmpl.in +++ b/include/xine.h.tmpl.in @@ -28,7 +28,7 @@ \endverbatim */ /* - * $Id: xine.h.tmpl.in,v 1.34 2001/07/26 11:36:45 f1rmb Exp $ + * $Id: xine.h.tmpl.in,v 1.35 2001/07/26 12:11:17 f1rmb Exp $ * */ @@ -43,6 +43,14 @@ extern "C" { #include <unistd.h> #include <sys/types.h> +#ifndef XINE_COMPILE +#include <xine/video_out.h> +#endif + +#ifndef DOC_HIDDEN +#include <xine/events.h> +#endif + /** * \def XINE_SKINDIR * Skin file location @@ -312,6 +320,7 @@ int xine_check_version(int major, int minor, int sub); /** @} end of video_ratio */ +#ifdef DOC_HIDDEN /** * \struct vo_frame_t * Opaque data type. @@ -396,7 +405,7 @@ struct vo_driver_s { void (*exit) (vo_driver_t *self); }; - +#endif /** @} end of video_group */ /** @@ -424,6 +433,8 @@ typedef void ao_functions_t; * \struct cfg_data_t * Opaque data type. */ + +#ifdef DOC_HIDDEN typedef void cfg_data_t; /** * \struct config_values_t @@ -472,7 +483,7 @@ struct config_values_s { */ cfg_data_t *data; }; - +#endif /** @} end of config_group */ @@ -1064,12 +1075,13 @@ ao_functions_t *xine_load_audio_output_plugin(config_values_t *config, char *id) * @{ */ - +#ifdef DOC_HIDDEN /** * Opaque data type. * \sa event_listener_t, xine_send_event */ typedef void event_t; +#endif /** * Event listener callback. |