Skip to content

Commit 0c0e3c6

Browse files
authored
Use has_none for flag checks (#861)
1 parent f16ce8f commit 0c0e3c6

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

Sources/CSFBAudioEngine/Player/AudioPlayer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ inline bool AudioPlayer::isPaused() const noexcept {
351351

352352
inline bool AudioPlayer::isStopped() const noexcept {
353353
const auto flags = loadFlags();
354-
return !bits::has_all(flags, Flags::engineIsRunning);
354+
return bits::has_none(flags, Flags::engineIsRunning);
355355
}
356356

357357
inline bool AudioPlayer::isReady() const noexcept {

Sources/CSFBAudioEngine/Player/AudioPlayer.mm

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1101,7 +1101,7 @@ Flags loadFlags(std::memory_order order = std::memory_order_acquire) const noexc
11011101
// Process cancellations
11021102
auto signal = false;
11031103
for (const auto &decoderState : activeDecoders_) {
1104-
if (!bits::has_all(decoderState->loadFlags(), DecoderState::Flags::cancelRequested)) {
1104+
if (bits::has_none(decoderState->loadFlags(), DecoderState::Flags::cancelRequested)) {
11051105
continue;
11061106
}
11071107

@@ -1281,7 +1281,7 @@ Flags loadFlags(std::memory_order order = std::memory_order_acquire) const noexc
12811281

12821282
if (decoderState != nullptr) {
12831283
// Before decoding starts determine the decoder and ring buffer format compatibility
1284-
if (!bits::has_all(decoderState->loadFlags(), DecoderState::Flags::decodingStarted)) {
1284+
if (bits::has_none(decoderState->loadFlags(), DecoderState::Flags::decodingStarted)) {
12851285
// Start decoding immediately if the join will be gapless (same sample rate, channel count, and channel
12861286
// layout)
12871287
if (auto renderFormat = decoderState->converter_.outputFormat;
@@ -1359,12 +1359,12 @@ Flags loadFlags(std::memory_order order = std::memory_order_acquire) const noexc
13591359
}
13601360

13611361
if (decoderState != nullptr) {
1362-
if (const auto flags = loadFlags(); !bits::has_all(flags, Flags::drainRequired)) {
1362+
if (const auto flags = loadFlags(); bits::has_none(flags, Flags::drainRequired)) {
13631363
// Decode and write chunks to the ring buffer
13641364
while (audioRingBuffer_.freeSpace() >= ringBufferChunkSize) {
13651365
// Decoding started
13661366
if (const auto flags = decoderState->loadFlags();
1367-
!bits::has_all(flags, DecoderState::Flags::decodingStarted)) {
1367+
bits::has_none(flags, DecoderState::Flags::decodingStarted)) {
13681368
const bool suspended = bits::has_all(flags, DecoderState::Flags::decodingSuspended);
13691369

13701370
if (!suspended) {
@@ -1668,7 +1668,7 @@ Flags loadFlags(std::memory_order order = std::memory_order_acquire) const noexc
16681668
[player_.delegate audioPlayer:player_ decodingStarted:decoder];
16691669
}
16701670

1671-
if (!bits::has_all(loadFlags(), Flags::isPlaying) && decoder == currentDecoder) {
1671+
if (bits::has_none(loadFlags(), Flags::isPlaying) && decoder == currentDecoder) {
16721672
setNowPlaying(decoder);
16731673
}
16741674

@@ -2079,7 +2079,7 @@ Flags loadFlags(std::memory_order order = std::memory_order_acquire) const noexc
20792079
// Cancel all active decoders
20802080
auto signal = false;
20812081
for (const auto &decoderState : activeDecoders_) {
2082-
if (!bits::has_all(decoderState->loadFlags(), DecoderState::Flags::isCanceled)) {
2082+
if (bits::has_none(decoderState->loadFlags(), DecoderState::Flags::isCanceled)) {
20832083
decoderState->flags_.fetch_or(static_cast<unsigned int>(DecoderState::Flags::cancelRequested),
20842084
std::memory_order_acq_rel);
20852085
signal = true;
@@ -2099,7 +2099,7 @@ Flags loadFlags(std::memory_order order = std::memory_order_acquire) const noexc
20992099

21002100
const auto iter = std::ranges::find_if(activeDecoders_, [](const auto &decoderState) {
21012101
const auto flags = decoderState->loadFlags();
2102-
return !bits::has_all(flags, DecoderState::Flags::isCanceled);
2102+
return bits::has_none(flags, DecoderState::Flags::isCanceled);
21032103
});
21042104
if (iter == activeDecoders_.cend()) {
21052105
return nullptr;

0 commit comments

Comments
 (0)