diff options
author | Max Kellermann <max@duempel.org> | 2013-06-24 16:17:46 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2013-06-24 16:17:46 +0200 |
commit | ef48eca9cac875f65622daf500bd702e20d666f3 (patch) | |
tree | 52fe455c347fd0f0ab14b471e2482c17c8aed5e6 /src/decoder/FlacInput.cxx | |
parent | 906d2fbadf075b7d8e3a5be7134a9bebb09b7285 (diff) | |
parent | e9e55b08127dc45b4c6045e1f42e34115086a521 (diff) | |
download | mpd-ef48eca9cac875f65622daf500bd702e20d666f3.tar.gz mpd-ef48eca9cac875f65622daf500bd702e20d666f3.tar.xz mpd-ef48eca9cac875f65622daf500bd702e20d666f3.zip |
Merge branch 'master' of git://git.musicpd.org/dk/mpd
Diffstat (limited to '')
-rw-r--r-- | src/decoder/FlacInput.cxx (renamed from src/decoder/FLACInput.cxx) | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/decoder/FLACInput.cxx b/src/decoder/FlacInput.cxx index ba0a86ce8..f5dedd97b 100644 --- a/src/decoder/FLACInput.cxx +++ b/src/decoder/FlacInput.cxx @@ -18,13 +18,13 @@ */ #include "config.h" -#include "FLACInput.hxx" +#include "FlacInput.hxx" #include "decoder_api.h" #include "gcc.h" #include "InputStream.hxx" FLAC__StreamDecoderReadStatus -FLACInput::Read(FLAC__byte buffer[], size_t *bytes) +FlacInput::Read(FLAC__byte buffer[], size_t *bytes) { size_t r = decoder_read(decoder, input_stream, (void *)buffer, *bytes); *bytes = r; @@ -42,7 +42,7 @@ FLACInput::Read(FLAC__byte buffer[], size_t *bytes) } FLAC__StreamDecoderSeekStatus -FLACInput::Seek(FLAC__uint64 absolute_byte_offset) +FlacInput::Seek(FLAC__uint64 absolute_byte_offset) { if (!input_stream->seekable) return FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED; @@ -56,7 +56,7 @@ FLACInput::Seek(FLAC__uint64 absolute_byte_offset) } FLAC__StreamDecoderTellStatus -FLACInput::Tell(FLAC__uint64 *absolute_byte_offset) +FlacInput::Tell(FLAC__uint64 *absolute_byte_offset) { if (!input_stream->seekable) return FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED; @@ -66,7 +66,7 @@ FLACInput::Tell(FLAC__uint64 *absolute_byte_offset) } FLAC__StreamDecoderLengthStatus -FLACInput::Length(FLAC__uint64 *stream_length) +FlacInput::Length(FLAC__uint64 *stream_length) { if (input_stream->size < 0) return FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED; @@ -76,7 +76,7 @@ FLACInput::Length(FLAC__uint64 *stream_length) } FLAC__bool -FLACInput::Eof() +FlacInput::Eof() { return (decoder != nullptr && decoder_get_command(decoder) != DECODE_COMMAND_NONE && @@ -85,7 +85,7 @@ FLACInput::Eof() } void -FLACInput::Error(FLAC__StreamDecoderErrorStatus status) +FlacInput::Error(FLAC__StreamDecoderErrorStatus status) { if (decoder == nullptr || decoder_get_command(decoder) != DECODE_COMMAND_STOP) @@ -93,56 +93,56 @@ FLACInput::Error(FLAC__StreamDecoderErrorStatus status) } FLAC__StreamDecoderReadStatus -FLACInput::Read(gcc_unused const FLAC__StreamDecoder *flac_decoder, +FlacInput::Read(gcc_unused const FLAC__StreamDecoder *flac_decoder, FLAC__byte buffer[], size_t *bytes, void *client_data) { - FLACInput *i = (FLACInput *)client_data; + FlacInput *i = (FlacInput *)client_data; return i->Read(buffer, bytes); } FLAC__StreamDecoderSeekStatus -FLACInput::Seek(gcc_unused const FLAC__StreamDecoder *flac_decoder, +FlacInput::Seek(gcc_unused const FLAC__StreamDecoder *flac_decoder, FLAC__uint64 absolute_byte_offset, void *client_data) { - FLACInput *i = (FLACInput *)client_data; + FlacInput *i = (FlacInput *)client_data; return i->Seek(absolute_byte_offset); } FLAC__StreamDecoderTellStatus -FLACInput::Tell(gcc_unused const FLAC__StreamDecoder *flac_decoder, +FlacInput::Tell(gcc_unused const FLAC__StreamDecoder *flac_decoder, FLAC__uint64 *absolute_byte_offset, void *client_data) { - FLACInput *i = (FLACInput *)client_data; + FlacInput *i = (FlacInput *)client_data; return i->Tell(absolute_byte_offset); } FLAC__StreamDecoderLengthStatus -FLACInput::Length(gcc_unused const FLAC__StreamDecoder *flac_decoder, +FlacInput::Length(gcc_unused const FLAC__StreamDecoder *flac_decoder, FLAC__uint64 *stream_length, void *client_data) { - FLACInput *i = (FLACInput *)client_data; + FlacInput *i = (FlacInput *)client_data; return i->Length(stream_length); } FLAC__bool -FLACInput::Eof(gcc_unused const FLAC__StreamDecoder *flac_decoder, +FlacInput::Eof(gcc_unused const FLAC__StreamDecoder *flac_decoder, void *client_data) { - FLACInput *i = (FLACInput *)client_data; + FlacInput *i = (FlacInput *)client_data; return i->Eof(); } void -FLACInput::Error(gcc_unused const FLAC__StreamDecoder *decoder, +FlacInput::Error(gcc_unused const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) { - FLACInput *i = (FLACInput *)client_data; + FlacInput *i = (FlacInput *)client_data; i->Error(status); } |