diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-04-21 00:14:39 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-04-21 00:14:39 +0000 |
| commit | 8e7dc911d41be3013198436848492efbce679c9a (patch) | |
| tree | e26bc7209baa161d7a790c4f3f2917db201fa7a1 /src/xine-engine/xine.c | |
| parent | 9906645c4669be8476c683b7dfcf321b99ac15a1 (diff) | |
| download | xine-lib-8e7dc911d41be3013198436848492efbce679c9a.tar.gz xine-lib-8e7dc911d41be3013198436848492efbce679c9a.tar.bz2 | |
Turned demuxers into plugins. Change plugins naming scheme (see
xine_internal.h). Fixed load_plugins* to new API. Add iface version
into demux_plugin_t, add version checking into init_demux_plugin.
Fixed get_identifier from demuxers (void param). Turned libw32dll
into codec plugin (only compiling side yet).
CVS patchset: 11
CVS date: 2001/04/21 00:14:39
Diffstat (limited to 'src/xine-engine/xine.c')
| -rw-r--r-- | src/xine-engine/xine.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index daad7cbf4..17cec6014 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine.c,v 1.2 2001/04/19 09:46:57 f1rmb Exp $ + * $Id: xine.c,v 1.3 2001/04/21 00:14:41 f1rmb Exp $ * * top-level xine functions * @@ -442,9 +442,10 @@ static void xine_pause (xine_t *this) { /* * */ -xine_t *xine_init (vo_instance_t *vo, ao_instance_t *ao, +xine_t *xine_init (vo_instance_t *vo, + ao_functions_t *ao, gui_status_callback_func_t gui_status_callback, - int demux_strategy, uint32_t debug_lvl) { + config_values_t *config, int demux_strategy, uint32_t debug_lvl) { xine_t *this = xmalloc (sizeof (xine_t)); int err; @@ -474,7 +475,7 @@ xine_t *xine_init (vo_instance_t *vo, ao_instance_t *ao, * init demuxer */ - xine_load_demux_plugins(); + load_demux_plugins(this, config, DEMUXER_PLUGIN_IFACE_VERSION); this->audio_channel = 0; this->spu_channel = -1; @@ -508,7 +509,7 @@ xine_t *xine_init (vo_instance_t *vo, ao_instance_t *ao, * load input plugins */ - xine_load_input_plugins (); + load_input_plugins (this, config, INPUT_PLUGIN_IFACE_VERSION); printf ("xine_init: plugins loaded\n"); |