X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mp3dec_filter.c;h=82f014189d3ccb8ece45652ec17fa80c9a3ee6b6;hp=35448da7e22f67c84e2fb08d8f1ba6b15de2d49f;hb=25518356767bd60bd03ac2f9c6b2381644483925;hpb=645175864a613fc539f46ffa4028742aad3b1b30

diff --git a/mp3dec_filter.c b/mp3dec_filter.c
index 35448da7..82f01418 100644
--- a/mp3dec_filter.c
+++ b/mp3dec_filter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -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,19 +236,7 @@ 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)
-			return -E_BTR_NAVAIL;
-		*result = make_message("%u", pmd->samplerate);
-		return 1;
-	}
-	if (!strcmp(cmd, "channels")) {
-		if (pmd->channels == 0)
-			return -E_BTR_NAVAIL;
-		*result = make_message("%u", pmd->channels);
-		return 1;
-	}
-	return -ERRNO_TO_PARA_ERROR(ENOTSUP);
+	return decoder_execute(cmd, pmd->sample_rate, pmd->channels, result);
 }
 
 static void mp3dec_free_config(void *conf)