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/FlacMetadata.hxx | |
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/FlacMetadata.hxx (renamed from src/decoder/FLACMetaData.hxx) | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/decoder/FLACMetaData.hxx b/src/decoder/FlacMetadata.hxx index 0eceec23c..cce34c3a7 100644 --- a/src/decoder/FLACMetaData.hxx +++ b/src/decoder/FlacMetadata.hxx @@ -21,19 +21,19 @@ #define MPD_FLAC_METADATA_H #include "gcc.h" -#include "FLACIOHandle.hxx" +#include "FlacIOHandle.hxx" #include <FLAC/metadata.h> #include <assert.h> -class FLACMetadataChain { +class FlacMetadataChain { FLAC__Metadata_Chain *chain; public: - FLACMetadataChain():chain(::FLAC__metadata_chain_new()) {} + FlacMetadataChain():chain(::FLAC__metadata_chain_new()) {} - ~FLACMetadataChain() { + ~FlacMetadataChain() { ::FLAC__metadata_chain_delete(chain); } @@ -52,7 +52,7 @@ public: } bool Read(input_stream *is) { - return Read(::ToFLACIOHandle(is), ::GetFLACIOCallbacks(is)); + return Read(::ToFlacIOHandle(is), ::GetFlacIOCallbacks(is)); } bool ReadOgg(const char *path) { @@ -66,7 +66,7 @@ public: } bool ReadOgg(input_stream *is) { - return ReadOgg(::ToFLACIOHandle(is), ::GetFLACIOCallbacks(is)); + return ReadOgg(::ToFlacIOHandle(is), ::GetFlacIOCallbacks(is)); } gcc_pure @@ -88,7 +88,7 @@ class FLACMetadataIterator { public: FLACMetadataIterator():iterator(::FLAC__metadata_iterator_new()) {} - FLACMetadataIterator(FLACMetadataChain &chain) + FLACMetadataIterator(FlacMetadataChain &chain) :iterator(::FLAC__metadata_iterator_new()) { ::FLAC__metadata_iterator_init(iterator, (FLAC__Metadata_Chain *)chain); |