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/libmad | |
| 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/libmad')
| -rw-r--r-- | src/libmad/xine_decoder.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libmad/xine_decoder.c b/src/libmad/xine_decoder.c index d79a4f57e..96f728e58 100644 --- a/src/libmad/xine_decoder.c +++ b/src/libmad/xine_decoder.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_decoder.c,v 1.1 2001/08/12 02:57:55 guenter Exp $ + * $Id: xine_decoder.c,v 1.2 2001/08/21 19:39:50 jcdutton Exp $ * * stuff needed to turn libmad into a xine decoder plugin */ @@ -43,7 +43,7 @@ typedef struct mad_decoder_s { struct mad_stream stream; struct mad_frame frame; - ao_functions_t *audio_out; + ao_instance_t *audio_out; int output_sampling_rate; int output_open; @@ -59,7 +59,7 @@ static int mad_can_handle (audio_decoder_t *this_gen, int buf_type) { } -static void mad_init (audio_decoder_t *this_gen, ao_functions_t *audio_out) { +static void mad_init (audio_decoder_t *this_gen, ao_instance_t *audio_out) { mad_decoder_t *this = (mad_decoder_t *) this_gen; @@ -193,7 +193,7 @@ static void mad_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) { } - this->audio_out->write_audio_data (this->audio_out, + this->audio_out->write (this->audio_out, this->samples, pcm->length, buf->PTS); |