Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 17:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update AudioClient to use QSharedPointer<NLPacket>

Browse source
This commit is contained in:
Ryan Huffman 2015-07-10 08:45:39 -07:00
parent 78ff6477bd
commit 28a1059232
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -535,13 +535,13 @@ void AudioClient::stop() {
} }
} }
void AudioClient::handleAudioStreamStatsPacket(std::unique_ptr<NLPacket> packet, HifiSockAddr senderSockAddr) { void AudioClient::handleAudioStreamStatsPacket(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr) {
_stats.parseAudioStreamStatsPacket(packet->getData()); _stats.parseAudioStreamStatsPacket(packet->getData());
updateLastHeardFromAudioMixer(packet); updateLastHeardFromAudioMixer(packet);
} }
void AudioClient::handleAudioEnvironmentDataPacket(std::unique_ptr<NLPacket> packet, HifiSockAddr senderSockAddr) { void AudioClient::handleAudioEnvironmentDataPacket(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr) {
const char* dataAt = packet->getPayload(); const char* dataAt = packet->getPayload();
char bitset; char bitset;
@ -563,7 +563,7 @@ void AudioClient::handleAudioEnvironmentDataPacket(std::unique_ptr<NLPacket> pac
updateLastHeardFromAudioMixer(packet); updateLastHeardFromAudioMixer(packet);
} }
void AudioClient::handleAudioDataPacket(std::unique_ptr<NLPacket> packet, HifiSockAddr senderSockAddr) { void AudioClient::handleAudioDataPacket(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr) {
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<NodeList>();
nodeList->flagTimeForConnectionStep(LimitedNodeList::ConnectionStep::ReceiveFirstAudioPacket); nodeList->flagTimeForConnectionStep(LimitedNodeList::ConnectionStep::ReceiveFirstAudioPacket);
@ -583,11 +583,11 @@ void AudioClient::handleAudioDataPacket(std::unique_ptr<NLPacket> packet, HifiSo
updateLastHeardFromAudioMixer(packet); updateLastHeardFromAudioMixer(packet);
} }
void AudioClient::handleSilentAudioFrame(std::unique_ptr<NLPacket> packet, HifiSockAddr senderSockAddr) { void AudioClient::handleSilentAudioFrame(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr) {
updateLastHeardFromAudioMixer(packet); updateLastHeardFromAudioMixer(packet);
} }
void AudioClient::handleNoisyMutePacket(std::unique_ptr<NLPacket> packet, HifiSockAddr senderSockAddr) { void AudioClient::handleNoisyMutePacket(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr) {
if (!_muted) { if (!_muted) {
toggleMute(); toggleMute();
// TODO reimplement on interface side // TODO reimplement on interface side
@ -595,7 +595,7 @@ void AudioClient::handleNoisyMutePacket(std::unique_ptr<NLPacket> packet, HifiSo
} }
} }
void AudioClient::handleMuteEnvironmentPacket(std::unique_ptr<NLPacket> packet, HifiSockAddr senderSockAddr) { void AudioClient::handleMuteEnvironmentPacket(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr) {
glm::vec3 position; glm::vec3 position;
float radius; float radius;
@ -606,7 +606,7 @@ void AudioClient::handleMuteEnvironmentPacket(std::unique_ptr<NLPacket> packet,
emit muteEnvironmentRequested(position, radius); emit muteEnvironmentRequested(position, radius);
} }
void AudioClient::updateLastHeardFromAudioMixer(std::unique_ptr<NLPacket>& packet) { void AudioClient::updateLastHeardFromAudioMixer(QSharedPointer<NLPacket>& packet) {
// update having heard from the audio-mixer and record the bytes received // update having heard from the audio-mixer and record the bytes received
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<NodeList>();
SharedNodePointer audioMixer = nodeList->nodeWithUUID(packet->getSourceID()); SharedNodePointer audioMixer = nodeList->nodeWithUUID(packet->getSourceID());

14
libraries/audio-client/src/AudioClient.h
View file

@ -139,12 +139,12 @@ public slots:
void start(); void start();
void stop(); void stop();
void handleAudioStreamStatsPacket(std::unique_ptr<NLPacket> packet, HifiSockAddr senderSockAddr); void handleAudioStreamStatsPacket(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr);
void handleAudioEnvironmentDataPacket(std::unique_ptr<NLPacket> packet, HifiSockAddr senderSockAddr); void handleAudioEnvironmentDataPacket(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr);
void handleAudioDataPacket(std::unique_ptr<NLPacket> packet, HifiSockAddr senderSockAddr); void handleAudioDataPacket(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr);
void handleSilentAudioFrame(std::unique_ptr<NLPacket> packet, HifiSockAddr senderSockAddr); void handleSilentAudioFrame(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr);
void handleNoisyMutePacket(std::unique_ptr<NLPacket> packet, HifiSockAddr senderSockAddr); void handleNoisyMutePacket(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr);
void handleMuteEnvironmentPacket(std::unique_ptr<NLPacket> packet, HifiSockAddr senderSockAddr); void handleMuteEnvironmentPacket(QSharedPointer<NLPacket> packet, HifiSockAddr senderSockAddr);
void sendDownstreamAudioStatsPacket() { _stats.sendDownstreamAudioStatsPacket(); } void sendDownstreamAudioStatsPacket() { _stats.sendDownstreamAudioStatsPacket(); }
void handleAudioInput(); void handleAudioInput();
@ -214,7 +214,7 @@ private slots:
void audioStateChanged(QAudio::State state); void audioStateChanged(QAudio::State state);
private: private:
void updateLastHeardFromAudioMixer(std::unique_ptr<NLPacket>& packet); void updateLastHeardFromAudioMixer(QSharedPointer<NLPacket>& packet);
void outputFormatChanged(); void outputFormatChanged();
QByteArray firstInputFrame; QByteArray firstInputFrame;