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

tag_handler: convert to C++

Browse Source
This commit is contained in:
Max Kellermann 2013-07-29 07:32:36 +02:00
parent 96b763067e
commit cde6a3a00c
32 changed files with 58 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.am
View File

@ -226,7 +226,7 @@ src_mpd_SOURCES = \
src/TagPool.cxx src/TagPool.hxx \ src/TagPool.cxx src/TagPool.hxx \
src/TagPrint.cxx src/TagPrint.hxx \ src/TagPrint.cxx src/TagPrint.hxx \
src/TagSave.cxx src/TagSave.hxx \ src/TagSave.cxx src/TagSave.hxx \
src/tag_handler.c src/tag_handler.h \ src/TagHandler.cxx src/TagHandler.hxx \
src/TagFile.cxx src/TagFile.hxx \ src/TagFile.cxx src/TagFile.hxx \
src/TextFile.cxx src/TextFile.hxx \ src/TextFile.cxx src/TextFile.hxx \
src/TextInputStream.cxx \ src/TextInputStream.cxx \
@ -1138,7 +1138,7 @@ test_dump_playlist_SOURCES = test/dump_playlist.cxx \
$(DECODER_SRC) \ $(DECODER_SRC) \
src/IOThread.cxx \ src/IOThread.cxx \
src/Song.cxx src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagSave.cxx \ src/Song.cxx src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagSave.cxx \
src/tag_handler.c src/TagFile.cxx \ src/TagHandler.cxx src/TagFile.cxx \
src/audio_check.c \ src/audio_check.c \
src/TextInputStream.cxx \ src/TextInputStream.cxx \
src/cue/CueParser.cxx src/cue/CueParser.hxx \ src/cue/CueParser.cxx src/cue/CueParser.hxx \
@ -1164,7 +1164,7 @@ test_run_decoder_LDADD = \
test_run_decoder_SOURCES = test/run_decoder.cxx \ test_run_decoder_SOURCES = test/run_decoder.cxx \
test/stdbin.h \ test/stdbin.h \
src/IOThread.cxx \ src/IOThread.cxx \
src/Tag.cxx src/TagNames.c src/TagPool.cxx src/tag_handler.c \ src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagHandler.cxx \
src/ReplayGainInfo.cxx \ src/ReplayGainInfo.cxx \
src/fd_util.c \ src/fd_util.c \
src/audio_check.c \ src/audio_check.c \
@ -1187,7 +1187,7 @@ test_read_tags_LDADD = \
$(GLIB_LIBS) $(GLIB_LIBS)
test_read_tags_SOURCES = test/read_tags.cxx \ test_read_tags_SOURCES = test/read_tags.cxx \
src/IOThread.cxx \ src/IOThread.cxx \
src/Tag.cxx src/TagNames.c src/TagPool.cxx src/tag_handler.c \ src/Tag.cxx src/TagNames.c src/TagPool.cxx src/TagHandler.cxx \
src/ReplayGainInfo.cxx \ src/ReplayGainInfo.cxx \
src/fd_util.c \ src/fd_util.c \
src/audio_check.c \ src/audio_check.c \
@ -1199,7 +1199,7 @@ test_dump_rva2_LDADD = \
$(GLIB_LIBS) $(GLIB_LIBS)
test_dump_rva2_SOURCES = test/dump_rva2.cxx \ test_dump_rva2_SOURCES = test/dump_rva2.cxx \
src/riff.c src/aiff.c \ src/riff.c src/aiff.c \
src/tag_handler.c \ src/TagHandler.cxx \
src/TagId3.cxx \ src/TagId3.cxx \
src/TagRva2.cxx src/TagRva2.cxx
endif endif

2
src/ApeTag.cxx
View File

