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

Merge tag 'v0.20.9'

Browse Source 
release v0.20.9
This commit is contained in:
Max Kellermann
2017-06-04 12:57:05 +02:00
parent 1fa1790da5 cf86dfd317
commit 979f1b6c39
69 changed files with 240 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tag/Builder.hxx
View File

@@ -82,7 +82,7 @@ public:
* Returns true if the object contains any information.
*/
gcc_pure
bool IsDefined() const {
bool IsDefined() const noexcept {
return !duration.IsNegative() || has_playlist || !IsEmpty();
}

4
src/tag/MixRamp.cxx
View File

@@ -53,7 +53,7 @@ ParseMixRampTag(MixRampInfo &info, const char *name, const char *value)
const char *value;
gcc_pure
const char *operator[](const char *n) const {
const char *operator[](const char *n) const noexcept {
return StringEqualsCaseASCII(name, n)
? value
: nullptr;
@@ -70,7 +70,7 @@ ParseMixRampVorbis(MixRampInfo &info, const char *entry)
const char *entry;
gcc_pure
const char *operator[](const char *n) const {
const char *operator[](const char *n) const noexcept {
return vorbis_comment_value(entry, n);
}
};

4
src/tag/ReplayGain.cxx
View File

@@ -60,7 +60,7 @@ ParseReplayGainTag(ReplayGainInfo &info, const char *name, const char *value)
const char *value;
gcc_pure
const char *operator[](const char *n) const {
const char *operator[](const char *n) const noexcept {
return StringEqualsCaseASCII(name, n)
? value
: nullptr;
@@ -77,7 +77,7 @@ ParseReplayGainVorbis(ReplayGainInfo &info, const char *entry)
const char *entry;
gcc_pure
const char *operator[](const char *n) const {
const char *operator[](const char *n) const noexcept {
return vorbis_comment_value(entry, n);
}
};

6
src/tag/Set.cxx
View File

@@ -68,7 +68,7 @@ CopyTagMask(TagBuilder &dest, const Tag &src, TagMask mask)
void
TagSet::InsertUnique(const Tag &src, TagType type, const char *value,
TagMask group_mask)
TagMask group_mask) noexcept
{
TagBuilder builder;
if (value == nullptr)
@@ -82,7 +82,7 @@ TagSet::InsertUnique(const Tag &src, TagType type, const char *value,
bool
TagSet::CheckUnique(TagType dest_type,
const Tag &tag, TagType src_type,
TagMask group_mask)
TagMask group_mask) noexcept
{
bool found = false;
@@ -98,7 +98,7 @@ TagSet::CheckUnique(TagType dest_type,
void
TagSet::InsertUnique(const Tag &tag,
TagType type, TagMask group_mask)
TagType type, TagMask group_mask) noexcept
{
static_assert(sizeof(group_mask) * 8 >= TAG_NUM_OF_ITEM_TYPES,
"Mask is too small");

8
src/tag/Set.hxx
View File

@@ -34,7 +34,7 @@ class TagMask;
*/
struct TagLess {
gcc_pure
bool operator()(const Tag &a, const Tag &b) const {
bool operator()(const Tag &a, const Tag &b) const noexcept {
if (a.num_items != b.num_items)
return a.num_items < b.num_items;
@@ -60,15 +60,15 @@ struct TagLess {
class TagSet : public std::set<Tag, TagLess> {
public:
void InsertUnique(const Tag &tag,
TagType type, TagMask group_mask);
TagType type, TagMask group_mask) noexcept;
private:
void InsertUnique(const Tag &src, TagType type, const char *value,
TagMask group_mask);
TagMask group_mask) noexcept;
bool CheckUnique(TagType dest_type,
const Tag &tag, TagType src_type,
TagMask group_mask);
TagMask group_mask) noexcept;
};
#endif