From 21dac6c05ddff1ce130843a82127618f9ed766a7 Mon Sep 17 00:00:00 2001
From: Denis Krjuchkov <denis@crazydev.net>
Date: Sun, 5 May 2013 18:19:04 +0600
Subject: [PATCH] decoder/FLAC*: rename files and symbols to Flac*
---
Makefile.am | 16 ++++----
src/DecoderList.cxx | 2 +-
.../{FLACCommon.cxx => FlacCommon.cxx} | 8 ++--
.../{FLACCommon.hxx => FlacCommon.hxx} | 4 +-
...ecoderPlugin.cxx => FlacDecoderPlugin.cxx} | 38 +++++++++----------
...LACDecoderPlugin.h => FlacDecoderPlugin.h} | 0
.../{FLACIOHandle.cxx => FlacIOHandle.cxx} | 28 +++++++-------
.../{FLACIOHandle.hxx => FlacIOHandle.hxx} | 4 +-
src/decoder/{FLACInput.cxx => FlacInput.cxx} | 38 +++++++++----------
src/decoder/{FLACInput.hxx => FlacInput.hxx} | 4 +-
.../{FLACMetaData.cxx => FlacMetadata.cxx} | 4 +-
.../{FLACMetaData.hxx => FlacMetadata.hxx} | 14 +++----
src/decoder/{FLAC_PCM.cxx => FlacPcm.cxx} | 2 +-
src/decoder/{FLAC_PCM.hxx => FlacPcm.hxx} | 0
14 files changed, 81 insertions(+), 81 deletions(-)
rename src/decoder/{FLACCommon.cxx => FlacCommon.cxx} (97%)
rename src/decoder/{FLACCommon.hxx => FlacCommon.hxx} (97%)
rename src/decoder/{FLACDecoderPlugin.cxx => FlacDecoderPlugin.cxx} (94%)
rename src/decoder/{FLACDecoderPlugin.h => FlacDecoderPlugin.h} (100%)
rename src/decoder/{FLACIOHandle.cxx => FlacIOHandle.cxx} (85%)
rename src/decoder/{FLACIOHandle.hxx => FlacIOHandle.hxx} (94%)
rename src/decoder/{FLACInput.cxx => FlacInput.cxx} (77%)
rename src/decoder/{FLACInput.hxx => FlacInput.hxx} (97%)
rename src/decoder/{FLACMetaData.cxx => FlacMetadata.cxx} (98%)
rename src/decoder/{FLACMetaData.hxx => FlacMetadata.hxx} (91%)
rename src/decoder/{FLAC_PCM.cxx => FlacPcm.cxx} (99%)
rename src/decoder/{FLAC_PCM.hxx => FlacPcm.hxx} (100%)
diff --git a/Makefile.am b/Makefile.am
index 5fd0a74f7..695b43a5e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -555,13 +555,13 @@ endif
if HAVE_FLAC
libdecoder_plugins_a_SOURCES += \
- src/decoder/FLACInput.cxx src/decoder/FLACInput.hxx \
- src/decoder/FLACIOHandle.cxx src/decoder/FLACIOHandle.hxx \
- src/decoder/FLACMetaData.cxx src/decoder/FLACMetaData.hxx \
- src/decoder/FLAC_PCM.cxx src/decoder/FLAC_PCM.hxx \
- src/decoder/FLACCommon.cxx src/decoder/FLACCommon.hxx \
- src/decoder/FLACDecoderPlugin.cxx \
- src/decoder/FLACDecoderPlugin.h
+ src/decoder/FlacInput.cxx src/decoder/FlacInput.hxx \
+ src/decoder/FlacIOHandle.cxx src/decoder/FlacIOHandle.hxx \
+ src/decoder/FlacMetadata.cxx src/decoder/FlacMetadata.hxx \
+ src/decoder/FlacPcm.cxx src/decoder/FlacPcm.hxx \
+ src/decoder/FlacCommon.cxx src/decoder/FlacCommon.hxx \
+ src/decoder/FlacDecoderPlugin.cxx \
+ src/decoder/FlacDecoderPlugin.h
endif
if HAVE_AUDIOFILE
@@ -1137,7 +1137,7 @@ test_dump_playlist_SOURCES = test/dump_playlist.cxx \
if HAVE_FLAC
test_dump_playlist_SOURCES += \
src/ReplayGainInfo.cxx \
- src/decoder/FLACMetaData.cxx
+ src/decoder/FlacMetadata.cxx
endif
test_run_decoder_LDADD = \
diff --git a/src/DecoderList.cxx b/src/DecoderList.cxx
index aa37c105e..1d33d5deb 100644
--- a/src/DecoderList.cxx
+++ b/src/DecoderList.cxx
@@ -25,7 +25,7 @@
#include "decoder/pcm_decoder_plugin.h"
#include "decoder/dsdiff_decoder_plugin.h"
#include "decoder/dsf_decoder_plugin.h"
-#include "decoder/FLACDecoderPlugin.h"
+#include "decoder/FlacDecoderPlugin.h"
#include "decoder/OpusDecoderPlugin.h"
#include "decoder/VorbisDecoderPlugin.h"
#include "decoder/AdPlugDecoderPlugin.h"
diff --git a/src/decoder/FLACCommon.cxx b/src/decoder/FlacCommon.cxx
similarity index 97%
rename from src/decoder/FLACCommon.cxx
rename to 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),
diff --git a/src/decoder/FLACCommon.hxx b/src/decoder/FlacCommon.hxx
similarity index 97%
rename from src/decoder/FLACCommon.hxx
rename to src/decoder/FlacCommon.hxx
index 20f93c8c7..0cd295e0d 100644
--- a/src/decoder/FLACCommon.hxx
+++ b/src/decoder/FlacCommon.hxx
@@ -24,7 +24,7 @@
#ifndef MPD_FLAC_COMMON_HXX
#define MPD_FLAC_COMMON_HXX
-#include "FLACInput.hxx"
+#include "FlacInput.hxx"
#include "decoder_api.h"
extern "C" {
@@ -37,7 +37,7 @@ extern "C" {
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "flac"
-struct flac_data : public FLACInput {
+struct flac_data : public FlacInput {
struct pcm_buffer buffer;
/**
diff --git a/src/decoder/FLACDecoderPlugin.cxx b/src/decoder/FlacDecoderPlugin.cxx
similarity index 94%
rename from src/decoder/FLACDecoderPlugin.cxx
rename to 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());
diff --git a/src/decoder/FLACDecoderPlugin.h b/src/decoder/FlacDecoderPlugin.h
similarity index 100%
rename from src/decoder/FLACDecoderPlugin.h
rename to src/decoder/FlacDecoderPlugin.h
diff --git a/src/decoder/FLACIOHandle.cxx b/src/decoder/FlacIOHandle.cxx
similarity index 85%
rename from src/decoder/FLACIOHandle.cxx
rename to 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,
};
diff --git a/src/decoder/FLACIOHandle.hxx b/src/decoder/FlacIOHandle.hxx
similarity index 94%
rename from src/decoder/FLACIOHandle.hxx
rename to src/decoder/FlacIOHandle.hxx
index 505d2db1a..3216dafa4 100644
--- a/src/decoder/FLACIOHandle.hxx
+++ b/src/decoder/FlacIOHandle.hxx
@@ -29,13 +29,13 @@ extern const FLAC__IOCallbacks flac_io_callbacks;
extern const FLAC__IOCallbacks flac_io_callbacks_seekable;
static inline FLAC__IOHandle
-ToFLACIOHandle(input_stream *is)
+ToFlacIOHandle(input_stream *is)
{
return (FLAC__IOHandle)is;
}
static inline const FLAC__IOCallbacks &
-GetFLACIOCallbacks(const input_stream *is)
+GetFlacIOCallbacks(const input_stream *is)
{
return is->seekable
? flac_io_callbacks_seekable
diff --git a/src/decoder/FLACInput.cxx b/src/decoder/FlacInput.cxx
similarity index 77%
rename from src/decoder/FLACInput.cxx
rename to src/decoder/FlacInput.cxx
index ba0a86ce8..f5dedd97b 100644
--- a/src/decoder/FLACInput.cxx
+++ b/src/decoder/FlacInput.cxx
@@ -18,13 +18,13 @@
*/
#include "config.h"
-#include "FLACInput.hxx"
+#include "FlacInput.hxx"
#include "decoder_api.h"
#include "gcc.h"
#include "InputStream.hxx"
FLAC__StreamDecoderReadStatus
-FLACInput::Read(FLAC__byte buffer[], size_t *bytes)
+FlacInput::Read(FLAC__byte buffer[], size_t *bytes)
{
size_t r = decoder_read(decoder, input_stream, (void *)buffer, *bytes);
*bytes = r;
@@ -42,7 +42,7 @@ FLACInput::Read(FLAC__byte buffer[], size_t *bytes)
}
FLAC__StreamDecoderSeekStatus
-FLACInput::Seek(FLAC__uint64 absolute_byte_offset)
+FlacInput::Seek(FLAC__uint64 absolute_byte_offset)
{
if (!input_stream->seekable)
return FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED;
@@ -56,7 +56,7 @@ FLACInput::Seek(FLAC__uint64 absolute_byte_offset)
}
FLAC__StreamDecoderTellStatus
-FLACInput::Tell(FLAC__uint64 *absolute_byte_offset)
+FlacInput::Tell(FLAC__uint64 *absolute_byte_offset)
{
if (!input_stream->seekable)
return FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED;
@@ -66,7 +66,7 @@ FLACInput::Tell(FLAC__uint64 *absolute_byte_offset)
}
FLAC__StreamDecoderLengthStatus
-FLACInput::Length(FLAC__uint64 *stream_length)
+FlacInput::Length(FLAC__uint64 *stream_length)
{
if (input_stream->size < 0)
return FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED;
@@ -76,7 +76,7 @@ FLACInput::Length(FLAC__uint64 *stream_length)
}
FLAC__bool
-FLACInput::Eof()
+FlacInput::Eof()
{
return (decoder != nullptr &&
decoder_get_command(decoder) != DECODE_COMMAND_NONE &&
@@ -85,7 +85,7 @@ FLACInput::Eof()
}
void
-FLACInput::Error(FLAC__StreamDecoderErrorStatus status)
+FlacInput::Error(FLAC__StreamDecoderErrorStatus status)
{
if (decoder == nullptr ||
decoder_get_command(decoder) != DECODE_COMMAND_STOP)
@@ -93,56 +93,56 @@ FLACInput::Error(FLAC__StreamDecoderErrorStatus status)
}
FLAC__StreamDecoderReadStatus
-FLACInput::Read(gcc_unused const FLAC__StreamDecoder *flac_decoder,
+FlacInput::Read(gcc_unused const FLAC__StreamDecoder *flac_decoder,
FLAC__byte buffer[], size_t *bytes,
void *client_data)
{
- FLACInput *i = (FLACInput *)client_data;
+ FlacInput *i = (FlacInput *)client_data;
return i->Read(buffer, bytes);
}
FLAC__StreamDecoderSeekStatus
-FLACInput::Seek(gcc_unused const FLAC__StreamDecoder *flac_decoder,
+FlacInput::Seek(gcc_unused const FLAC__StreamDecoder *flac_decoder,
FLAC__uint64 absolute_byte_offset, void *client_data)
{
- FLACInput *i = (FLACInput *)client_data;
+ FlacInput *i = (FlacInput *)client_data;
return i->Seek(absolute_byte_offset);
}
FLAC__StreamDecoderTellStatus
-FLACInput::Tell(gcc_unused const FLAC__StreamDecoder *flac_decoder,
+FlacInput::Tell(gcc_unused const FLAC__StreamDecoder *flac_decoder,
FLAC__uint64 *absolute_byte_offset, void *client_data)
{
- FLACInput *i = (FLACInput *)client_data;
+ FlacInput *i = (FlacInput *)client_data;
return i->Tell(absolute_byte_offset);
}
FLAC__StreamDecoderLengthStatus
-FLACInput::Length(gcc_unused const FLAC__StreamDecoder *flac_decoder,
+FlacInput::Length(gcc_unused const FLAC__StreamDecoder *flac_decoder,
FLAC__uint64 *stream_length, void *client_data)
{
- FLACInput *i = (FLACInput *)client_data;
+ FlacInput *i = (FlacInput *)client_data;
return i->Length(stream_length);
}
FLAC__bool
-FLACInput::Eof(gcc_unused const FLAC__StreamDecoder *flac_decoder,
+FlacInput::Eof(gcc_unused const FLAC__StreamDecoder *flac_decoder,
void *client_data)
{
- FLACInput *i = (FLACInput *)client_data;
+ FlacInput *i = (FlacInput *)client_data;
return i->Eof();
}
void
-FLACInput::Error(gcc_unused const FLAC__StreamDecoder *decoder,
+FlacInput::Error(gcc_unused const FLAC__StreamDecoder *decoder,
FLAC__StreamDecoderErrorStatus status, void *client_data)
{
- FLACInput *i = (FLACInput *)client_data;
+ FlacInput *i = (FlacInput *)client_data;
i->Error(status);
}
diff --git a/src/decoder/FLACInput.hxx b/src/decoder/FlacInput.hxx
similarity index 97%
rename from src/decoder/FLACInput.hxx
rename to src/decoder/FlacInput.hxx
index 7661567d1..8fc69f960 100644
--- a/src/decoder/FLACInput.hxx
+++ b/src/decoder/FlacInput.hxx
@@ -26,13 +26,13 @@
* This class wraps an #input_stream in libFLAC stream decoder
* callbacks.
*/
-class FLACInput {
+class FlacInput {
struct decoder *decoder;
struct input_stream *input_stream;
public:
- FLACInput(struct input_stream *_input_stream,
+ FlacInput(struct input_stream *_input_stream,
struct decoder *_decoder=nullptr)
:decoder(_decoder), input_stream(_input_stream) {}
diff --git a/src/decoder/FLACMetaData.cxx b/src/decoder/FlacMetadata.cxx
similarity index 98%
rename from src/decoder/FLACMetaData.cxx
rename to src/decoder/FlacMetadata.cxx
index 8273a230b..694c88c8f 100644
--- a/src/decoder/FLACMetaData.cxx
+++ b/src/decoder/FlacMetadata.cxx
@@ -18,7 +18,7 @@
*/
#include "config.h"
-#include "FLACMetaData.hxx"
+#include "FlacMetadata.hxx"
extern "C" {
#include "XiphTags.h"
@@ -239,7 +239,7 @@ flac_vorbis_comments_to_tag(struct tag *tag,
}
void
-FLACMetadataChain::Scan(const struct tag_handler *handler, void *handler_ctx)
+FlacMetadataChain::Scan(const struct tag_handler *handler, void *handler_ctx)
{
FLACMetadataIterator iterator(*this);
diff --git a/src/decoder/FLACMetaData.hxx b/src/decoder/FlacMetadata.hxx
similarity index 91%
rename from src/decoder/FLACMetaData.hxx
rename to 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);
diff --git a/src/decoder/FLAC_PCM.cxx b/src/decoder/FlacPcm.cxx
similarity index 99%
rename from src/decoder/FLAC_PCM.cxx
rename to src/decoder/FlacPcm.cxx
index 303530aa7..82896bd24 100644
--- a/src/decoder/FLAC_PCM.cxx
+++ b/src/decoder/FlacPcm.cxx
@@ -18,7 +18,7 @@
*/
#include "config.h"
-#include "FLAC_PCM.hxx"
+#include "FlacPcm.hxx"
#include <assert.h>
diff --git a/src/decoder/FLAC_PCM.hxx b/src/decoder/FlacPcm.hxx
similarity index 100%
rename from src/decoder/FLAC_PCM.hxx
rename to src/decoder/FlacPcm.hxx