diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-05-07 03:40:34 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-05-07 03:40:34 +0000 |
| commit | 7a901686f18c37b2cd885bd324916d47b34e7c5a (patch) | |
| tree | 471f3f5e6919d82dc3c848fe1ab50db2625285b6 /src/libmpg123 | |
| parent | 2866aa5a2be3ef68979648fe550a208bd65416ae (diff) | |
| download | xine-lib-7a901686f18c37b2cd885bd324916d47b34e7c5a.tar.gz xine-lib-7a901686f18c37b2cd885bd324916d47b34e7c5a.tar.bz2 | |
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
Diffstat (limited to 'src/libmpg123')
| -rw-r--r-- | src/libmpg123/layer1.c | 8 | ||||
| -rw-r--r-- | src/libmpg123/layer2.c | 8 | ||||
| -rw-r--r-- | src/libmpg123/layer3.c | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/src/libmpg123/layer1.c b/src/libmpg123/layer1.c index a4e8075de..b10c938fd 100644 --- a/src/libmpg123/layer1.c +++ b/src/libmpg123/layer1.c @@ -149,17 +149,17 @@ void do_layer1(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 ("layer1\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); } 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); } diff --git a/src/libmpg123/layer3.c b/src/libmpg123/layer3.c index 697415834..89b11776d 100644 --- a/src/libmpg123/layer3.c +++ b/src/libmpg123/layer3.c @@ -1599,15 +1599,15 @@ void do_layer3(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 ("layer3\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); } |