@ -22,7 +22,7 @@
#include "ApeLoader.hxx" #include "ApeLoader.hxx"
#include "tag.h" #include "tag.h"
#include "tag_table.h" #include "tag_table.h"
#include "tag_handler.h" #include "TagHandler.hxx"
const struct tag_table ape_tags[] = { const struct tag_table ape_tags[] = {
{ "album artist", TAG_ALBUM_ARTIST }, { "album artist", TAG_ALBUM_ARTIST },

5
src/SongUpdate.cxx
View File

@ -28,13 +28,10 @@
#include "input_stream.h" #include "input_stream.h"
#include "DecoderPlugin.hxx" #include "DecoderPlugin.hxx"
#include "DecoderList.hxx" #include "DecoderList.hxx"
#include "TagHandler.hxx"
#include "TagId3.hxx" #include "TagId3.hxx"
#include "ApeTag.hxx" #include "ApeTag.hxx"
extern "C" {
#include "tag_handler.h"
}
#include <glib.h> #include <glib.h>
#include <assert.h> #include <assert.h>

21
src/tag_handler.c → src/TagHandler.cxx
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2003-2011 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -18,14 +18,14 @@
*/ */
#include "config.h" #include "config.h"
#include "tag_handler.h" #include "TagHandler.hxx"
#include <glib.h> #include <glib.h>
static void static void
add_tag_duration(unsigned seconds, void *ctx) add_tag_duration(unsigned seconds, void *ctx)
{ {
struct tag *tag = ctx; struct tag *tag = (struct tag *)ctx;
tag->time = seconds; tag->time = seconds;
} }
@ -33,28 +33,29 @@ add_tag_duration(unsigned seconds, void *ctx)
static void static void
add_tag_tag(enum tag_type type, const char *value, void *ctx) add_tag_tag(enum tag_type type, const char *value, void *ctx)
{ {
struct tag *tag = ctx; struct tag *tag = (struct tag *)ctx;
tag_add_item(tag, type, value); tag_add_item(tag, type, value);
} }
const struct tag_handler add_tag_handler = { const struct tag_handler add_tag_handler = {
.duration = add_tag_duration, add_tag_duration,
.tag = add_tag_tag, add_tag_tag,
nullptr,
}; };
static void static void
full_tag_pair(const char *name, G_GNUC_UNUSED const char *value, void *ctx) full_tag_pair(const char *name, G_GNUC_UNUSED const char *value, void *ctx)
{ {
struct tag *tag = ctx; struct tag *tag = (struct tag *)ctx;
if (g_ascii_strcasecmp(name, "cuesheet") == 0) if (g_ascii_strcasecmp(name, "cuesheet") == 0)
tag->has_playlist = true; tag->has_playlist = true;
} }
const struct tag_handler full_tag_handler = { const struct tag_handler full_tag_handler = {
.duration = add_tag_duration, add_tag_duration,
.tag = add_tag_tag, add_tag_tag,
.pair = full_tag_pair, full_tag_pair,
}; };

24
src/tag_handler.h → src/TagHandler.hxx
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2003-2011 The Music Player Daemon Project * Copyright (C) 2003-2013 The Music Player Daemon Project
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * 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. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#ifndef MPD_TAG_HANDLER_H #ifndef MPD_TAG_HANDLER_HXX
#define MPD_TAG_HANDLER_H #define MPD_TAG_HANDLER_HXX
#include "check.h" #include "check.h"
#include "tag.h" #include "tag.h"
@ -55,9 +55,9 @@ static inline void
tag_handler_invoke_duration(const struct tag_handler *handler, void *ctx, tag_handler_invoke_duration(const struct tag_handler *handler, void *ctx,
unsigned seconds) unsigned seconds)
{ {
assert(handler != NULL); assert(handler != nullptr);
if (handler->duration != NULL) if (handler->duration != nullptr)
handler->duration(seconds, ctx); handler->duration(seconds, ctx);
} }
@ -65,11 +65,11 @@ static inline void
tag_handler_invoke_tag(const struct tag_handler *handler, void *ctx, tag_handler_invoke_tag(const struct tag_handler *handler, void *ctx,
enum tag_type type, const char *value) enum tag_type type, const char *value)
{ {
assert(handler != NULL); assert(handler != nullptr);
assert((unsigned)type < TAG_NUM_OF_ITEM_TYPES); assert((unsigned)type < TAG_NUM_OF_ITEM_TYPES);
assert(value != NULL); assert(value != nullptr);
if (handler->tag != NULL) if (handler->tag != nullptr)
handler->tag(type, value, ctx); handler->tag(type, value, ctx);
} }
@ -77,11 +77,11 @@ static inline void
tag_handler_invoke_pair(const struct tag_handler *handler, void *ctx, tag_handler_invoke_pair(const struct tag_handler *handler, void *ctx,
const char *name, const char *value) const char *name, const char *value)
{ {
assert(handler != NULL); assert(handler != nullptr);
assert(name != NULL); assert(name != nullptr);
assert(value != NULL); assert(value != nullptr);
if (handler->pair != NULL) if (handler->pair != nullptr)
handler->pair(name, value, ctx); handler->pair(name, value, ctx);
} }

2
src/TagId3.cxx
View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "TagId3.hxx" #include "TagId3.hxx"
#include "tag_handler.h" #include "TagHandler.hxx"
#include "tag_table.h" #include "tag_table.h"
#include "tag.h" #include "tag.h"

5
src/UpdateContainer.cxx
View File

@ -27,10 +27,7 @@
#include "DecoderPlugin.hxx" #include "DecoderPlugin.hxx"
#include "Mapper.hxx" #include "Mapper.hxx"
#include "fs/Path.hxx" #include "fs/Path.hxx"
#include "TagHandler.hxx"
extern "C" {
#include "tag_handler.h"
}
#include <glib.h> #include <glib.h>

2
src/decoder/AdPlugDecoderPlugin.cxx
View File

@ -19,7 +19,7 @@
#include "config.h" #include "config.h"
#include "AdPlugDecoderPlugin.h" #include "AdPlugDecoderPlugin.h"
#include "tag_handler.h" #include "TagHandler.hxx"
#include "DecoderAPI.hxx" #include "DecoderAPI.hxx"
extern "C" { extern "C" {

2
src/decoder/AudiofileDecoderPlugin.cxx
View File

@ -21,7 +21,7 @@
#include "AudiofileDecoderPlugin.hxx" #include "AudiofileDecoderPlugin.hxx"
#include "DecoderAPI.hxx" #include "DecoderAPI.hxx"
#include "audio_check.h" #include "audio_check.h"
#include "tag_handler.h" #include "TagHandler.hxx"
#include <audiofile.h> #include <audiofile.h>
#include <af_vfs.h> #include <af_vfs.h>

2
src/decoder/DsdLib.cxx
View File

@ -27,7 +27,7 @@
#include "DsdLib.hxx" #include "DsdLib.hxx"
#include "DecoderAPI.hxx" #include "DecoderAPI.hxx"
#include "util/bit_reverse.h" #include "util/bit_reverse.h"
#include "tag_handler.h" #include "TagHandler.hxx"
#include "TagId3.hxx" #include "TagId3.hxx"
#include <unistd.h> #include <unistd.h>

4
src/decoder/DsdiffDecoderPlugin.cxx
View File

@ -31,9 +31,9 @@
#include "DecoderAPI.hxx" #include "DecoderAPI.hxx"
#include "audio_check.h" #include "audio_check.h"
#include "util/bit_reverse.h" #include "util/bit_reverse.h"
#include "tag_handler.h" #include "TagHandler.hxx"
#include "DsdLib.hxx" #include "DsdLib.hxx"
#include "tag_handler.h" #include "TagHandler.hxx"
#include <unistd.h> #include <unistd.h>
#include <stdio.h> /* for SEEK_SET, SEEK_CUR */ #include <stdio.h> /* for SEEK_SET, SEEK_CUR */

2
src/decoder/DsfDecoderPlugin.cxx
View File

@ -33,7 +33,7 @@
#include "audio_check.h" #include "audio_check.h"
#include "util/bit_reverse.h" #include "util/bit_reverse.h"
#include "DsdLib.hxx" #include "DsdLib.hxx"
#include "tag_handler.h" #include "TagHandler.hxx"
#include <unistd.h> #include <unistd.h>
#include <stdio.h> /* for SEEK_SET, SEEK_CUR */ #include <stdio.h> /* for SEEK_SET, SEEK_CUR */

2
src/decoder/FaadDecoderPlugin.cxx
View File

@ -22,7 +22,7 @@
#include "DecoderAPI.hxx" #include "DecoderAPI.hxx"
#include "DecoderBuffer.hxx" #include "DecoderBuffer.hxx"
#include "audio_check.h" #include "audio_check.h"
#include "tag_handler.h" #include "TagHandler.hxx"
#include <neaacdec.h> #include <neaacdec.h>

2
src/decoder/FfmpegDecoderPlugin.cxx
View File

@ -24,7 +24,7 @@
#include "FfmpegDecoderPlugin.hxx" #include "FfmpegDecoderPlugin.hxx"
#include "DecoderAPI.hxx" #include "DecoderAPI.hxx"
#include "FfmpegMetaData.hxx" #include "FfmpegMetaData.hxx"
#include "tag_handler.h" #include "TagHandler.hxx"
#include "InputStream.hxx" #include "InputStream.hxx"
extern "C" { extern "C" {

2
src/decoder/FfmpegMetaData.cxx
View File

@ -23,7 +23,7 @@
#include "config.h" #include "config.h"
#include "FfmpegMetaData.hxx" #include "FfmpegMetaData.hxx"
#include "tag_table.h" #include "tag_table.h"
#include "tag_handler.h" #include "TagHandler.hxx"
#undef G_LOG_DOMAIN #undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "ffmpeg" #define G_LOG_DOMAIN "ffmpeg"

2
src/decoder/FlacMetadata.cxx
View File

@ -25,7 +25,7 @@ extern "C" {
} }
#include "tag.h" #include "tag.h"
#include "tag_handler.h" #include "TagHandler.hxx"
#include "tag_table.h" #include "tag_table.h"
#include "replay_gain_info.h" #include "replay_gain_info.h"

2
src/decoder/GmeDecoderPlugin.cxx
View File

@ -21,7 +21,7 @@
#include "GmeDecoderPlugin.hxx" #include "GmeDecoderPlugin.hxx"
#include "DecoderAPI.hxx" #include "DecoderAPI.hxx"
#include "audio_check.h" #include "audio_check.h"
#include "tag_handler.h" #include "TagHandler.hxx"
#include "util/UriUtil.hxx" #include "util/UriUtil.hxx"
#include <glib.h> #include <glib.h>

2
src/decoder/MadDecoderPlugin.cxx
View File

@ -23,7 +23,7 @@
#include "conf.h" #include "conf.h"
#include "TagId3.hxx" #include "TagId3.hxx"
#include "TagRva2.hxx" #include "TagRva2.hxx"
#include "tag_handler.h" #include "TagHandler.hxx"
#include "audio_check.h" #include "audio_check.h"
#include <assert.h> #include <assert.h>

2
src/decoder/MikmodDecoderPlugin.cxx
View File

@ -21,7 +21,7 @@
#include "MikmodDecoderPlugin.hxx" #include "MikmodDecoderPlugin.hxx"
#include "DecoderAPI.hxx" #include "DecoderAPI.hxx"
#include "mpd_error.h" #include "mpd_error.h"
#include "tag_handler.h" #include "TagHandler.hxx"
#include <glib.h> #include <glib.h>
#include <mikmod.h> #include <mikmod.h>

2
src/decoder/ModplugDecoderPlugin.cxx
View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "ModplugDecoderPlugin.hxx" #include "ModplugDecoderPlugin.hxx"
#include "DecoderAPI.hxx" #include "DecoderAPI.hxx"
#include "tag_handler.h" #include "TagHandler.hxx"
#include <glib.h> #include <glib.h>
#include <modplug.h> #include <modplug.h>

2
src/decoder/MpcdecDecoderPlugin.cxx
View File

@ -21,7 +21,7 @@
#include "MpcdecDecoderPlugin.hxx" #include "MpcdecDecoderPlugin.hxx"
#include "DecoderAPI.hxx" #include "DecoderAPI.hxx"
#include "audio_check.h" #include "audio_check.h"
#include "tag_handler.h" #include "TagHandler.hxx"
#ifdef MPC_IS_OLD_API #ifdef MPC_IS_OLD_API
#include <mpcdec/mpcdec.h> #include <mpcdec/mpcdec.h>

2
src/decoder/Mpg123DecoderPlugin.cxx
View File

@ -21,7 +21,7 @@
#include "Mpg123DecoderPlugin.hxx" #include "Mpg123DecoderPlugin.hxx"
#include "DecoderAPI.hxx" #include "DecoderAPI.hxx"
#include "audio_check.h" #include "audio_check.h"
#include "tag_handler.h" #include "TagHandler.hxx"
#include <glib.h> #include <glib.h>

2
src/decoder/OpusDecoderPlugin.cxx
View File

@ -27,7 +27,7 @@
#include "DecoderAPI.hxx" #include "DecoderAPI.hxx"
#include "OggCodec.hxx" #include "OggCodec.hxx"
#include "audio_check.h" #include "audio_check.h"
#include "tag_handler.h" #include "TagHandler.hxx"
#include "InputStream.hxx" #include "InputStream.hxx"
#include <opus.h> #include <opus.h>

2
src/decoder/OpusTags.cxx
View File

@ -21,7 +21,7 @@
#include "OpusTags.hxx" #include "OpusTags.hxx"
#include "OpusReader.hxx" #include "OpusReader.hxx"
#include "XiphTags.h" #include "XiphTags.h"
#include "tag_handler.h" #include "TagHandler.hxx"
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>

2
src/decoder/SndfileDecoderPlugin.cxx
View File

@ -21,7 +21,7 @@
#include "SndfileDecoderPlugin.hxx" #include "SndfileDecoderPlugin.hxx"
#include "DecoderAPI.hxx" #include "DecoderAPI.hxx"
#include "audio_check.h" #include "audio_check.h"
#include "tag_handler.h" #include "TagHandler.hxx"
#include <sndfile.h> #include <sndfile.h>

2
src/decoder/VorbisComments.cxx
View File

@ -22,7 +22,7 @@
#include "XiphTags.h" #include "XiphTags.h"
#include "tag.h" #include "tag.h"
#include "tag_table.h" #include "tag_table.h"
#include "tag_handler.h" #include "TagHandler.hxx"
#include "replay_gain_info.h" #include "replay_gain_info.h"
#include <glib.h> #include <glib.h>

2
src/decoder/VorbisDecoderPlugin.cxx
View File

@ -29,7 +29,7 @@ extern "C" {
#include "audio_check.h" #include "audio_check.h"
} }
#include "tag_handler.h" #include "TagHandler.hxx"
#ifndef HAVE_TREMOR #ifndef HAVE_TREMOR
#define OV_EXCLUDE_STATIC_CALLBACKS #define OV_EXCLUDE_STATIC_CALLBACKS

2
src/decoder/WavpackDecoderPlugin.cxx
View File

@ -26,7 +26,7 @@ extern "C" {
#include "audio_check.h" #include "audio_check.h"
} }
#include "tag_handler.h" #include "TagHandler.hxx"
#include "ApeTag.hxx" #include "ApeTag.hxx"
#include <wavpack/wavpack.h> #include <wavpack/wavpack.h>

2
src/decoder/WildmidiDecoderPlugin.cxx
View File

@ -20,7 +20,7 @@
#include "config.h" #include "config.h"
#include "WildmidiDecoderPlugin.hxx" #include "WildmidiDecoderPlugin.hxx"
#include "DecoderAPI.hxx" #include "DecoderAPI.hxx"
#include "tag_handler.h" #include "TagHandler.hxx"
#include "glib_compat.h" #include "glib_compat.h"
#include <glib.h> #include <glib.h>

2
src/decoder/sidplay_decoder_plugin.cxx
View File

@ -21,7 +21,7 @@
#include "../DecoderAPI.hxx" #include "../DecoderAPI.hxx"
extern "C" { extern "C" {
#include "tag_handler.h" #include "TagHandler.hxx"
} }
#include <errno.h> #include <errno.h>

2
src/playlist/EmbeddedCuePlaylistPlugin.cxx
View File

@ -27,7 +27,7 @@
#include "EmbeddedCuePlaylistPlugin.hxx" #include "EmbeddedCuePlaylistPlugin.hxx"
#include "PlaylistPlugin.hxx" #include "PlaylistPlugin.hxx"
#include "tag.h" #include "tag.h"
#include "tag_handler.h" #include "TagHandler.hxx"
#include "TagId3.hxx" #include "TagId3.hxx"
#include "ApeTag.hxx" #include "ApeTag.hxx"
#include "Song.hxx" #include "Song.hxx"

2
test/read_tags.cxx
View File

@ -24,7 +24,7 @@
#include "InputInit.hxx" #include "InputInit.hxx"
#include "InputStream.hxx" #include "InputStream.hxx"
#include "audio_format.h" #include "audio_format.h"
#include "tag_handler.h" #include "TagHandler.hxx"
#include "TagId3.hxx" #include "TagId3.hxx"
#include "ApeTag.hxx" #include "ApeTag.hxx"