diff options
| author | Max Kellermann <max@duempel.org> | 2013-07-26 12:09:17 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-07-26 12:52:51 +0200 |
| commit | 1fcf35ad3b10c241b8b5266c46a5fe99ce2c57d9 (patch) | |
| tree | a9bd895a18a34d83512ed6568e7ea730938c5987 /src | |
| parent | c8054e569ae64f7d84940f9c7cb7ef3e642b1e0c (diff) | |
| download | mpd-1fcf35ad3b10c241b8b5266c46a5fe99ce2c57d9.tar.gz mpd-1fcf35ad3b10c241b8b5266c46a5fe99ce2c57d9.tar.xz mpd-1fcf35ad3b10c241b8b5266c46a5fe99ce2c57d9.zip | |
tag_rva2: convert to C++
Diffstat (limited to 'src')
| -rw-r--r-- | src/TagRva2.cxx (renamed from src/tag_rva2.c) | 8 | ||||
| -rw-r--r-- | src/TagRva2.hxx (renamed from src/tag_rva2.h) | 6 | ||||
| -rw-r--r-- | src/decoder/MadDecoderPlugin.cxx | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/tag_rva2.c b/src/TagRva2.cxx index 9250311b9..f41119c35 100644 --- a/src/tag_rva2.c +++ b/src/TagRva2.cxx @@ -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 * * This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ */ #include "config.h" -#include "tag_rva2.h" +#include "TagRva2.hxx" #include "replay_gain_info.h" #include <stdint.h> @@ -102,7 +102,7 @@ rva2_apply_frame(struct replay_gain_info *replay_gain_info, const id3_byte_t *data = id3_field_getbinarydata(id3_frame_field(frame, 1), &length); - if (id == NULL || data == NULL) + if (id == nullptr || data == nullptr) return false; /* @@ -141,7 +141,7 @@ tag_rva2_parse(struct id3_tag *tag, struct replay_gain_info *replay_gain_info) track and album gain in separate tags */ const struct id3_frame *frame; for (unsigned i = 0; - (frame = id3_tag_findframe(tag, "RVA2", i)) != NULL; + (frame = id3_tag_findframe(tag, "RVA2", i)) != nullptr; ++i) if (rva2_apply_frame(replay_gain_info, frame)) found = true; diff --git a/src/tag_rva2.h b/src/TagRva2.hxx index 8aac2fe9f..057f03186 100644 --- a/src/tag_rva2.h +++ b/src/TagRva2.hxx @@ -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 * * 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_TAG_RVA2_H -#define MPD_TAG_RVA2_H +#ifndef MPD_TAG_RVA2_HXX +#define MPD_TAG_RVA2_HXX #include "check.h" diff --git a/src/decoder/MadDecoderPlugin.cxx b/src/decoder/MadDecoderPlugin.cxx index 339fd5397..a8b607386 100644 --- a/src/decoder/MadDecoderPlugin.cxx +++ b/src/decoder/MadDecoderPlugin.cxx @@ -24,9 +24,9 @@ extern "C" { #include "tag_id3.h" -#include "tag_rva2.h" } +#include "TagRva2.hxx" #include "tag_handler.h" #include "audio_check.h" |