Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-24 14:03:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed some bad logic

Browse source 
When I "fixed" my or instead of and issue, I did it in the wrong
direction.  But it looked right :)  Now it is.  Sigh.  Long story
how it got there, but it seems good now.
This commit is contained in:
David Kelly 2016-07-15 19:48:15 -07:00
parent fb99828e30
commit 8c0eb1e4d2
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libraries/audio/src/AudioInjector.cpp
View file

@ -32,8 +32,8 @@ AudioInjectorState operator& (AudioInjectorState lhs, AudioInjectorState rhs) {
return static_cast<AudioInjectorState>(static_cast<uint8_t>(lhs) & static_cast<uint8_t>(rhs));
};
AudioInjectorState& operator&= (AudioInjectorState& lhs, AudioInjectorState rhs) {
lhs = static_cast<AudioInjectorState>(static_cast<uint8_t>(lhs) & static_cast<uint8_t>(rhs));
AudioInjectorState& operator|= (AudioInjectorState& lhs, AudioInjectorState rhs) {
lhs = static_cast<AudioInjectorState>(static_cast<uint8_t>(lhs) | static_cast<uint8_t>(rhs));
return lhs;
};
@ -70,7 +70,7 @@ void AudioInjector::setOptions(const AudioInjectorOptions& options) {
}
void AudioInjector::finishNetworkInjection() {
_state &= AudioInjectorState::NetworkInjectionFinished;
_state |= AudioInjectorState::NetworkInjectionFinished;
// if we are already finished with local
// injection, then we are finished
@ -80,14 +80,14 @@ void AudioInjector::finishNetworkInjection() {
}
void AudioInjector::finishLocalInjection() {
_state &= AudioInjectorState::LocalInjectionFinished;
_state |= AudioInjectorState::LocalInjectionFinished;
if(_options.localOnly || stateHas(AudioInjectorState::NetworkInjectionFinished)) {
finish();
}
}
void AudioInjector::finish() {
_state &= AudioInjectorState::Finished;
_state |= AudioInjectorState::Finished;
emit finished();
@ -413,7 +413,7 @@ void AudioInjector::triggerDeleteAfterFinish() {
if (_state == AudioInjectorState::Finished) {
stopAndDeleteLater();
} else {
_state &= AudioInjectorState::PendingDelete;
_state |= AudioInjectorState::PendingDelete;
}
}
@ -459,7 +459,7 @@ AudioInjector* AudioInjector::playSoundAndDelete(const QByteArray& buffer, const
AudioInjector* sound = playSound(buffer, options, localInterface);
if (sound) {
sound->_state &= AudioInjectorState::PendingDelete;
sound->_state |= AudioInjectorState::PendingDelete;
}
return sound;

2
libraries/audio/src/AudioInjector.h
View file

@ -42,7 +42,7 @@ enum class AudioInjectorState : uint8_t {
};
AudioInjectorState operator& (AudioInjectorState lhs, AudioInjectorState rhs);
AudioInjectorState& operator&= (AudioInjectorState& lhs, AudioInjectorState rhs);
AudioInjectorState& operator|= (AudioInjectorState& lhs, AudioInjectorState rhs);
// In order to make scripting cleaner for the AudioInjector, the script now holds on to the AudioInjector object
// until it dies.