diff options
| author | James Courtier-Dutton <jcdutton@users.sourceforge.net> | 2001-08-21 19:39:50 +0000 |
|---|---|---|
| committer | James Courtier-Dutton <jcdutton@users.sourceforge.net> | 2001-08-21 19:39:50 +0000 |
| commit | 790d5baee128cb40800fee392e74c01afefe4756 (patch) | |
| tree | 4aa716c83a891ca3876968ede7f74c7482bfa7f0 /src/xine-engine/xine.c | |
| parent | f92de1992b6c30602b6785c0fb84fe3be6730c54 (diff) | |
| download | xine-lib-790d5baee128cb40800fee392e74c01afefe4756.tar.gz xine-lib-790d5baee128cb40800fee392e74c01afefe4756.tar.bz2 | |
First checkin of new audio_out architecture.
Audio sync and AC3 formatting now done in xine-lib/src/xine-engine/audio_out.c
Audio out now done in xine-lib/src/audio_out/*
Currently, only xine-lib/src/audio_oss_out.c is active.
Re-support of others will follow as other people implement them.
ao_functions split into ao_instance and ao_driver
and function in a similar fashion as video_out.
All decoder plugins now call ao_instance instead of ao_functions.
ao_instance is used in xine-lib/src/xine-engine/audio_out.c
ao_driver is used in xine-lib/src/audio_out/*
See also changes in xine-ui files
CVS patchset: 459
CVS date: 2001/08/21 19:39:50
Diffstat (limited to 'src/xine-engine/xine.c')
| -rw-r--r-- | src/xine-engine/xine.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 83d1e4ebe..17fd9385b 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.44 2001/08/20 20:49:51 f1rmb Exp $ + * $Id: xine.c,v 1.45 2001/08/21 19:39:50 jcdutton Exp $ * * top-level xine functions * @@ -452,7 +452,7 @@ static void event_handler(xine_t *xine, event_t *event, void *data) { } 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, @@ -515,8 +515,9 @@ xine_t *xine_init (vo_driver_t *vo, video_decoder_init (this); if(ao) { - this->audio_out = ao; - this->audio_out->connect (this->audio_out, this->metronom); + this->audio_out = ao_new_instance (ao, this->metronom); +// this->audio_out = ao; +// this->audio_out->connect (this->audio_out, this->metronom); } audio_decoder_init (this); printf("xine_init returning\n"); |