From a24d9cc9b396789f62f6beac29460260b8d6809c Mon Sep 17 00:00:00 2001 From: Andre Noll Date: Wed, 30 Jun 2010 14:09:56 +0200 Subject: [PATCH] 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. --- alsa_write.c | 1 - write.c | 3 ++- write_common.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/alsa_write.c b/alsa_write.c index dfa7a2e1..7f045aad 100644 --- 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; - 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 84110030..424286b5 100644 --- a/write.c +++ b/write.c @@ -37,8 +37,9 @@ struct check_wav_task { int state; /** Number of channels. */ unsigned channels; - unsigned sample_rate; 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; diff --git a/write_common.h b/write_common.h index d26d42c4..331fa460 100644 --- 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); - -- 2.39.5