Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 01:36:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

I'm about to refactor this.

Browse source
This commit is contained in:
Zach Fox 2016-12-29 11:57:51 -08:00
parent bb2b48d424
commit 24eac77115
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -245,7 +245,7 @@ void AudioMixer::handleNodePersonalMuteRequestPacket(QSharedPointer<ReceivedMess
<< uuidStringWithoutCurlyBraces(_uuid); << uuidStringWithoutCurlyBraces(_uuid);
// Remove the session UUID to the set of personally muted ones for this listening node // Remove the session UUID to the set of personally muted ones for this listening node
//sendingNode->removeIgnoredNode(ignoredUUID); sendingNode->removeIgnoredNode(ignoredUUID);
} }
} else { } else {
qWarning() << "Node::handlePersonalMutedNode called with null ID or ID of personal muting node."; qWarning() << "Node::handlePersonalMutedNode called with null ID or ID of personal muting node.";

6
interface/resources/qml/hifi/Pal.qml
View file

@ -386,7 +386,7 @@ Item {
// Get the index in userModel and userData associated with the passed UUID // Get the index in userModel and userData associated with the passed UUID
var userIndex = findSessionIndex(userId); var userIndex = findSessionIndex(userId);
// Set the userName appropriately // Set the userName appropriately
userModel.get(userIndex).userName = userName; userModel.setProperty(userIndex, "userName", userName);
userData[userIndex].userName = userName; // Defensive programming userData[userIndex].userName = userName; // Defensive programming
} }
break; break;
@ -399,7 +399,7 @@ Item {
myCard.audioLevel = audioLevel; // Defensive programming myCard.audioLevel = audioLevel; // Defensive programming
} else { } else {
var userIndex = findSessionIndex(userId); var userIndex = findSessionIndex(userId);
userModel.get(userIndex).audioLevel = audioLevel; userModel.setProperty(userIndex, "audioLevel", audioLevel);
userData[userIndex].audioLevel = audioLevel; // Defensive programming userData[userIndex].audioLevel = audioLevel; // Defensive programming
} }
} }
@ -408,7 +408,7 @@ Item {
var userId = message.params[0]; var userId = message.params[0];
var enabled = message.params[1]; var enabled = message.params[1];
var userIndex = findSessionIndex(userId); var userIndex = findSessionIndex(userId);
userModel.get(userIndex).personalMute.property = enabled; userModel.setProperty(userIndex, "personalMute", enabled);
userData[userIndex].personalMute.property = enabled; // Defensive programming userData[userIndex].personalMute.property = enabled; // Defensive programming
break; break;
default: default:

18
libraries/networking/src/Node.cpp
View file

@ -82,15 +82,17 @@ void Node::updateClockSkewUsec(qint64 clockSkewSample) {
} }
void Node::parseIgnoreRequestMessage(QSharedPointer<ReceivedMessage> message) { void Node::parseIgnoreRequestMessage(QSharedPointer<ReceivedMessage> message) {
// parse out the UUID being ignored from the packet while (message->getBytesLeftToRead()) {
QUuid ignoredUUID = QUuid::fromRfc4122(message->readWithoutCopy(NUM_BYTES_RFC4122_UUID)); // parse out the UUID being ignored from the packet
bool addToIgnore; QUuid ignoredUUID = QUuid::fromRfc4122(message->readWithoutCopy(NUM_BYTES_RFC4122_UUID));
message->readPrimitive(&addToIgnore); bool addToIgnore;
message->readPrimitive(&addToIgnore);
if (addToIgnore) { if (addToIgnore) {
addIgnoredNode(ignoredUUID); addIgnoredNode(ignoredUUID);
} else { } else {
removeIgnoredNode(ignoredUUID); removeIgnoredNode(ignoredUUID);
}
} }
} }