summaryrefslogtreecommitdiff
path: root/src/liblpcm/xine_decoder.c
diff options
context:
space:
mode:
authorJames Courtier-Dutton <jcdutton@users.sourceforge.net>2001-08-21 19:39:50 +0000
committerJames Courtier-Dutton <jcdutton@users.sourceforge.net>2001-08-21 19:39:50 +0000
commit790d5baee128cb40800fee392e74c01afefe4756 (patch)
tree4aa716c83a891ca3876968ede7f74c7482bfa7f0 /src/liblpcm/xine_decoder.c
parentf92de1992b6c30602b6785c0fb84fe3be6730c54 (diff)
downloadxine-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/liblpcm/xine_decoder.c')
-rw-r--r--src/liblpcm/xine_decoder.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/liblpcm/xine_decoder.c b/src/liblpcm/xine_decoder.c
index 59644f339..6ce388884 100644
--- a/src/liblpcm/xine_decoder.c
+++ b/src/liblpcm/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/04 20:14:54 guenter Exp $
+ * $Id: xine_decoder.c,v 1.2 2001/08/21 19:39:50 jcdutton Exp $
*
* stuff needed to turn libac3 into a xine decoder plugin
*/
@@ -42,7 +42,7 @@ typedef struct lpcm_decoder_s {
uint32_t pts;
uint32_t last_pts;
- ao_functions_t *audio_out;
+ ao_instance_t *audio_out;
int output_open;
} lpcm_decoder_t;
@@ -52,7 +52,7 @@ int lpcm_can_handle (audio_decoder_t *this_gen, int buf_type) {
}
-void lpcm_init (audio_decoder_t *this_gen, ao_functions_t *audio_out) {
+void lpcm_init (audio_decoder_t *this_gen, ao_instance_t *audio_out) {
lpcm_decoder_t *this = (lpcm_decoder_t *) this_gen;
@@ -87,7 +87,7 @@ void lpcm_decode_data (audio_decoder_t *this_gen, buf_element_t *buf) {
for(i=0; i<buf->size/2; i++)
p[i] = ntohs(p[i]);
- this->audio_out->write_audio_data (this->audio_out,
+ this->audio_out->write (this->audio_out,
buf->content,
buf->size/4,
this->pts);