X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=oggdec_filter.c;h=1bc6d2f748e8cbe7c3067e3479e91ef771fb7667;hb=481150224edabeee0a6bbfdab232df58e5c1224e;hp=541b0b236452f1c52fc53d0d0476c9207adf0cfa;hpb=77b17730de748201537120c683678cf0e0316de2;p=paraslash.git

diff --git a/oggdec_filter.c b/oggdec_filter.c
index 541b0b23..1bc6d2f7 100644
--- a/oggdec_filter.c
+++ b/oggdec_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.
  */
@@ -35,8 +35,8 @@ struct private_oggdec_data {
 	/** The number of channels of the current stream. */
 	unsigned int channels;
 	/** Current sample rate in Hz. */
-	unsigned int samplerate;
 	struct timeval stream_start;
+	unsigned int sample_rate;
 };
 
 static size_t cb_read(void *buf, size_t size, size_t nmemb, void *datasource)
@@ -121,19 +121,7 @@ static int oggdec_execute(struct btr_node *btrn, const char *cmd, char **result)
 	struct filter_node *fn = btr_context(btrn);
 	struct private_oggdec_data *pod = fn->private_data;
 
-	if (!strcmp(cmd, "samplerate")) {
-		if (pod->samplerate == 0)
-			return -E_BTR_NAVAIL;
-		*result = make_message("%u", pod->samplerate);
-		return 1;
-	}
-	if (!strcmp(cmd, "channels")) {
-		if (pod->channels == 0)
-			return -E_BTR_NAVAIL;
-		*result = make_message("%u", pod->channels);
-		return 1;
-	}
-	return -ERRNO_TO_PARA_ERROR(ENOTSUP);
+	return decoder_execute(cmd, pod->sample_rate, pod->channels, result);
 }
 
 static int ogg_init(struct filter_node *fn)
@@ -178,10 +166,10 @@ open:
 	if (oret < 0)
 		goto out;
 	pod->channels = ov_info(pod->vf, 0)->channels;
-	pod->samplerate = ov_info(pod->vf, 0)->rate;
+	pod->sample_rate = ov_info(pod->vf, 0)->rate;
 	tv_add(now, &(struct timeval)EMBRACE(0, 300 * 1000), &pod->stream_start);
 	PARA_NOTICE_LOG("%d channels, %d Hz\n", pod->channels,
-		pod->samplerate);
+		pod->sample_rate);
 	ret = 1;
 out:
 	if (ret <= 0) {