summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/xine.h.tmpl.in18
1 files changed, 9 insertions, 9 deletions
diff --git a/include/xine.h.tmpl.in b/include/xine.h.tmpl.in
index b91de236b..f6adb91b5 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.36 2001/08/17 16:15:36 f1rmb Exp $
+ * $Id: xine.h.tmpl.in,v 1.37 2001/08/21 19:39:50 jcdutton Exp $
*
*/
@@ -431,10 +431,10 @@ struct vo_driver_s {
*/
typedef void xine_t;
/**
- * \struct ao_functions_t
+ * \struct ao_driver_t
* Opaque data type.
*/
-typedef void ao_functions_t;
+typedef void ao_driver_t;
/**
* \struct cfg_data_t
* Opaque data type.
@@ -564,7 +564,7 @@ typedef void (*gui_branched_cb_t) (void);
/** @} end of demux_strategy */
/**
- * \fn xine_t *xine_init (vo_driver_t *vo, ao_functions_t *ao, config_values_t *config, gui_stream_end_cb_t stream_end_cb, gui_get_next_mrl_cb_t get_next_mrl_cb, gui_branched_cb_t branched_cb);
+ * \fn xine_t *xine_init (vo_driver_t *vo, ao_driver_t *ao, config_values_t *config, gui_stream_end_cb_t stream_end_cb, gui_get_next_mrl_cb_t get_next_mrl_cb, gui_branched_cb_t branched_cb);
* \brief Initialisation of xine.
* \param vo video driver ( #see @ref xine_load_video_output_plugin() )
* \param ao audio driver ( #see @ref xine_load_audio_output_plugin() )
@@ -573,7 +573,7 @@ typedef void (*gui_branched_cb_t) (void);
* \param get_next_mrl_cb called to find out next mrl for seamless branching
* \param branched_cb called if seamless branch was taken
* \return Current xine engine configuration
- * \sa vo_driver_t, ao_functions_t, config_values_t, gui_stream_end_cb_t, gui_get_next_mrl_cb_t, gui_branched_cb_t
+ * \sa vo_driver_t, ao_driver_t, config_values_t, gui_stream_end_cb_t, gui_get_next_mrl_cb_t, gui_branched_cb_t
* \warning This function should be called before any other xine_*() function.
*
* Init of xine. It should called once at startup.
@@ -582,7 +582,7 @@ typedef void (*gui_branched_cb_t) (void);
*
*/
xine_t *xine_init (vo_driver_t *vo,
- ao_functions_t *ao,
+ ao_driver_t *ao,
config_values_t *config,
gui_stream_end_cb_t stream_end_cb,
gui_get_next_mrl_cb_t get_next_mrl_cb,
@@ -1078,13 +1078,13 @@ vo_driver_t *xine_load_video_output_plugin(config_values_t *config,
char **xine_list_audio_output_plugins (void);
/**
- * \fn ao_functions_t *xine_load_audio_output_plugin(config_values_t *config, char *id)
+ * \fn ao_driver_t *xine_load_audio_output_plugin(config_values_t *config, char *id)
* \param config current configuration ( #see config_file_init() )
* \param id driver name.
* \brief load a specific audio output plugin.
- * \sa ao_functions_t
+ * \sa ao_driver_t
*/
-ao_functions_t *xine_load_audio_output_plugin(config_values_t *config, char *id);
+ao_driver_t *xine_load_audio_output_plugin(config_values_t *config, char *id);
/** @} end of loadplugins_group */