From 7a901686f18c37b2cd885bd324916d47b34e7c5a Mon Sep 17 00:00:00 2001 From: Daniel Caujolle-Bert Date: Mon, 7 May 2001 03:40:34 +0000 Subject: Fixed the way to detect libtool version. Add get_capabilities(),get_property() and set_property() to audio out. get_supported_modes removed, use get_cap() instead. Change the way of capabilities, match like video_out AO_CAP_* and AO_PROP_*. Fixed a small typo in demux_mpeg.c. Fixed libmpg123 audio output callings arguments. Change the AO_MODE to AO_CAP_MODE in all required locations. CVS patchset: 69 CVS date: 2001/05/07 03:40:34 --- src/libmpg123/layer2.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/libmpg123/layer2.c') diff --git a/src/libmpg123/layer2.c b/src/libmpg123/layer2.c index 42d680273..ee5a95cef 100644 --- a/src/libmpg123/layer2.c +++ b/src/libmpg123/layer2.c @@ -289,17 +289,17 @@ void do_layer2(metronom_t *metronom, mpgaudio_t *mp, uint32_t pts) if ((!mp->is_output_initialized) || (mp->sample_rate_device != fr->sample_rate)) { if (mp->is_output_initialized) - mp->ao_output->close(); + mp->ao_output->close(mp->ao_output); - mp->ao_output->open (16, fr->sample_rate, - stereo-1 ? AO_MODE_STEREO: AO_MODE_MONO); + mp->ao_output->open (mp->ao_output, 16, fr->sample_rate, + stereo-1 ? AO_CAP_MODE_STEREO: AO_CAP_MODE_MONO); mp->is_output_initialized = 1; mp->sample_rate_device = fr->sample_rate; printf ("layer2\n"); } - mp->ao_output->write_audio_data (metronom, (int16_t*)mp->osspace, num_bytes/(stereo-1 ? 4:2), pts); + mp->ao_output->write_audio_data (mp->ao_output, (int16_t*)mp->osspace, num_bytes/(stereo-1 ? 4:2), pts); } -- cgit v1.2.3