Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-13 19:46:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix AssignmentClientMonitor and AudioMixer to use NLPacket

Browse source
This commit is contained in:
Stephen Birarda 2015-07-06 17:20:08 -07:00
parent ea3f61a0c5
commit 269bea65fb
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assignment-client/src/AssignmentClientMonitor.cpp
View file

@ -195,7 +195,7 @@ void AssignmentClientMonitor::checkSpares() {
SharedNodePointer childNode = nodeList->nodeWithUUID(aSpareId);
childNode->activateLocalSocket();
NodeListPacket diePacket = NodeListPacket::create(PacketType::StopNode);
auto diePacket { NLPacket::create(PacketType::StopNode); }
nodeList->sendPacket(diePacket, childNode);
}
}
@ -230,7 +230,7 @@ void AssignmentClientMonitor::readPendingDatagrams() {
// tell unknown assignment-client child to exit.
qDebug() << "asking unknown child to exit.";
NodeListPacket diePacket = NodeListPacket::create(PacketType::StopNode);
auto diePacket { NL::create(PacketType::StopNode); }
nodeList->sendPacket(diePacket, childNode);
}
}

8
assignment-client/src/audio/AudioMixer.cpp
View file

@ -785,7 +785,7 @@ void AudioMixer::run() {
// if the stream should be muted, send mute packet
if (nodeData->getAvatarAudioStream()
&& shouldMute(nodeData->getAvatarAudioStream()->getQuietestFrameLoudness())) {
auto mutePacket = NodeListPacket::create(PacketType::NoisyMute);
auto mutePacket { NLPacket::create(PacketType::NoisyMute); }
nodeList->sendPacket(mutePacket, node);
}
@ -794,11 +794,11 @@ void AudioMixer::run() {
int streamsMixed = prepareMixForListeningNode(node.data());
std::unique_ptr<NodeListPacket> mixPacket;
std::unique_ptr<NLPacket> mixPacket;
if (streamsMixed > 0) {
int mixPacketBytes = sizeof(quint16) + AudioConstants::NETWORK_FRAME_BYTES_STEREO;
mixPacket = NodeListPacket::create(PacketType::MixedAudio);
mixPacket = NLPacket::create(PacketType::MixedAudio);
// pack sequence number
quint16 sequence = nodeData->getOutgoingSequenceNumber();
@ -808,7 +808,7 @@ void AudioMixer::run() {
mixPacket.write(mixSamples, AudioConstants::NETWORK_FRAME_BYTES_STEREO);
} else {
int silentPacketBytes = sizeof(quint16) + sizeof(quint16);
mixPacket = NodeListPacket::create(PacketType::SilentAudioFrame);
mixPacket = NLPacket::create(PacketType::SilentAudioFrame);
// pack sequence number
quint16 sequence = nodeData->getOutgoingSequenceNumber();