diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-04-27 10:42:38 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-04-27 10:42:38 +0000 |
| commit | a1f5ebe0d19b2552ef6f3c4a099f140249b81d58 (patch) | |
| tree | 7bf6c5f908bb39a5320cad7bd6420476ef397d7c /src/libmpg123/layer2.c | |
| parent | 34eb54c49bb64f74e8ef8945fb40d4172bb271f5 (diff) | |
| download | xine-lib-a1f5ebe0d19b2552ef6f3c4a099f140249b81d58.tar.gz xine-lib-a1f5ebe0d19b2552ef6f3c4a099f140249b81d58.tar.bz2 | |
Audio out compile again. Change prototypes in audio out, libac3 and
libmpg123, passing the metronom arg.
CVS patchset: 34
CVS date: 2001/04/27 10:42:38
Diffstat (limited to 'src/libmpg123/layer2.c')
| -rw-r--r-- | src/libmpg123/layer2.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/libmpg123/layer2.c b/src/libmpg123/layer2.c index 8c320f11b..738825995 100644 --- a/src/libmpg123/layer2.c +++ b/src/libmpg123/layer2.c @@ -8,6 +8,8 @@ #include "mpg123.h" #include "l2tables.h" +#include "metronom.h" + static int grp_3tab[32 * 3] = { 0, }; /* used: 27 */ static int grp_5tab[128 * 3] = { 0, }; /* used: 125 */ static int grp_9tab[1024 * 3] = { 0, }; /* used: 729 */ @@ -247,7 +249,7 @@ static void II_select_table(struct frame *fr) fr->II_sblimit = sblim; } -void do_layer2(mpgaudio_t *mp, uint32_t pts) +void do_layer2(metronom_t *metronom, mpgaudio_t *mp, uint32_t pts) { int clip=0; int i,j; @@ -285,7 +287,7 @@ void do_layer2(mpgaudio_t *mp, uint32_t pts) } if (!mp->is_output_initialized) { - mp->ao_output->open (16, fr->sample_rate, + mp->ao_output->open (metronom, 16, fr->sample_rate, stereo-1 ? AO_MODE_STEREO: AO_MODE_MONO); mp->is_output_initialized = 1; @@ -293,7 +295,7 @@ void do_layer2(mpgaudio_t *mp, uint32_t pts) } - mp->ao_output->write_audio_data ((int16_t*)mp->osspace, num_bytes/(stereo-1 ? 4:2), pts); + mp->ao_output->write_audio_data (metronom, (int16_t*)mp->osspace, num_bytes/(stereo-1 ? 4:2), pts); } |