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/FlacIOHandle.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/FlacIOHandle.cxx (renamed from src/decoder/FLACIOHandle.cxx) | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/decoder/FLACIOHandle.cxx b/src/decoder/FlacIOHandle.cxx index 08ec36e48..16a07a9d1 100644 --- a/src/decoder/FLACIOHandle.cxx +++ b/src/decoder/FlacIOHandle.cxx @@ -18,14 +18,14 @@ */ #include "config.h" -#include "FLACIOHandle.hxx" +#include "FlacIOHandle.hxx" #include "io_error.h" #include "gcc.h" #include <errno.h> static size_t -FLACIORead(void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle) +FlacIORead(void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle) { input_stream *is = (input_stream *)handle; @@ -63,7 +63,7 @@ FLACIORead(void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle) } static int -FLACIOSeek(FLAC__IOHandle handle, FLAC__int64 offset, int whence) +FlacIOSeek(FLAC__IOHandle handle, FLAC__int64 offset, int whence) { input_stream *is = (input_stream *)handle; @@ -71,7 +71,7 @@ FLACIOSeek(FLAC__IOHandle handle, FLAC__int64 offset, int whence) } static FLAC__int64 -FLACIOTell(FLAC__IOHandle handle) +FlacIOTell(FLAC__IOHandle handle) { input_stream *is = (input_stream *)handle; @@ -79,7 +79,7 @@ FLACIOTell(FLAC__IOHandle handle) } static int -FLACIOEof(FLAC__IOHandle handle) +FlacIOEof(FLAC__IOHandle handle) { input_stream *is = (input_stream *)handle; @@ -87,7 +87,7 @@ FLACIOEof(FLAC__IOHandle handle) } static int -FLACIOClose(gcc_unused FLAC__IOHandle handle) +FlacIOClose(gcc_unused FLAC__IOHandle handle) { /* no-op because the libFLAC caller is repsonsible for closing the #input_stream */ @@ -96,19 +96,19 @@ FLACIOClose(gcc_unused FLAC__IOHandle handle) } const FLAC__IOCallbacks flac_io_callbacks = { - FLACIORead, + FlacIORead, nullptr, nullptr, nullptr, - FLACIOEof, - FLACIOClose, + FlacIOEof, + FlacIOClose, }; const FLAC__IOCallbacks flac_io_callbacks_seekable = { - FLACIORead, + FlacIORead, nullptr, - FLACIOSeek, - FLACIOTell, - FLACIOEof, - FLACIOClose, + FlacIOSeek, + FlacIOTell, + FlacIOEof, + FlacIOClose, }; |