Cosmetics: Rename samplerate to sample_rate.

A subsequent patch will introduce sample_format which looks much nicer
than sampleformat. So let's use the underscored variant throughout.

diff --git a/alsa_write.c b/alsa_write.c
index dfa7a2e1a5ba068da9e457068e50eeccdf079ad3..7f045aad9f5d426c7b09d0d61fadc1cb89094504 100644 (file)
--- a/alsa_write.c
+++ b/alsa_write.c
@@ -46,7 +46,6 @@ struct private_alsa_write_data {
         * of the writer node group.
         */
        unsigned sample_rate;
         * of the writer node group.
         */
        unsigned sample_rate;

-

        snd_pcm_format_t sample_format;
        /**
         * The number of channels, given by command line option or the
        snd_pcm_format_t sample_format;
        /**
         * The number of channels, given by command line option or the

diff --git a/write.c b/write.c
index 8411003027e33ad3a9bcc43962efcf65547dea04..424286b5a4c21613517d632777d3052578e869fd 100644 (file)
--- a/write.c
+++ b/write.c
@@ -37,8 +37,9 @@ struct check_wav_task {
        int state;
        /** Number of channels. */
        unsigned channels;
        int state;
        /** Number of channels. */
        unsigned channels;

-       unsigned sample_rate;

        unsigned sample_format;
        unsigned sample_format;

+       /** Sample rate specified in wav header given by \a buf. */
+       unsigned sample_rate;

        /** The task structure used by the scheduler. */
        struct task task;
        struct btr_node *btrn;
        /** The task structure used by the scheduler. */
        struct task task;
        struct btr_node *btrn;

diff --git a/write_common.h b/write_common.h
index d26d42c4d8e6e4f775aa6e7df57300cd587daa6b..331fa460c3c484da1244e9999d12300455fd017d 100644 (file)
--- a/write_common.h
+++ b/write_common.h
@@ -15,4 +15,3 @@ int setup_writer_node(const char *arg, struct btr_node *parent,
 void get_btr_sample_rate(struct btr_node *btrn, int32_t *result);
 void get_btr_channels(struct btr_node *btrn, int32_t *result);
 void get_btr_sample_format(struct btr_node *btrn, int32_t *result);
 void get_btr_sample_rate(struct btr_node *btrn, int32_t *result);
 void get_btr_channels(struct btr_node *btrn, int32_t *result);
 void get_btr_sample_format(struct btr_node *btrn, int32_t *result);

-