X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3dec.c;h=dd7887d51f830409289f389ffa4bd5fd9f897717;hp=af9de5484a0f9f150a153500fef42fd6a2920f9e;hb=633f7c0f0194cd8ec3a478d820f55dd6a752d915;hpb=0d33a2dbe45523cda6b2f2c7bca4992068558d77 diff --git a/mp3dec.c b/mp3dec.c index af9de548..dd7887d5 100644 --- a/mp3dec.c +++ b/mp3dec.c @@ -19,8 +19,8 @@ /** \file mp3dec.c paraslash's mp3 decoder */ #include "para.h" - #include "list.h" +#include "sched.h" #include "filter.h" #include "error.h" #include @@ -67,8 +67,8 @@ next_frame: goto out; return FRAME_HEADER_SIZE; } - fn->fci->samplerate = pmd->frame.header.samplerate; - fn->fci->channels = MAD_NCHANNELS(&pmd->frame.header); + fn->fc->samplerate = pmd->frame.header.samplerate; + fn->fc->channels = MAD_NCHANNELS(&pmd->frame.header); ret = mad_frame_decode(&pmd->frame, &pmd->stream); if (ret) { if (MAD_RECOVERABLE(pmd->stream.error) || pmd->stream.error == MAD_ERROR_BUFLEN) @@ -99,7 +99,7 @@ out: if (pmd->stream.next_frame) { /* we still have some data */ size_t off = pmd->stream.bufend - pmd->stream.next_frame; PARA_DEBUG_LOG("converted %zd, rate: %u, returning %zd\n", len - off, - fn->fci->samplerate, copy - off); + fn->fc->samplerate, copy - off); return copy - off; } return copy;