aboutsummaryrefslogtreecommitdiffstats
path: root/src/decoder
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-10-20 13:32:59 +0200
committerMax Kellermann <max@duempel.org>2013-10-20 13:32:59 +0200
commita78b2d84ed7c2a82c69c56125036e70b009a87b0 (patch)
treec8818c4111e9f2138cb66a38e1664ad5aa432bd4 /src/decoder
parentcf4d80fc655a399615529bdd27e0be284754c5ab (diff)
downloadmpd-a78b2d84ed7c2a82c69c56125036e70b009a87b0.tar.gz
mpd-a78b2d84ed7c2a82c69c56125036e70b009a87b0.tar.xz
mpd-a78b2d84ed7c2a82c69c56125036e70b009a87b0.zip
TagType: rename enum tag_type to TagType
Diffstat (limited to 'src/decoder')
-rw-r--r--src/decoder/AdPlugDecoderPlugin.cxx2
-rw-r--r--src/decoder/DsdiffDecoderPlugin.cxx2
-rw-r--r--src/decoder/FfmpegMetaData.cxx4
-rw-r--r--src/decoder/FlacMetadata.cxx4
-rw-r--r--src/decoder/OpusTags.cxx2
-rw-r--r--src/decoder/VorbisComments.cxx4
-rw-r--r--src/decoder/WavpackDecoderPlugin.cxx4
7 files changed, 11 insertions, 11 deletions
diff --git a/src/decoder/AdPlugDecoderPlugin.cxx b/src/decoder/AdPlugDecoderPlugin.cxx
index daac0a740..39dbf118b 100644
--- a/src/decoder/AdPlugDecoderPlugin.cxx
+++ b/src/decoder/AdPlugDecoderPlugin.cxx
@@ -81,7 +81,7 @@ adplug_file_decode(struct decoder *decoder, const char *path_fs)
}
static void
-adplug_scan_tag(enum tag_type type, const std::string &value,
+adplug_scan_tag(TagType type, const std::string &value,
const struct tag_handler *handler, void *handler_ctx)
{
if (!value.empty())
diff --git a/src/decoder/DsdiffDecoderPlugin.cxx b/src/decoder/DsdiffDecoderPlugin.cxx
index 93002509f..95d4c4844 100644
--- a/src/decoder/DsdiffDecoderPlugin.cxx
+++ b/src/decoder/DsdiffDecoderPlugin.cxx
@@ -202,7 +202,7 @@ static void
dsdiff_handle_native_tag(struct input_stream *is,
const struct tag_handler *handler,
void *handler_ctx, input_stream::offset_type tagoffset,
- enum tag_type type)
+ TagType type)
{
if (!dsdlib_skip_to(nullptr, is, tagoffset))
return;
diff --git a/src/decoder/FfmpegMetaData.cxx b/src/decoder/FfmpegMetaData.cxx
index 9965e4d28..17255f0a4 100644
--- a/src/decoder/FfmpegMetaData.cxx
+++ b/src/decoder/FfmpegMetaData.cxx
@@ -36,7 +36,7 @@ static const struct tag_table ffmpeg_tags[] = {
};
static void
-ffmpeg_copy_metadata(enum tag_type type,
+ffmpeg_copy_metadata(TagType type,
AVDictionary *m, const char *name,
const struct tag_handler *handler, void *handler_ctx)
{
@@ -63,7 +63,7 @@ ffmpeg_scan_dictionary(AVDictionary *dict,
const struct tag_handler *handler, void *handler_ctx)
{
for (unsigned i = 0; i < TAG_NUM_OF_ITEM_TYPES; ++i)
- ffmpeg_copy_metadata(tag_type(i), dict, tag_item_names[i],
+ ffmpeg_copy_metadata(TagType(i), dict, tag_item_names[i],
handler, handler_ctx);
for (const struct tag_table *i = ffmpeg_tags;
diff --git a/src/decoder/FlacMetadata.cxx b/src/decoder/FlacMetadata.cxx
index 078d0c081..99659d143 100644
--- a/src/decoder/FlacMetadata.cxx
+++ b/src/decoder/FlacMetadata.cxx
@@ -152,7 +152,7 @@ flac_comment_value(const FLAC__StreamMetadata_VorbisComment_Entry *entry,
*/
static bool
flac_copy_comment(const FLAC__StreamMetadata_VorbisComment_Entry *entry,
- const char *name, enum tag_type tag_type,
+ const char *name, TagType tag_type,
const struct tag_handler *handler, void *handler_ctx)
{
const char *value;
@@ -193,7 +193,7 @@ flac_scan_comment(const FLAC__StreamMetadata_VorbisComment_Entry *entry,
for (unsigned i = 0; i < TAG_NUM_OF_ITEM_TYPES; ++i)
if (flac_copy_comment(entry,
- tag_item_names[i], (enum tag_type)i,
+ tag_item_names[i], (TagType)i,
handler, handler_ctx))
return;
}
diff --git a/src/decoder/OpusTags.cxx b/src/decoder/OpusTags.cxx
index f09d79c3b..806ab40bd 100644
--- a/src/decoder/OpusTags.cxx
+++ b/src/decoder/OpusTags.cxx
@@ -34,7 +34,7 @@ ScanOneOpusTag(const char *name, const char *value,
tag_handler_invoke_pair(handler, ctx, name, value);
if (handler->tag != nullptr) {
- enum tag_type t = tag_table_lookup_i(xiph_tags, name);
+ TagType t = tag_table_lookup_i(xiph_tags, name);
if (t != TAG_NUM_OF_ITEM_TYPES)
tag_handler_invoke_tag(handler, ctx, t, value);
}
diff --git a/src/decoder/VorbisComments.cxx b/src/decoder/VorbisComments.cxx
index 402ee7c2b..773eca261 100644
--- a/src/decoder/VorbisComments.cxx
+++ b/src/decoder/VorbisComments.cxx
@@ -84,7 +84,7 @@ vorbis_comments_to_replay_gain(struct replay_gain_info *rgi, char **comments)
*/
static bool
vorbis_copy_comment(const char *comment,
- const char *name, enum tag_type tag_type,
+ const char *name, TagType tag_type,
const struct tag_handler *handler, void *handler_ctx)
{
const char *value;
@@ -122,7 +122,7 @@ vorbis_scan_comment(const char *comment,
for (unsigned i = 0; i < TAG_NUM_OF_ITEM_TYPES; ++i)
if (vorbis_copy_comment(comment,
- tag_item_names[i], tag_type(i),
+ tag_item_names[i], TagType(i),
handler, handler_ctx))
return;
}
diff --git a/src/decoder/WavpackDecoderPlugin.cxx b/src/decoder/WavpackDecoderPlugin.cxx
index 56b6efc51..4bdf2122a 100644
--- a/src/decoder/WavpackDecoderPlugin.cxx
+++ b/src/decoder/WavpackDecoderPlugin.cxx
@@ -260,7 +260,7 @@ wavpack_replaygain(struct replay_gain_info *replay_gain_info,
static void
wavpack_scan_tag_item(WavpackContext *wpc, const char *name,
- enum tag_type type,
+ TagType type,
const struct tag_handler *handler, void *handler_ctx)
{
char buffer[1024];
@@ -312,7 +312,7 @@ wavpack_scan_file(const char *fname,
for (unsigned i = 0; i < TAG_NUM_OF_ITEM_TYPES; ++i) {
const char *name = tag_item_names[i];
if (name != nullptr)
- wavpack_scan_tag_item(wpc, name, (enum tag_type)i,
+ wavpack_scan_tag_item(wpc, name, (TagType)i,
handler, handler_ctx);
}