Martchus
/
tagparser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use helper for flag enum from c++utilities

This commit is contained in:
Martchus 2019-08-12 20:22:57 +02:00
parent b09e7535bc
commit 85eb71cd20
1 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
settings.h
View File

@ -3,6 +3,8 @@
#include "./tagtarget.h" #include "./tagtarget.h"
#include <c++utilities/misc/flagenumclass.h>
#include <cstdint> #include <cstdint>
#include <type_traits> #include <type_traits>
@ -36,34 +38,11 @@ enum class TagCreationFlags : std::uint64_t {
= 1 << 4, /**< keep version of existing ID3v2 tags so TagSettings::id3v2version is only used when creating a *new* ID3v2 tag */ = 1 << 4, /**< keep version of existing ID3v2 tags so TagSettings::id3v2version is only used when creating a *new* ID3v2 tag */
}; };
constexpr TagCreationFlags operator|(TagCreationFlags lhs, TagCreationFlags rhs) } // namespace TagParser
{
return static_cast<TagCreationFlags>(
static_cast<std::underlying_type<TagCreationFlags>::type>(lhs) | static_cast<std::underlying_type<TagCreationFlags>::type>(rhs));
}
constexpr bool operator&(TagCreationFlags lhs, TagCreationFlags rhs) CPP_UTILITIES_MARK_FLAG_ENUM_CLASS(TagParser, TagParser::TagCreationFlags);
{
return static_cast<std::underlying_type<TagCreationFlags>::type>(lhs) & static_cast<std::underlying_type<TagCreationFlags>::type>(rhs);
}
constexpr TagCreationFlags &operator|=(TagCreationFlags &lhs, TagCreationFlags rhs) namespace TagParser {
{
return lhs = static_cast<TagCreationFlags>(
static_cast<std::underlying_type<TagCreationFlags>::type>(lhs) | static_cast<std::underlying_type<TagCreationFlags>::type>(rhs));
}
constexpr TagCreationFlags &operator+=(TagCreationFlags &lhs, TagCreationFlags rhs)
{
return lhs = static_cast<TagCreationFlags>(
static_cast<std::underlying_type<TagCreationFlags>::type>(lhs) | static_cast<std::underlying_type<TagCreationFlags>::type>(rhs));
}
constexpr TagCreationFlags &operator-=(TagCreationFlags &lhs, TagCreationFlags rhs)
{
return lhs = static_cast<TagCreationFlags>(
static_cast<std::underlying_type<TagCreationFlags>::type>(lhs) & (~static_cast<std::underlying_type<TagCreationFlags>::type>(rhs)));
}
/*! /*!
* \brief The TagSettings struct contains settings which can be passed to MediaFileInfo::createAppropriateTags(). * \brief The TagSettings struct contains settings which can be passed to MediaFileInfo::createAppropriateTags().
@ -100,7 +79,7 @@ constexpr
TagCreationSettings::setFlag(TagCreationFlags flag, bool enabled) TagCreationSettings::setFlag(TagCreationFlags flag, bool enabled)
{ {
if (enabled) { if (enabled) {
flags |= flag; flags += flag;
} else { } else {
flags -= flag; flags -= flag;
} }