diff --git a/libraries/audio-client/src/AudioClient.cpp b/libraries/audio-client/src/AudioClient.cpp index 2571f42786..c946586074 100644 --- a/libraries/audio-client/src/AudioClient.cpp +++ b/libraries/audio-client/src/AudioClient.cpp @@ -535,13 +535,13 @@ void AudioClient::stop() { } } -void AudioClient::handleAudioStreamStatsPacket(std::unique_ptr packet, HifiSockAddr senderSockAddr) { +void AudioClient::handleAudioStreamStatsPacket(QSharedPointer packet, HifiSockAddr senderSockAddr) { _stats.parseAudioStreamStatsPacket(packet->getData()); updateLastHeardFromAudioMixer(packet); } -void AudioClient::handleAudioEnvironmentDataPacket(std::unique_ptr packet, HifiSockAddr senderSockAddr) { +void AudioClient::handleAudioEnvironmentDataPacket(QSharedPointer packet, HifiSockAddr senderSockAddr) { const char* dataAt = packet->getPayload(); char bitset; @@ -563,7 +563,7 @@ void AudioClient::handleAudioEnvironmentDataPacket(std::unique_ptr pac updateLastHeardFromAudioMixer(packet); } -void AudioClient::handleAudioDataPacket(std::unique_ptr packet, HifiSockAddr senderSockAddr) { +void AudioClient::handleAudioDataPacket(QSharedPointer packet, HifiSockAddr senderSockAddr) { auto nodeList = DependencyManager::get(); nodeList->flagTimeForConnectionStep(LimitedNodeList::ConnectionStep::ReceiveFirstAudioPacket); @@ -583,11 +583,11 @@ void AudioClient::handleAudioDataPacket(std::unique_ptr packet, HifiSo updateLastHeardFromAudioMixer(packet); } -void AudioClient::handleSilentAudioFrame(std::unique_ptr packet, HifiSockAddr senderSockAddr) { +void AudioClient::handleSilentAudioFrame(QSharedPointer packet, HifiSockAddr senderSockAddr) { updateLastHeardFromAudioMixer(packet); } -void AudioClient::handleNoisyMutePacket(std::unique_ptr packet, HifiSockAddr senderSockAddr) { +void AudioClient::handleNoisyMutePacket(QSharedPointer packet, HifiSockAddr senderSockAddr) { if (!_muted) { toggleMute(); // TODO reimplement on interface side @@ -595,7 +595,7 @@ void AudioClient::handleNoisyMutePacket(std::unique_ptr packet, HifiSo } } -void AudioClient::handleMuteEnvironmentPacket(std::unique_ptr packet, HifiSockAddr senderSockAddr) { +void AudioClient::handleMuteEnvironmentPacket(QSharedPointer packet, HifiSockAddr senderSockAddr) { glm::vec3 position; float radius; @@ -606,7 +606,7 @@ void AudioClient::handleMuteEnvironmentPacket(std::unique_ptr packet, emit muteEnvironmentRequested(position, radius); } -void AudioClient::updateLastHeardFromAudioMixer(std::unique_ptr& packet) { +void AudioClient::updateLastHeardFromAudioMixer(QSharedPointer& packet) { // update having heard from the audio-mixer and record the bytes received auto nodeList = DependencyManager::get(); SharedNodePointer audioMixer = nodeList->nodeWithUUID(packet->getSourceID()); diff --git a/libraries/audio-client/src/AudioClient.h b/libraries/audio-client/src/AudioClient.h index cc04d60367..8812473a79 100644 --- a/libraries/audio-client/src/AudioClient.h +++ b/libraries/audio-client/src/AudioClient.h @@ -139,12 +139,12 @@ public slots: void start(); void stop(); - void handleAudioStreamStatsPacket(std::unique_ptr packet, HifiSockAddr senderSockAddr); - void handleAudioEnvironmentDataPacket(std::unique_ptr packet, HifiSockAddr senderSockAddr); - void handleAudioDataPacket(std::unique_ptr packet, HifiSockAddr senderSockAddr); - void handleSilentAudioFrame(std::unique_ptr packet, HifiSockAddr senderSockAddr); - void handleNoisyMutePacket(std::unique_ptr packet, HifiSockAddr senderSockAddr); - void handleMuteEnvironmentPacket(std::unique_ptr packet, HifiSockAddr senderSockAddr); + void handleAudioStreamStatsPacket(QSharedPointer packet, HifiSockAddr senderSockAddr); + void handleAudioEnvironmentDataPacket(QSharedPointer packet, HifiSockAddr senderSockAddr); + void handleAudioDataPacket(QSharedPointer packet, HifiSockAddr senderSockAddr); + void handleSilentAudioFrame(QSharedPointer packet, HifiSockAddr senderSockAddr); + void handleNoisyMutePacket(QSharedPointer packet, HifiSockAddr senderSockAddr); + void handleMuteEnvironmentPacket(QSharedPointer packet, HifiSockAddr senderSockAddr); void sendDownstreamAudioStatsPacket() { _stats.sendDownstreamAudioStatsPacket(); } void handleAudioInput(); @@ -214,7 +214,7 @@ private slots: void audioStateChanged(QAudio::State state); private: - void updateLastHeardFromAudioMixer(std::unique_ptr& packet); + void updateLastHeardFromAudioMixer(QSharedPointer& packet); void outputFormatChanged(); QByteArray firstInputFrame;