diff options
Diffstat (limited to 'src/decoder')
31 files changed, 64 insertions, 62 deletions
diff --git a/src/decoder/DecoderPlugin.hxx b/src/decoder/DecoderPlugin.hxx index 7aab05615..a2618373f 100644 --- a/src/decoder/DecoderPlugin.hxx +++ b/src/decoder/DecoderPlugin.hxx @@ -24,7 +24,7 @@ struct ConfigBlock; class InputStream; -struct tag_handler; +struct TagHandler; class Path; /** @@ -74,7 +74,7 @@ struct DecoderPlugin { * @return false if the operation has failed */ bool (*scan_file)(Path path_fs, - const struct tag_handler *handler, + const TagHandler *handler, void *handler_ctx); /** @@ -83,7 +83,7 @@ struct DecoderPlugin { * @return false if the operation has failed */ bool (*scan_stream)(InputStream &is, - const struct tag_handler *handler, + const TagHandler *handler, void *handler_ctx); /** @@ -145,7 +145,7 @@ struct DecoderPlugin { */ template<typename P> bool ScanFile(P path_fs, - const tag_handler &handler, void *handler_ctx) const { + const TagHandler &handler, void *handler_ctx) const { return scan_file != nullptr ? scan_file(path_fs, &handler, handler_ctx) : false; @@ -155,7 +155,7 @@ struct DecoderPlugin { * Read the tag of a stream. */ bool ScanStream(InputStream &is, - const tag_handler &handler, void *handler_ctx) const { + const TagHandler &handler, void *handler_ctx) const { return scan_stream != nullptr ? scan_stream(is, &handler, handler_ctx) : false; diff --git a/src/decoder/plugins/AdPlugDecoderPlugin.cxx b/src/decoder/plugins/AdPlugDecoderPlugin.cxx index dd3f2b7ff..ae416de5e 100644 --- a/src/decoder/plugins/AdPlugDecoderPlugin.cxx +++ b/src/decoder/plugins/AdPlugDecoderPlugin.cxx @@ -89,7 +89,7 @@ adplug_file_decode(Decoder &decoder, Path path_fs) static void adplug_scan_tag(TagType type, const std::string &value, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { if (!value.empty()) tag_handler_invoke_tag(handler, handler_ctx, @@ -98,7 +98,7 @@ adplug_scan_tag(TagType type, const std::string &value, static bool adplug_scan_file(Path path_fs, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { CEmuopl opl(sample_rate, true, true); opl.init(); diff --git a/src/decoder/plugins/AudiofileDecoderPlugin.cxx b/src/decoder/plugins/AudiofileDecoderPlugin.cxx index 7d59d9460..eb621e8f0 100644 --- a/src/decoder/plugins/AudiofileDecoderPlugin.cxx +++ b/src/decoder/plugins/AudiofileDecoderPlugin.cxx @@ -263,7 +263,7 @@ audiofile_get_duration(InputStream &is) static bool audiofile_scan_stream(InputStream &is, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { const auto duration = audiofile_get_duration(is); if (duration.IsNegative()) diff --git a/src/decoder/plugins/DsdLib.cxx b/src/decoder/plugins/DsdLib.cxx index 8fefbb48c..90c37d02d 100644 --- a/src/decoder/plugins/DsdLib.cxx +++ b/src/decoder/plugins/DsdLib.cxx @@ -106,7 +106,7 @@ dsdlib_valid_freq(uint32_t samplefreq) #ifdef ENABLE_ID3TAG void dsdlib_tag_id3(InputStream &is, - const struct tag_handler *handler, + const TagHandler *handler, void *handler_ctx, offset_type tagoffset) { if (tagoffset == 0 || !is.KnownSize()) diff --git a/src/decoder/plugins/DsdLib.hxx b/src/decoder/plugins/DsdLib.hxx index 27cd0d37f..e4007ed2d 100644 --- a/src/decoder/plugins/DsdLib.hxx +++ b/src/decoder/plugins/DsdLib.hxx @@ -28,6 +28,7 @@ #include <stdint.h> struct Decoder; +struct TagHandler; class InputStream; struct DsdId { @@ -80,7 +81,7 @@ dsdlib_valid_freq(uint32_t samplefreq); */ void dsdlib_tag_id3(InputStream &is, - const struct tag_handler *handler, + const TagHandler *handler, void *handler_ctx, offset_type tagoffset); #endif diff --git a/src/decoder/plugins/DsdiffDecoderPlugin.cxx b/src/decoder/plugins/DsdiffDecoderPlugin.cxx index bd587e0ce..afd3af7ca 100644 --- a/src/decoder/plugins/DsdiffDecoderPlugin.cxx +++ b/src/decoder/plugins/DsdiffDecoderPlugin.cxx @@ -187,7 +187,7 @@ dsdiff_read_prop(Decoder *decoder, InputStream &is, static void dsdiff_handle_native_tag(InputStream &is, - const struct tag_handler *handler, + const TagHandler *handler, void *handler_ctx, offset_type tagoffset, TagType type) { @@ -229,7 +229,7 @@ static bool dsdiff_read_metadata_extra(Decoder *decoder, InputStream &is, DsdiffMetaData *metadata, DsdiffChunkHeader *chunk_header, - const struct tag_handler *handler, + const TagHandler *handler, void *handler_ctx) { @@ -456,7 +456,7 @@ dsdiff_stream_decode(Decoder &decoder, InputStream &is) static bool dsdiff_scan_stream(InputStream &is, - gcc_unused const struct tag_handler *handler, + gcc_unused const TagHandler *handler, gcc_unused void *handler_ctx) { DsdiffMetaData metadata; diff --git a/src/decoder/plugins/DsfDecoderPlugin.cxx b/src/decoder/plugins/DsfDecoderPlugin.cxx index b111dbd51..558c34b0b 100644 --- a/src/decoder/plugins/DsfDecoderPlugin.cxx +++ b/src/decoder/plugins/DsfDecoderPlugin.cxx @@ -331,7 +331,7 @@ dsf_stream_decode(Decoder &decoder, InputStream &is) static bool dsf_scan_stream(InputStream &is, - gcc_unused const struct tag_handler *handler, + gcc_unused const TagHandler *handler, gcc_unused void *handler_ctx) { /* check DSF metadata */ diff --git a/src/decoder/plugins/FaadDecoderPlugin.cxx b/src/decoder/plugins/FaadDecoderPlugin.cxx index 8ea2b685c..f2c83c400 100644 --- a/src/decoder/plugins/FaadDecoderPlugin.cxx +++ b/src/decoder/plugins/FaadDecoderPlugin.cxx @@ -419,7 +419,7 @@ faad_stream_decode(Decoder &mpd_decoder, InputStream &is) static bool faad_scan_stream(InputStream &is, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { auto result = faad_get_file_time(is); if (!result.first) diff --git a/src/decoder/plugins/FfmpegDecoderPlugin.cxx b/src/decoder/plugins/FfmpegDecoderPlugin.cxx index 89db836c3..194515e70 100644 --- a/src/decoder/plugins/FfmpegDecoderPlugin.cxx +++ b/src/decoder/plugins/FfmpegDecoderPlugin.cxx @@ -390,14 +390,14 @@ FfmpegParseMetaData(Decoder &decoder, static void FfmpegScanMetadata(const AVStream &stream, - const tag_handler &handler, void *handler_ctx) + const TagHandler &handler, void *handler_ctx) { FfmpegScanDictionary(stream.metadata, &handler, handler_ctx); } static void FfmpegScanMetadata(const AVFormatContext &format_context, int audio_stream, - const tag_handler &handler, void *handler_ctx) + const TagHandler &handler, void *handler_ctx) { assert(audio_stream >= 0); @@ -614,7 +614,7 @@ ffmpeg_decode(Decoder &decoder, InputStream &input) static bool FfmpegScanStream(AVFormatContext &format_context, - const struct tag_handler &handler, void *handler_ctx) + const TagHandler &handler, void *handler_ctx) { const int find_result = avformat_find_stream_info(&format_context, nullptr); @@ -638,7 +638,7 @@ FfmpegScanStream(AVFormatContext &format_context, static bool ffmpeg_scan_stream(InputStream &is, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { AVInputFormat *input_format = ffmpeg_probe(nullptr, is); if (input_format == nullptr) diff --git a/src/decoder/plugins/FfmpegMetaData.cxx b/src/decoder/plugins/FfmpegMetaData.cxx index 102d5669e..b0ada4323 100644 --- a/src/decoder/plugins/FfmpegMetaData.cxx +++ b/src/decoder/plugins/FfmpegMetaData.cxx @@ -42,7 +42,7 @@ static constexpr struct tag_table ffmpeg_tags[] = { static void FfmpegScanTag(TagType type, AVDictionary *m, const char *name, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { AVDictionaryEntry *mt = nullptr; @@ -53,7 +53,7 @@ FfmpegScanTag(TagType type, static void FfmpegScanPairs(AVDictionary *dict, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { AVDictionaryEntry *i = nullptr; @@ -64,7 +64,7 @@ FfmpegScanPairs(AVDictionary *dict, void FfmpegScanDictionary(AVDictionary *dict, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { if (handler->tag != nullptr) { for (unsigned i = 0; i < TAG_NUM_OF_ITEM_TYPES; ++i) diff --git a/src/decoder/plugins/FfmpegMetaData.hxx b/src/decoder/plugins/FfmpegMetaData.hxx index bdf5dd613..fdeaba727 100644 --- a/src/decoder/plugins/FfmpegMetaData.hxx +++ b/src/decoder/plugins/FfmpegMetaData.hxx @@ -21,10 +21,10 @@ #define MPD_FFMPEG_METADATA_HXX struct AVDictionary; -struct tag_handler; +struct TagHandler; void FfmpegScanDictionary(AVDictionary *dict, - const tag_handler *handler, void *handler_ctx); + const TagHandler *handler, void *handler_ctx); #endif diff --git a/src/decoder/plugins/FlacDecoderPlugin.cxx b/src/decoder/plugins/FlacDecoderPlugin.cxx index 410af9267..de812c1f4 100644 --- a/src/decoder/plugins/FlacDecoderPlugin.cxx +++ b/src/decoder/plugins/FlacDecoderPlugin.cxx @@ -82,7 +82,7 @@ flac_write_cb(const FLAC__StreamDecoder *dec, const FLAC__Frame *frame, static bool flac_scan_file(Path path_fs, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { FlacMetadataChain chain; if (!chain.Read(NarrowPath(path_fs))) { @@ -98,7 +98,7 @@ flac_scan_file(Path path_fs, static bool flac_scan_stream(InputStream &is, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { FlacMetadataChain chain; if (!chain.Read(is)) { @@ -299,7 +299,7 @@ oggflac_init(gcc_unused const ConfigBlock &block) static bool oggflac_scan_file(Path path_fs, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { FlacMetadataChain chain; if (!chain.ReadOgg(NarrowPath(path_fs))) { @@ -315,7 +315,7 @@ oggflac_scan_file(Path path_fs, static bool oggflac_scan_stream(InputStream &is, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { FlacMetadataChain chain; if (!chain.ReadOgg(is)) { diff --git a/src/decoder/plugins/FlacMetadata.cxx b/src/decoder/plugins/FlacMetadata.cxx index 14a9fe294..495f6fa62 100644 --- a/src/decoder/plugins/FlacMetadata.cxx +++ b/src/decoder/plugins/FlacMetadata.cxx @@ -80,7 +80,7 @@ flac_comment_value(const FLAC__StreamMetadata_VorbisComment_Entry *entry, static bool flac_copy_comment(const FLAC__StreamMetadata_VorbisComment_Entry *entry, const char *name, TagType tag_type, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { const char *value = flac_comment_value(entry, name); if (value != nullptr) { @@ -93,7 +93,7 @@ flac_copy_comment(const FLAC__StreamMetadata_VorbisComment_Entry *entry, static void flac_scan_comment(const FLAC__StreamMetadata_VorbisComment_Entry *entry, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { if (handler->pair != nullptr) { const char *comment = (const char *)entry->entry; @@ -118,7 +118,7 @@ flac_scan_comment(const FLAC__StreamMetadata_VorbisComment_Entry *entry, static void flac_scan_comments(const FLAC__StreamMetadata_VorbisComment *comment, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { for (unsigned i = 0; i < comment->num_comments; ++i) flac_scan_comment(&comment->comments[i], @@ -137,7 +137,7 @@ flac_duration(const FLAC__StreamMetadata_StreamInfo *stream_info) void flac_scan_metadata(const FLAC__StreamMetadata *block, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { switch (block->type) { case FLAC__METADATA_TYPE_VORBIS_COMMENT: @@ -165,7 +165,7 @@ flac_vorbis_comments_to_tag(const FLAC__StreamMetadata_VorbisComment *comment) } void -FlacMetadataChain::Scan(const struct tag_handler *handler, void *handler_ctx) +FlacMetadataChain::Scan(const TagHandler *handler, void *handler_ctx) { FLACMetadataIterator iterator(*this); diff --git a/src/decoder/plugins/FlacMetadata.hxx b/src/decoder/plugins/FlacMetadata.hxx index 4805f8042..18d18b356 100644 --- a/src/decoder/plugins/FlacMetadata.hxx +++ b/src/decoder/plugins/FlacMetadata.hxx @@ -27,7 +27,7 @@ #include <assert.h> -struct tag_handler; +struct TagHandler; class MixRampInfo; class FlacMetadataChain { @@ -82,7 +82,7 @@ public: return FLAC__Metadata_ChainStatusString[GetStatus()]; } - void Scan(const tag_handler *handler, void *handler_ctx); + void Scan(const TagHandler *handler, void *handler_ctx); }; class FLACMetadataIterator { @@ -126,6 +126,6 @@ flac_vorbis_comments_to_tag(const FLAC__StreamMetadata_VorbisComment *comment); void flac_scan_metadata(const FLAC__StreamMetadata *block, - const tag_handler *handler, void *handler_ctx); + const TagHandler *handler, void *handler_ctx); #endif diff --git a/src/decoder/plugins/FluidsynthDecoderPlugin.cxx b/src/decoder/plugins/FluidsynthDecoderPlugin.cxx index 2b4967b95..4ee6ef074 100644 --- a/src/decoder/plugins/FluidsynthDecoderPlugin.cxx +++ b/src/decoder/plugins/FluidsynthDecoderPlugin.cxx @@ -201,7 +201,7 @@ fluidsynth_file_decode(Decoder &decoder, Path path_fs) static bool fluidsynth_scan_file(Path path_fs, - gcc_unused const struct tag_handler *handler, + gcc_unused const TagHandler *handler, gcc_unused void *handler_ctx) { return fluid_is_midifile(path_fs.c_str()); diff --git a/src/decoder/plugins/GmeDecoderPlugin.cxx b/src/decoder/plugins/GmeDecoderPlugin.cxx index cdaa68dcf..3e2961919 100644 --- a/src/decoder/plugins/GmeDecoderPlugin.cxx +++ b/src/decoder/plugins/GmeDecoderPlugin.cxx @@ -215,7 +215,7 @@ gme_file_decode(Decoder &decoder, Path path_fs) static void ScanGmeInfo(const gme_info_t &info, unsigned song_num, int track_count, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { if (info.play_length > 0) tag_handler_invoke_duration(handler, handler_ctx, @@ -255,7 +255,7 @@ ScanGmeInfo(const gme_info_t &info, unsigned song_num, int track_count, static bool ScanMusicEmu(Music_Emu *emu, unsigned song_num, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { gme_info_t *ti; const char *gme_err = gme_track_info(emu, &ti, song_num); @@ -275,7 +275,7 @@ ScanMusicEmu(Music_Emu *emu, unsigned song_num, static bool gme_scan_file(Path path_fs, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { const auto container = ParseContainerPath(path_fs); diff --git a/src/decoder/plugins/MadDecoderPlugin.cxx b/src/decoder/plugins/MadDecoderPlugin.cxx index e24338355..34048d838 100644 --- a/src/decoder/plugins/MadDecoderPlugin.cxx +++ b/src/decoder/plugins/MadDecoderPlugin.cxx @@ -1083,7 +1083,7 @@ mp3_decode(Decoder &decoder, InputStream &input_stream) static bool mad_decoder_scan_stream(InputStream &is, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { const auto result = mad_decoder_total_file_time(is); if (!result.first) diff --git a/src/decoder/plugins/MikmodDecoderPlugin.cxx b/src/decoder/plugins/MikmodDecoderPlugin.cxx index 135bae15a..ff176954d 100644 --- a/src/decoder/plugins/MikmodDecoderPlugin.cxx +++ b/src/decoder/plugins/MikmodDecoderPlugin.cxx @@ -187,7 +187,7 @@ mikmod_decoder_file_decode(Decoder &decoder, Path path_fs) static bool mikmod_decoder_scan_file(Path path_fs, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { /* deconstify the path because libmikmod wants a non-const string pointer */ diff --git a/src/decoder/plugins/ModplugDecoderPlugin.cxx b/src/decoder/plugins/ModplugDecoderPlugin.cxx index 153392929..97287d20a 100644 --- a/src/decoder/plugins/ModplugDecoderPlugin.cxx +++ b/src/decoder/plugins/ModplugDecoderPlugin.cxx @@ -177,7 +177,7 @@ mod_decode(Decoder &decoder, InputStream &is) static bool modplug_scan_stream(InputStream &is, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { ModPlugFile *f = LoadModPlugFile(nullptr, is); if (f == nullptr) diff --git a/src/decoder/plugins/MpcdecDecoderPlugin.cxx b/src/decoder/plugins/MpcdecDecoderPlugin.cxx index e1ddd05f0..588b9425d 100644 --- a/src/decoder/plugins/MpcdecDecoderPlugin.cxx +++ b/src/decoder/plugins/MpcdecDecoderPlugin.cxx @@ -249,7 +249,7 @@ mpcdec_get_file_duration(InputStream &is) static bool mpcdec_scan_stream(InputStream &is, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { const auto duration = mpcdec_get_file_duration(is); if (duration.IsNegative()) diff --git a/src/decoder/plugins/Mpg123DecoderPlugin.cxx b/src/decoder/plugins/Mpg123DecoderPlugin.cxx index 43c0c868f..33521700f 100644 --- a/src/decoder/plugins/Mpg123DecoderPlugin.cxx +++ b/src/decoder/plugins/Mpg123DecoderPlugin.cxx @@ -287,7 +287,7 @@ mpd_mpg123_file_decode(Decoder &decoder, Path path_fs) static bool mpd_mpg123_scan_file(Path path_fs, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { int error; mpg123_handle *const handle = mpg123_new(nullptr, &error); diff --git a/src/decoder/plugins/OpusDecoderPlugin.cxx b/src/decoder/plugins/OpusDecoderPlugin.cxx index 0d03566a7..dc9b77a85 100644 --- a/src/decoder/plugins/OpusDecoderPlugin.cxx +++ b/src/decoder/plugins/OpusDecoderPlugin.cxx @@ -433,7 +433,7 @@ mpd_opus_stream_decode(Decoder &decoder, static bool mpd_opus_scan_stream(InputStream &is, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { OggSyncState oy(is); diff --git a/src/decoder/plugins/OpusTags.cxx b/src/decoder/plugins/OpusTags.cxx index a77a0f71a..bd5cc3d8a 100644 --- a/src/decoder/plugins/OpusTags.cxx +++ b/src/decoder/plugins/OpusTags.cxx @@ -43,7 +43,7 @@ ParseOpusTagName(const char *name) static void ScanOneOpusTag(const char *name, const char *value, ReplayGainInfo *rgi, - const struct tag_handler *handler, void *ctx) + const TagHandler *handler, void *ctx) { if (rgi != nullptr && strcmp(name, "R128_TRACK_GAIN") == 0) { /* R128_TRACK_GAIN is a Q7.8 fixed point number in @@ -67,7 +67,7 @@ ScanOneOpusTag(const char *name, const char *value, bool ScanOpusTags(const void *data, size_t size, ReplayGainInfo *rgi, - const struct tag_handler *handler, void *ctx) + const TagHandler *handler, void *ctx) { OpusReader r(data, size); if (!r.Expect("OpusTags", 8)) diff --git a/src/decoder/plugins/OpusTags.hxx b/src/decoder/plugins/OpusTags.hxx index 57c46882e..64cb6fe0f 100644 --- a/src/decoder/plugins/OpusTags.hxx +++ b/src/decoder/plugins/OpusTags.hxx @@ -25,10 +25,11 @@ #include <stddef.h> struct ReplayGainInfo; +struct TagHandler; bool ScanOpusTags(const void *data, size_t size, ReplayGainInfo *rgi, - const struct tag_handler *handler, void *ctx); + const TagHandler *handler, void *ctx); #endif diff --git a/src/decoder/plugins/SidplayDecoderPlugin.cxx b/src/decoder/plugins/SidplayDecoderPlugin.cxx index 0d17e98c4..fe897775b 100644 --- a/src/decoder/plugins/SidplayDecoderPlugin.cxx +++ b/src/decoder/plugins/SidplayDecoderPlugin.cxx @@ -286,7 +286,7 @@ sidplay_file_decode(Decoder &decoder, Path path_fs) static bool sidplay_scan_file(Path path_fs, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { const auto container = ParseContainerPath(path_fs); const unsigned song_num = container.track; diff --git a/src/decoder/plugins/SndfileDecoderPlugin.cxx b/src/decoder/plugins/SndfileDecoderPlugin.cxx index d8e4b0ba4..05b263f75 100644 --- a/src/decoder/plugins/SndfileDecoderPlugin.cxx +++ b/src/decoder/plugins/SndfileDecoderPlugin.cxx @@ -244,7 +244,7 @@ sndfile_stream_decode(Decoder &decoder, InputStream &is) static void sndfile_handle_tag(SNDFILE *sf, int str, TagType tag, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { const char *value = sf_get_string(sf, str); if (value != nullptr) @@ -266,7 +266,7 @@ static constexpr struct { static bool sndfile_scan_stream(InputStream &is, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { SF_INFO info; diff --git a/src/decoder/plugins/VorbisComments.cxx b/src/decoder/plugins/VorbisComments.cxx index e742e32ff..1f3a5362d 100644 --- a/src/decoder/plugins/VorbisComments.cxx +++ b/src/decoder/plugins/VorbisComments.cxx @@ -56,7 +56,7 @@ vorbis_comments_to_replay_gain(ReplayGainInfo &rgi, char **comments) static bool vorbis_copy_comment(const char *comment, const char *name, TagType tag_type, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { const char *value; @@ -71,7 +71,7 @@ vorbis_copy_comment(const char *comment, static void vorbis_scan_comment(const char *comment, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { if (handler->pair != nullptr) { const DivideString split(comment, '='); @@ -95,7 +95,7 @@ vorbis_scan_comment(const char *comment, void vorbis_comments_scan(char **comments, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { while (*comments) vorbis_scan_comment(*comments++, diff --git a/src/decoder/plugins/VorbisComments.hxx b/src/decoder/plugins/VorbisComments.hxx index 54912aed7..a4eb8359b 100644 --- a/src/decoder/plugins/VorbisComments.hxx +++ b/src/decoder/plugins/VorbisComments.hxx @@ -23,7 +23,7 @@ #include "check.h" struct ReplayGainInfo; -struct tag_handler; +struct TagHandler; struct Tag; bool @@ -31,7 +31,7 @@ vorbis_comments_to_replay_gain(ReplayGainInfo &rgi, char **comments); void vorbis_comments_scan(char **comments, - const tag_handler *handler, void *handler_ctx); + const TagHandler *handler, void *handler_ctx); Tag * vorbis_comments_to_tag(char **comments); diff --git a/src/decoder/plugins/VorbisDecoderPlugin.cxx b/src/decoder/plugins/VorbisDecoderPlugin.cxx index d7069a2f4..2a735fa4a 100644 --- a/src/decoder/plugins/VorbisDecoderPlugin.cxx +++ b/src/decoder/plugins/VorbisDecoderPlugin.cxx @@ -335,7 +335,7 @@ vorbis_stream_decode(Decoder &decoder, static bool vorbis_scan_stream(InputStream &is, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { VorbisInputStream vis(nullptr, is); OggVorbis_File vf; diff --git a/src/decoder/plugins/WavpackDecoderPlugin.cxx b/src/decoder/plugins/WavpackDecoderPlugin.cxx index af1f65ba3..09c249b1c 100644 --- a/src/decoder/plugins/WavpackDecoderPlugin.cxx +++ b/src/decoder/plugins/WavpackDecoderPlugin.cxx @@ -243,7 +243,7 @@ wavpack_replaygain(ReplayGainInfo &rgi, static void wavpack_scan_tag_item(WavpackContext *wpc, const char *name, TagType type, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { char buffer[1024]; int len = WavpackGetTagItem(wpc, name, buffer, sizeof(buffer)); @@ -256,7 +256,7 @@ wavpack_scan_tag_item(WavpackContext *wpc, const char *name, static void wavpack_scan_pair(WavpackContext *wpc, const char *name, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { char buffer[8192]; int len = WavpackGetTagItem(wpc, name, buffer, sizeof(buffer)); @@ -271,7 +271,7 @@ wavpack_scan_pair(WavpackContext *wpc, const char *name, */ static bool wavpack_scan_file(Path path_fs, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { char error[ERRORLEN]; WavpackContext *wpc = WavpackOpenFileInput(path_fs.c_str(), error, diff --git a/src/decoder/plugins/WildmidiDecoderPlugin.cxx b/src/decoder/plugins/WildmidiDecoderPlugin.cxx index 64fa33b05..f9d393e5e 100644 --- a/src/decoder/plugins/WildmidiDecoderPlugin.cxx +++ b/src/decoder/plugins/WildmidiDecoderPlugin.cxx @@ -123,7 +123,7 @@ wildmidi_file_decode(Decoder &decoder, Path path_fs) static bool wildmidi_scan_file(Path path_fs, - const struct tag_handler *handler, void *handler_ctx) + const TagHandler *handler, void *handler_ctx) { midi *wm = WildMidi_Open(path_fs.c_str()); if (wm == nullptr) |