Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-11 11:27:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

repair crazy references to node ponter from old iterator style

Browse source
This commit is contained in:
Stephen Birarda 2014-01-14 10:49:46 -08:00
parent 66f50c38e3
commit 9efb391ecf
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -272,7 +272,7 @@ void AudioMixer::run() {
foreach(SharedNodePointer node, nodeList->getNodeHash()) { foreach(SharedNodePointer node, nodeList->getNodeHash()) {
if (node->getType() == NODE_TYPE_AGENT && node->getActiveSocket() && node->getLinkedData() if (node->getType() == NODE_TYPE_AGENT && node->getActiveSocket() && node->getLinkedData()
&& ((AudioMixerClientData*) node->getLinkedData())->getAvatarAudioRingBuffer()) { && ((AudioMixerClientData*) node->getLinkedData())->getAvatarAudioRingBuffer()) {
prepareMixForListeningNode(&(*node)); prepareMixForListeningNode(node.data());
memcpy(clientPacket + numBytesPacketHeader, _clientSamples, sizeof(_clientSamples)); memcpy(clientPacket + numBytesPacketHeader, _clientSamples, sizeof(_clientSamples));
nodeList->getNodeSocket().writeDatagram((char*) clientPacket, sizeof(clientPacket), nodeList->getNodeSocket().writeDatagram((char*) clientPacket, sizeof(clientPacket),

2
assignment-client/src/avatars/AvatarMixer.cpp
View file

@ -80,7 +80,7 @@ void broadcastAvatarData() {
if (otherNode->getLinkedData() && otherNode->getUUID() != node->getUUID()) { if (otherNode->getLinkedData() && otherNode->getUUID() != node->getUUID()) {
unsigned char* avatarDataEndpoint = addNodeToBroadcastPacket((unsigned char*)&avatarDataBuffer[0], unsigned char* avatarDataEndpoint = addNodeToBroadcastPacket((unsigned char*)&avatarDataBuffer[0],
&*otherNode); otherNode.data());
int avatarDataLength = avatarDataEndpoint - (unsigned char*)&avatarDataBuffer; int avatarDataLength = avatarDataEndpoint - (unsigned char*)&avatarDataBuffer;
if (avatarDataLength + packetLength <= MAX_PACKET_SIZE) { if (avatarDataLength + packetLength <= MAX_PACKET_SIZE) {

4
domain-server/src/DomainServer.cpp
View file

@ -207,7 +207,7 @@ void DomainServer::readAvailableDatagrams() {
// don't send avatar nodes to other avatars, that will come from avatar mixer // don't send avatar nodes to other avatars, that will come from avatar mixer
if (nodeType != NODE_TYPE_AGENT || node->getType() != NODE_TYPE_AGENT) { if (nodeType != NODE_TYPE_AGENT || node->getType() != NODE_TYPE_AGENT) {
currentBufferPos = addNodeToBroadcastPacket(currentBufferPos, &(*node)); currentBufferPos = addNodeToBroadcastPacket(currentBufferPos, node.data());
} }
} }
@ -322,7 +322,7 @@ int DomainServer::civetwebRequestHandler(struct mg_connection *connection) {
if (node->getLinkedData()) { if (node->getLinkedData()) {
// add the node using the UUID as the key // add the node using the UUID as the key
QString uuidString = uuidStringWithoutCurlyBraces(node->getUUID()); QString uuidString = uuidStringWithoutCurlyBraces(node->getUUID());
assignedNodesJSON[uuidString] = jsonObjectForNode(&(*node)); assignedNodesJSON[uuidString] = jsonObjectForNode(node.data());
} }
} }

2
interface/src/ui/VoxelStatsDialog.cpp
View file

@ -263,7 +263,7 @@ void VoxelStatsDialog::showOctreeServersOfType(int& serverCount, NODE_TYPE serve
std::stringstream extraDetails(""); std::stringstream extraDetails("");
std::stringstream linkDetails(""); std::stringstream linkDetails("");
if (nodeList->getNodeActiveSocketOrPing(&(*node))) { if (nodeList->getNodeActiveSocketOrPing(node.data())) {
serverDetails << "active "; serverDetails << "active ";
} else { } else {
serverDetails << "inactive "; serverDetails << "inactive ";

2
libraries/octree/src/JurisdictionListener.cpp
View file

@ -45,7 +45,7 @@ bool JurisdictionListener::queueJurisdictionRequest() {
NodeList* nodeList = NodeList::getInstance(); NodeList* nodeList = NodeList::getInstance();
foreach(SharedNodePointer node, nodeList->getNodeHash()) { foreach(SharedNodePointer node, nodeList->getNodeHash()) {
if (nodeList->getNodeActiveSocketOrPing(&(*node)) && if (nodeList->getNodeActiveSocketOrPing(node.data()) &&
node->getType() == getNodeType()) { node->getType() == getNodeType()) {
const HifiSockAddr* nodeAddress = node->getActiveSocket(); const HifiSockAddr* nodeAddress = node->getActiveSocket();
PacketSender::queuePacketForSending(*nodeAddress, bufferOut, sizeOut); PacketSender::queuePacketForSending(*nodeAddress, bufferOut, sizeOut);

4
libraries/octree/src/OctreeEditPacketSender.cpp
View file

@ -61,7 +61,7 @@ bool OctreeEditPacketSender::serversExist() const {
foreach(SharedNodePointer node, nodeList->getNodeHash()) { foreach(SharedNodePointer node, nodeList->getNodeHash()) {
// only send to the NodeTypes that are getMyNodeType() // only send to the NodeTypes that are getMyNodeType()
if (node->getType() == getMyNodeType()) { if (node->getType() == getMyNodeType()) {
if (nodeList->getNodeActiveSocketOrPing(&(*node))) { if (nodeList->getNodeActiveSocketOrPing(node.data())) {
QUuid nodeUUID = node->getUUID(); QUuid nodeUUID = node->getUUID();
// If we've got Jurisdictions set, then check to see if we know the jurisdiction for this server // If we've got Jurisdictions set, then check to see if we know the jurisdiction for this server
if (_serverJurisdictions) { if (_serverJurisdictions) {
@ -91,7 +91,7 @@ void OctreeEditPacketSender::queuePacketToNode(const QUuid& nodeUUID, unsigned c
// only send to the NodeTypes that are getMyNodeType() // only send to the NodeTypes that are getMyNodeType()
if (node->getType() == getMyNodeType() && if (node->getType() == getMyNodeType() &&
((node->getUUID() == nodeUUID) || (nodeUUID.isNull()))) { ((node->getUUID() == nodeUUID) || (nodeUUID.isNull()))) {
if (nodeList->getNodeActiveSocketOrPing(&(*node))) { if (nodeList->getNodeActiveSocketOrPing(node.data())) {
const HifiSockAddr* nodeAddress = node->getActiveSocket(); const HifiSockAddr* nodeAddress = node->getActiveSocket();
queuePacketForSending(*nodeAddress, buffer, length); queuePacketForSending(*nodeAddress, buffer, length);