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/libw32dll/w32codec.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/libw32dll/w32codec.c')
| -rw-r--r-- | src/libw32dll/w32codec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c index 7bb7ab461..69abf2e9f 100644 --- a/src/libw32dll/w32codec.c +++ b/src/libw32dll/w32codec.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: w32codec.c,v 1.15 2001/08/06 13:21:26 ehasenle Exp $ + * $Id: w32codec.c,v 1.16 2001/08/21 19:39:50 jcdutton Exp $ * * routines for using w32 codecs * @@ -63,7 +63,7 @@ typedef struct w32v_decoder_s { typedef struct w32a_decoder_s { audio_decoder_t audio_decoder; - ao_functions_t *audio_out; + ao_instance_t *audio_out; int decoder_ok; unsigned char buf[16384]; @@ -404,7 +404,7 @@ static char* get_auds_codec_name(w32a_decoder_t *this, int id){ return NULL; } -static void w32a_init (audio_decoder_t *this_gen, ao_functions_t *audio_out) { +static void w32a_init (audio_decoder_t *this_gen, ao_instance_t *audio_out) { w32a_decoder_t *this = (w32a_decoder_t *) this_gen; @@ -523,7 +523,7 @@ static void w32a_decode_audio (w32a_decoder_t *this, this->sample_buf[0], this->sample_buf[1], this->sample_buf[2], this->sample_buf[3], this->sample_buf[ash.cbDstLengthUsed-2], this->sample_buf[ash.cbDstLengthUsed-1]); */ - this->audio_out->write_audio_data (this->audio_out, + this->audio_out->write (this->audio_out, (int16_t*) this->sample_buf, ash.cbDstLengthUsed / (this->num_channels*2), nPTS); |