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/FlacCommon.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/FlacCommon.cxx (renamed from src/decoder/FLACCommon.cxx) | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/decoder/FLACCommon.cxx b/src/decoder/FlacCommon.cxx index 25fd1f964..425ab55df 100644 --- a/src/decoder/FLACCommon.cxx +++ b/src/decoder/FlacCommon.cxx @@ -22,9 +22,9 @@ */ #include "config.h" -#include "FLACCommon.hxx" -#include "FLACMetaData.hxx" -#include "FLAC_PCM.hxx" +#include "FlacCommon.hxx" +#include "FlacMetadata.hxx" +#include "FlacPcm.hxx" extern "C" { #include "audio_check.h" @@ -36,7 +36,7 @@ extern "C" { flac_data::flac_data(struct decoder *_decoder, struct input_stream *_input_stream) - :FLACInput(_input_stream, _decoder), + :FlacInput(_input_stream, _decoder), initialized(false), unsupported(false), total_frames(0), first_frame(0), next_frame(0), position(0), decoder(_decoder), input_stream(_input_stream), |