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/libac3/xine_decoder.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/libac3/xine_decoder.c')
| -rw-r--r-- | src/libac3/xine_decoder.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libac3/xine_decoder.c b/src/libac3/xine_decoder.c index c7ec83c35..6bd357f04 100644 --- a/src/libac3/xine_decoder.c +++ b/src/libac3/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.22 2001/08/02 14:35:58 joachim_koenig Exp $ + * $Id: xine_decoder.c,v 1.23 2001/08/21 19:39:50 jcdutton Exp $ * * stuff needed to turn libac3 into a xine decoder plugin */ @@ -69,7 +69,7 @@ typedef struct ac3dec_decoder_s { sample_t delay[6*256]; sample_t samples[6][256]; - ao_functions_t *audio_out; + ao_instance_t *audio_out; int audio_caps; int bypass_mode; int output_sampling_rate; @@ -83,7 +83,7 @@ int ac3dec_can_handle (audio_decoder_t *this_gen, int buf_type) { } -void ac3dec_init (audio_decoder_t *this_gen, ao_functions_t *audio_out) { +void ac3dec_init (audio_decoder_t *this_gen, ao_instance_t *audio_out) { ac3dec_decoder_t *this = (ac3dec_decoder_t *) this_gen; /* int i; */ @@ -303,7 +303,7 @@ static void ac3dec_decode_frame (ac3dec_decoder_t *this, uint32_t pts) { /* output decoded samples */ - this->audio_out->write_audio_data (this->audio_out, + this->audio_out->write (this->audio_out, this->int_samples, 256*6, pts); @@ -328,7 +328,7 @@ static void ac3dec_decode_frame (ac3dec_decoder_t *this, uint32_t pts) { } if (this->output_open) { - this->audio_out->write_audio_data (this->audio_out, + this->audio_out->write (this->audio_out, (int16_t*)this->frame_buffer, this->frame_length, pts); |