oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

decoder/flac: rename FlacMetadata.cxx to FlacStreamMetadata.cxx

This commit is contained in:
Max Kellermann 2018-07-07 14:29:49 +02:00
parent 2e116c9e28
commit 24b14c5aa5
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -1201,8 +1201,8 @@ libdecoder_a_SOURCES += \
src/lib/xiph/FlacMetadataIterator.hxx \
src/lib/xiph/FlacIOHandle.cxx src/lib/xiph/FlacIOHandle.hxx \
src/lib/xiph/FlacMetadataChain.cxx src/lib/xiph/FlacMetadataChain.hxx \
src/lib/xiph/FlacStreamMetadata.cxx src/lib/xiph/FlacStreamMetadata.hxx \
src/decoder/plugins/FlacInput.cxx src/decoder/plugins/FlacInput.hxx \
src/decoder/plugins/FlacMetadata.cxx src/decoder/plugins/FlacMetadata.hxx \
src/decoder/plugins/FlacPcm.cxx src/decoder/plugins/FlacPcm.hxx \
src/decoder/plugins/FlacDomain.cxx src/decoder/plugins/FlacDomain.hxx \
src/decoder/plugins/FlacCommon.cxx src/decoder/plugins/FlacCommon.hxx \
@ -2096,8 +2096,7 @@ test_dump_playlist_SOURCES = test/dump_playlist.cxx \
if ENABLE_FLAC
test_dump_playlist_SOURCES += \
src/ReplayGainInfo.cxx \
src/decoder/plugins/FlacMetadata.cxx
src/ReplayGainInfo.cxx
endif
test_run_decoder_LDADD = \

2
src/decoder/plugins/FlacCommon.cxx
View File

@ -23,7 +23,7 @@
#include "config.h"
#include "FlacCommon.hxx"
#include "FlacMetadata.hxx"
#include "lib/xiph/FlacStreamMetadata.hxx"
#include "Log.hxx"
#include "input/InputStream.hxx"

2
src/lib/xiph/FlacMetadataChain.cxx
View File

@ -21,7 +21,7 @@
#include "FlacMetadataChain.hxx"
#include "FlacMetadataIterator.hxx"
#include "FlacIOHandle.hxx"
#include "decoder/plugins/FlacMetadata.hxx"
#include "FlacStreamMetadata.hxx"
bool
FlacMetadataChain::Read(InputStream &is) noexcept

4
src/decoder/plugins/FlacMetadata.cxx → src/lib/xiph/FlacStreamMetadata.cxx
View File

@ -1,5 +1,5 @@
/*
* Copyright 2003-2017 The Music Player Daemon Project
* Copyright 2003-2018 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@ -18,7 +18,7 @@
*/
#include "config.h"
#include "FlacMetadata.hxx"
#include "FlacStreamMetadata.hxx"
#include "lib/xiph/XiphTags.hxx"
#include "MixRampInfo.hxx"
#include "tag/Handler.hxx"

6
src/decoder/plugins/FlacMetadata.hxx → src/lib/xiph/FlacStreamMetadata.hxx
View File

@ -1,5 +1,5 @@
/*
* Copyright 2003-2017 The Music Player Daemon Project
* Copyright 2003-2018 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@ -17,8 +17,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef MPD_FLAC_METADATA_H
#define MPD_FLAC_METADATA_H
#ifndef MPD_FLAC_STREAM_METADATA_HXX
#define MPD_FLAC_STREAM_METADATA_HXX
#include <FLAC/metadata.h>