X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=mp3dec_filter.c;h=f03fbb76d4c004f1b439bb26bbfbe6414d7b07cf;hb=d4d37bb32a8d6219f9f52aa2ee3de55eb7e099c8;hp=35448da7e22f67c84e2fb08d8f1ba6b15de2d49f;hpb=645175864a613fc539f46ffa4028742aad3b1b30;p=paraslash.git diff --git a/mp3dec_filter.c b/mp3dec_filter.c index 35448da7..f03fbb76 100644 --- a/mp3dec_filter.c +++ b/mp3dec_filter.c @@ -50,7 +50,7 @@ struct private_mp3dec_data { /** The number of channels of the current stream. */ unsigned int channels; /** Current sample rate in Hz. */ - unsigned int samplerate; + unsigned int sample_rate; }; static int need_bad_data_delay(struct private_mp3dec_data *pmd, @@ -165,7 +165,7 @@ next_frame: goto next_buffer; } fn->min_iqs = 0; - pmd->samplerate = pmd->frame.header.samplerate; + pmd->sample_rate = pmd->frame.header.samplerate; pmd->channels = MAD_NCHANNELS(&pmd->frame.header); ret = mad_frame_decode(&pmd->frame, &pmd->stream); if (ret != 0) { @@ -236,10 +236,10 @@ static int mp3dec_execute(struct btr_node *btrn, const char *cmd, char **result) struct filter_node *fn = btr_context(btrn); struct private_mp3dec_data *pmd = fn->private_data; - if (!strcmp(cmd, "samplerate")) { - if (pmd->samplerate == 0) + if (!strcmp(cmd, "sample_rate")) { + if (pmd->sample_rate == 0) return -E_BTR_NAVAIL; - *result = make_message("%u", pmd->samplerate); + *result = make_message("%u", pmd->sample_rate); return 1; } if (!strcmp(cmd, "channels")) {