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/FlacDecoderPlugin.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/FlacDecoderPlugin.cxx (renamed from src/decoder/FLACDecoderPlugin.cxx) | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/decoder/FLACDecoderPlugin.cxx b/src/decoder/FlacDecoderPlugin.cxx index 43b604097..cd15b4b29 100644 --- a/src/decoder/FLACDecoderPlugin.cxx +++ b/src/decoder/FlacDecoderPlugin.cxx @@ -18,9 +18,9 @@ */ #include "config.h" /* must be first for large file support */ -#include "FLACDecoderPlugin.h" -#include "FLACCommon.hxx" -#include "FLACMetaData.hxx" +#include "FlacDecoderPlugin.h" +#include "FlacCommon.hxx" +#include "FlacMetadata.hxx" #include "OggCodec.hxx" #include <glib.h> @@ -87,7 +87,7 @@ static bool flac_scan_file(const char *file, const struct tag_handler *handler, void *handler_ctx) { - FLACMetadataChain chain; + FlacMetadataChain chain; if (!chain.Read(file)) { g_debug("Failed to read FLAC tags: %s", chain.GetStatusString()); @@ -102,7 +102,7 @@ static bool flac_scan_stream(struct input_stream *is, const struct tag_handler *handler, void *handler_ctx) { - FLACMetadataChain chain; + FlacMetadataChain chain; if (!chain.Read(is)) { g_debug("Failed to read FLAC tags: %s", chain.GetStatusString()); @@ -214,14 +214,14 @@ static FLAC__StreamDecoderInitStatus stream_init_oggflac(FLAC__StreamDecoder *flac_dec, struct flac_data *data) { return FLAC__stream_decoder_init_ogg_stream(flac_dec, - FLACInput::Read, - FLACInput::Seek, - FLACInput::Tell, - FLACInput::Length, - FLACInput::Eof, + FlacInput::Read, + FlacInput::Seek, + FlacInput::Tell, + FlacInput::Length, + FlacInput::Eof, flac_write_cb, flacMetadata, - FLACInput::Error, + FlacInput::Error, data); } @@ -229,14 +229,14 @@ static FLAC__StreamDecoderInitStatus stream_init_flac(FLAC__StreamDecoder *flac_dec, struct flac_data *data) { return FLAC__stream_decoder_init_stream(flac_dec, - FLACInput::Read, - FLACInput::Seek, - FLACInput::Tell, - FLACInput::Length, - FLACInput::Eof, + FlacInput::Read, + FlacInput::Seek, + FlacInput::Tell, + FlacInput::Length, + FlacInput::Eof, flac_write_cb, flacMetadata, - FLACInput::Error, + FlacInput::Error, data); } @@ -298,7 +298,7 @@ static bool oggflac_scan_file(const char *file, const struct tag_handler *handler, void *handler_ctx) { - FLACMetadataChain chain; + FlacMetadataChain chain; if (!chain.ReadOgg(file)) { g_debug("Failed to read OggFLAC tags: %s", chain.GetStatusString()); @@ -313,7 +313,7 @@ static bool oggflac_scan_stream(struct input_stream *is, const struct tag_handler *handler, void *handler_ctx) { - FLACMetadataChain chain; + FlacMetadataChain chain; if (!chain.ReadOgg(is)) { g_debug("Failed to read OggFLAC tags: %s", chain.GetStatusString()); |