Showing the changes to interface/src/MetavoxelSystem.cpp (1 of 164 files). Show all
Unified · Split
| @@ -117,13 +117,13 @@ void MetavoxelSystem::render() { · 116 unmodified lines | ||
| 117 | 117 | } |
| 118 | 118 | |
| 119 | 119 | void MetavoxelSystem::nodeAdded(SharedNodePointer node) { |
| 120 | − if (node->getType() == NODE_TYPE_METAVOXEL_SERVER) { | |
| 120 | + if (node->getType() == NodeType::MetavoxelServer) { | |
| 121 | 121 | QMetaObject::invokeMethod(this, "addClient", Q_ARG(const SharedNodePointer&, node)); |
| 122 | 122 | } |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | 125 | void MetavoxelSystem::nodeKilled(SharedNodePointer node) { |
| 126 | − if (node->getType() == NODE_TYPE_METAVOXEL_SERVER) { | |
| 126 | + if (node->getType() == NodeType::MetavoxelServer) { | |
| 127 | 127 | QMetaObject::invokeMethod(this, "removeClient", Q_ARG(const QUuid&, node->getUUID())); |
| 128 | 128 | } |
| 129 | 129 | } |
| @@ -176,8 +176,7 @@ bool MetavoxelSystem::PointVisitor::visit(MetavoxelInfo& info) { · 46 unmodified lines | ||
| 176 | 176 | } |
| 177 | 177 | |
| 178 | 178 | static QByteArray createDatagramHeader(const QUuid& sessionID) { |
| 179 | − QByteArray header(MAX_PACKET_HEADER_BYTES, 0); | |
| 180 | − populateTypeAndVersion(reinterpret_cast<unsigned char*>(header.data()), PACKET_TYPE_METAVOXEL_DATA); | |
| 179 | + QByteArray header = byteArrayWithPopluatedHeader(PacketTypeMetavoxelData); | |
| 181 | 180 | header += sessionID.toRfc4122(); |
| 182 | 181 | return header; |
| 183 | 182 | } |