diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-05-27 23:48:12 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2001-05-27 23:48:12 +0000 |
| commit | e0dafdff5dc592fb47151894a6db3ce0ae045e26 (patch) | |
| tree | 93b4a43ccfde5b0e7b3582ea176ca0b961cdb12f /src/libmpg123/layer2.c | |
| parent | 62386077f664574c0c2193bf0a9b408c1d55ee1a (diff) | |
| download | xine-lib-e0dafdff5dc592fb47151894a6db3ce0ae045e26.tar.gz xine-lib-e0dafdff5dc592fb47151894a6db3ce0ae045e26.tar.bz2 | |
mpg123 decoder plugin, 4/5-channel surround, ac3 pass-through (untested) and minor bugfixes
CVS patchset: 86
CVS date: 2001/05/27 23:48:12
Diffstat (limited to 'src/libmpg123/layer2.c')
| -rw-r--r-- | src/libmpg123/layer2.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/libmpg123/layer2.c b/src/libmpg123/layer2.c index ee5a95cef..c4230ad5d 100644 --- a/src/libmpg123/layer2.c +++ b/src/libmpg123/layer2.c @@ -8,8 +8,6 @@ #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 */ @@ -249,7 +247,7 @@ static void II_select_table(struct frame *fr) fr->II_sblimit = sblim; } -void do_layer2(metronom_t *metronom, mpgaudio_t *mp, uint32_t pts) +void do_layer2(mpgaudio_t *mp) { int clip=0; int i,j; @@ -295,11 +293,11 @@ void do_layer2(metronom_t *metronom, mpgaudio_t *mp, uint32_t pts) 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 (mp->ao_output, (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), + mp->pts); + mp->pts = 0; } |