Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-13 12:12:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

use const AudioInjectorPointer& in some places

Browse source
This commit is contained in:
Seth Alves 2017-07-11 19:42:03 -07:00
parent 81489ea6c4
commit c52e7e180a
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/avatar/AvatarManager.cpp
View file

@ -434,7 +434,7 @@ void AvatarManager::handleCollisionEvents(const CollisionEvents& collisionEvents
// but most avatars are roughly the same size, so let's not be so fancy yet.
const float AVATAR_STRETCH_FACTOR = 1.0f;
_collisionInjectors.remove_if([](AudioInjectorPointer injector) {
_collisionInjectors.remove_if([](const AudioInjectorPointer& injector) {
return !injector || injector->isFinished();
});

2
libraries/audio-client/src/AudioClient.cpp
View file

@ -1207,7 +1207,7 @@ bool AudioClient::mixLocalAudioInjectors(float* mixBuffer) {
memset(mixBuffer, 0, AudioConstants::NETWORK_FRAME_SAMPLES_STEREO * sizeof(float));
for (AudioInjectorPointer injector : _activeLocalAudioInjectors) {
for (const AudioInjectorPointer& injector : _activeLocalAudioInjectors) {
// the lock guarantees that injectorBuffer, if found, is invariant
AudioInjectorLocalBuffer* injectorBuffer = injector->getLocalBuffer();
if (injectorBuffer) {

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

@ -132,7 +132,7 @@ void AudioInjector::restart() {
}
}
bool AudioInjector::inject(bool(AudioInjectorManager::*injection)(AudioInjectorPointer)) {
bool AudioInjector::inject(bool(AudioInjectorManager::*injection)(const AudioInjectorPointer&)) {
_state = AudioInjectorState::NotFinished;
int byteOffset = 0;
@ -474,7 +474,7 @@ AudioInjectorPointer AudioInjector::playSoundAndDelete(const QByteArray& buffer,
AudioInjectorPointer AudioInjector::playSound(const QByteArray& buffer, const AudioInjectorOptions options) {
AudioInjectorPointer injector = AudioInjectorPointer(new AudioInjector(buffer, options));
AudioInjectorPointer injector = AudioInjectorPointer::create<>(buffer, options);
if (!injector->inject(&AudioInjectorManager::threadInjector)) {
qWarning() << "AudioInjector::playSound failed to thread injector";

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

@ -101,7 +101,7 @@ signals:
private:
int64_t injectNextFrame();
bool inject(bool(AudioInjectorManager::*injection)(AudioInjectorPointer));
bool inject(bool(AudioInjectorManager::*injection)(const AudioInjectorPointer&));
bool injectLocally();
void deleteLocalBuffer();

4
libraries/audio/src/AudioInjectorManager.cpp
View file

@ -139,7 +139,7 @@ bool AudioInjectorManager::wouldExceedLimits() { // Should be called inside of a
return false;
}
bool AudioInjectorManager::threadInjector(AudioInjectorPointer injector) {
bool AudioInjectorManager::threadInjector(const AudioInjectorPointer& injector) {
if (_shouldStop) {
qCDebug(audio) << "AudioInjectorManager::threadInjector asked to thread injector but is shutting down.";
return false;
@ -168,7 +168,7 @@ bool AudioInjectorManager::threadInjector(AudioInjectorPointer injector) {
}
}
bool AudioInjectorManager::restartFinishedInjector(AudioInjectorPointer injector) {
bool AudioInjectorManager::restartFinishedInjector(const AudioInjectorPointer& injector) {
if (_shouldStop) {
qCDebug(audio) << "AudioInjectorManager::threadInjector asked to thread injector but is shutting down.";
return false;

4
libraries/audio/src/AudioInjectorManager.h
View file

@ -48,8 +48,8 @@ private:
using Mutex = std::mutex;
using Lock = std::unique_lock<Mutex>;
bool threadInjector(AudioInjectorPointer injector);
bool restartFinishedInjector(AudioInjectorPointer injector);
bool threadInjector(const AudioInjectorPointer& injector);
bool restartFinishedInjector(const AudioInjectorPointer& injector);
void notifyInjectorReadyCondition() { _injectorReady.notify_one(); }
bool wouldExceedLimits();