From ef54a63de622f5362d9ae763a22614b7c7b35a95 Mon Sep 17 00:00:00 2001
From: Clement <clement.brisset@gmail.com>
Date: Wed, 7 Nov 2018 17:54:49 -0800
Subject: [PATCH] Use uint8_t instead of bool on the wire
---
.../src/audio/AudioMixerClientData.cpp | 2 +-
libraries/audio/src/AudioSolo.cpp | 14 ++++++++------
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/assignment-client/src/audio/AudioMixerClientData.cpp b/assignment-client/src/audio/AudioMixerClientData.cpp
index 68727a16be..a7edd3169c 100644
--- a/assignment-client/src/audio/AudioMixerClientData.cpp
+++ b/assignment-client/src/audio/AudioMixerClientData.cpp
@@ -301,7 +301,7 @@ void AudioMixerClientData::parseRadiusIgnoreRequest(QSharedPointer<ReceivedMessa
void AudioMixerClientData::parseSoloRequest(QSharedPointer<ReceivedMessage> message, const SharedNodePointer& node) {
- bool addToSolo;
+ uint8_t addToSolo;
message->readPrimitive(&addToSolo);
while (message->getBytesLeftToRead()) {
diff --git a/libraries/audio/src/AudioSolo.cpp b/libraries/audio/src/AudioSolo.cpp
index 83ecc6e130..3302636096 100644
--- a/libraries/audio/src/AudioSolo.cpp
+++ b/libraries/audio/src/AudioSolo.cpp
@@ -26,8 +26,9 @@ QVector<QUuid> AudioSolo::getUUIDs() const {
void AudioSolo::addUUIDs(QVector<QUuid> uuidList) {
// create a reliable NLPacket with space for the solo UUIDs
auto soloPacket = NLPacket::create(PacketType::AudioSoloRequest,
- uuidList.size() * NUM_BYTES_RFC4122_UUID + sizeof(bool), true);
- soloPacket->writePrimitive(true);
+ uuidList.size() * NUM_BYTES_RFC4122_UUID + sizeof(uint8_t), true);
+ uint8_t addToSoloList = (uint8_t)true;
+ soloPacket->writePrimitive(addToSoloList);
{
Lock lock(_mutex);
@@ -42,7 +43,7 @@ void AudioSolo::addUUIDs(QVector<QUuid> uuidList) {
}
}
- // send off this ignore packet reliably to the matching node
+ // send off this solo packet reliably to the matching node
auto nodeList = DependencyManager::get<NodeList>();
nodeList->broadcastToNodes(std::move(soloPacket), { NodeType::AudioMixer });
}
@@ -50,8 +51,9 @@ void AudioSolo::addUUIDs(QVector<QUuid> uuidList) {
void AudioSolo::removeUUIDs(QVector<QUuid> uuidList) {
// create a reliable NLPacket with space for the solo UUIDs
auto soloPacket = NLPacket::create(PacketType::AudioSoloRequest,
- uuidList.size() * NUM_BYTES_RFC4122_UUID + sizeof(bool), true);
- soloPacket->writePrimitive(false);
+ uuidList.size() * NUM_BYTES_RFC4122_UUID + sizeof(uint8_t), true);
+ uint8_t addToSoloList = (uint8_t)false;
+ soloPacket->writePrimitive(addToSoloList);
{
Lock lock(_mutex);
@@ -66,7 +68,7 @@ void AudioSolo::removeUUIDs(QVector<QUuid> uuidList) {
}
}
- // send off this ignore packet reliably to the matching node
+ // send off this solo packet reliably to the matching node
auto nodeList = DependencyManager::get<NodeList>();
nodeList->broadcastToNodes(std::move(soloPacket), { NodeType::AudioMixer });
}