Cosmetics: Rename samplerate to sample_rate.

[paraslash.git] / oggdec_filter.c

diff --git a/oggdec_filter.c b/oggdec_filter.c
index 541b0b236452f1c52fc53d0d0476c9207adf0cfa..8a40ce0c56192041bac5edcc9e00a76dd82dcaa8 100644 (file)
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@ -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,10 +121,10 @@ 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)
+       if (!strcmp(cmd, "sample_rate")) {
+               if (pod->sample_rate == 0)
                        return -E_BTR_NAVAIL;
-               *result = make_message("%u", pod->samplerate);
+               *result = make_message("%u", pod->sample_rate);
                return 1;
        }
        if (!strcmp(cmd, "channels")) {
@@ -178,10 +178,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) {