aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-02-28 19:09:54 +0100
committerMax Kellermann <max@duempel.org>2009-02-28 19:09:54 +0100
commit44b55bff8978239b130acd9f5cfe52b9ab2e2b92 (patch)
tree5d8ca5a4e176b6a8912f147cb93b555bac8eda7c
parent2a69aba7bcf078e512f31dec8f8e1c95213ea768 (diff)
downloadmpd-44b55bff8978239b130acd9f5cfe52b9ab2e2b92.tar.gz
mpd-44b55bff8978239b130acd9f5cfe52b9ab2e2b92.tar.xz
mpd-44b55bff8978239b130acd9f5cfe52b9ab2e2b92.zip
audiofile: no CamelCase
Renamed several variables and a function.
-rw-r--r--src/decoder/audiofile_plugin.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/decoder/audiofile_plugin.c b/src/decoder/audiofile_plugin.c
index 2445887df..79a041b62 100644
--- a/src/decoder/audiofile_plugin.c
+++ b/src/decoder/audiofile_plugin.c
@@ -31,7 +31,7 @@
/* pick 1020 since its devisible for 8,16,24, and 32-bit audio */
#define CHUNK_SIZE 1020
-static int getAudiofileTotalTime(const char *file)
+static int audiofile_get_duration(const char *file)
{
int total_time;
AFfilehandle af_fp = afOpenFile(file, "r", NULL);
@@ -79,7 +79,7 @@ audiofile_file_seek(AFvirtualfile *vfile, long offset, int is_relative)
{
struct input_stream *is = (struct input_stream *) vfile->closure;
int whence = (is_relative ? SEEK_CUR : SEEK_SET);
- if (input_stream_seek(is, offset, whence)) {
+ if (input_stream_seek(is, offset, whence)) {
return is->offset;
} else {
return -1;
@@ -101,7 +101,7 @@ setup_virtual_fops(struct input_stream *stream)
}
static void
-audiofile_streamdecode(struct decoder * decoder, struct input_stream *inStream)
+audiofile_stream_decode(struct decoder *decoder, struct input_stream *is)
{
AFvirtualfile *vf;
int fs, frame_count;
@@ -109,11 +109,11 @@ audiofile_streamdecode(struct decoder * decoder, struct input_stream *inStream)
int bits;
struct audio_format audio_format;
float total_time;
- uint16_t bitRate;
+ uint16_t bit_rate;
int ret, current = 0;
char chunk[CHUNK_SIZE];
- vf = setup_virtual_fops(inStream);
+ vf = setup_virtual_fops(is);
af_fp = afOpenVirtualFile(vf, "r", NULL);
if (af_fp == AF_NULL_FILEHANDLE) {
@@ -142,7 +142,7 @@ audiofile_streamdecode(struct decoder * decoder, struct input_stream *inStream)
total_time = ((float)frame_count / (float)audio_format.sample_rate);
- bitRate = (uint16_t)(inStream->size * 8.0 / total_time / 1000.0 + 0.5);
+ bit_rate = (uint16_t)(is->size * 8.0 / total_time / 1000.0 + 0.5);
fs = (int)afGetVirtualFrameSize(af_fp, AF_DEFAULT_TRACK, 1);
@@ -165,7 +165,7 @@ audiofile_streamdecode(struct decoder * decoder, struct input_stream *inStream)
decoder_data(decoder, NULL,
chunk, ret * fs,
(float)current / (float)audio_format.sample_rate,
- bitRate, NULL);
+ bit_rate, NULL);
} while (decoder_get_command(decoder) != DECODE_COMMAND_STOP);
afCloseFile(af_fp);
@@ -174,7 +174,7 @@ audiofile_streamdecode(struct decoder * decoder, struct input_stream *inStream)
static struct tag *audiofile_tag_dup(const char *file)
{
struct tag *ret = NULL;
- int total_time = getAudiofileTotalTime(file);
+ int total_time = audiofile_get_duration(file);
if (total_time >= 0) {
ret = tag_new();
@@ -199,7 +199,7 @@ static const char *const audiofile_mime_types[] = {
const struct decoder_plugin audiofilePlugin = {
.name = "audiofile",
- .stream_decode = audiofile_streamdecode,
+ .stream_decode = audiofile_stream_decode,
.tag_dup = audiofile_tag_dup,
.suffixes = audiofile_suffixes,
.mime_types = audiofile_mime_types,