Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-23 11:33:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compile fixes

Browse source
This commit is contained in:
Atlante45 2015-07-08 10:40:35 -07:00
parent 818521864b
commit 7713219718
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/audio/src/AudioInjector.cpp
View file

@ -156,7 +156,7 @@ void AudioInjector::injectToMixer() {
auto audioPacket = NLPacket::create(PacketType::InjectAudio);
// setup the packet for injected audio
QDataStream audioPacketStream(&audioPacket);
QDataStream audioPacketStream(audioPacket.get());
// pack some placeholder sequence number for now
audioPacketStream << (quint16) 0;

2
libraries/networking/src/NodeList.cpp
View file

@ -618,7 +618,7 @@ void NodeList::pingPunchForInactiveNode(const SharedNodePointer& node) {
if (!node->getSymmetricSocket().isNull()) {
auto symmetricPingPacket = constructPingPacket(PingType::Symmetric);
sendPacket(symmetricPingPacket, node, node->getSymmetricSocket());
sendPacket(std::move(symmetricPingPacket), node, node->getSymmetricSocket());
}
node->incrementConnectionAttempts();

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

@ -41,7 +41,7 @@ bool JurisdictionListener::queueJurisdictionRequest() {
nodeList->eachNode([&](const SharedNodePointer& node) {
if (node->getType() == getNodeType() && node->getActiveSocket()) {
_packetSender.queuePacketForSending(node, packet);
_packetSender.queuePacketForSending(node, std::move(packet));
nodeCount++;
}
});

6
libraries/octree/src/JurisdictionMap.cpp
View file

@ -271,8 +271,8 @@ bool JurisdictionMap::writeToFile(const char* filename) {
int JurisdictionMap::packEmptyJurisdictionIntoMessage(NodeType_t type, unsigned char* destinationBuffer, int availableBytes) {
unsigned char* bufferStart = destinationBuffer;
int headerLength = DependencyManager::get<NodeList>()->populatePacketHeader(reinterpret_cast<char*>(destinationBuffer),
PacketType::Jurisdiction);
int headerLength = DependencyManager::get<NodeList>()->populatePacketHeader(reinterpret_cast<char*>(destinationBuffer),
PacketType::Jurisdiction);
destinationBuffer += headerLength;
// Pack the Node Type in first byte
@ -290,7 +290,7 @@ int JurisdictionMap::packEmptyJurisdictionIntoMessage(NodeType_t type, unsigned
int JurisdictionMap::packIntoMessage(unsigned char* destinationBuffer, int availableBytes) {
unsigned char* bufferStart = destinationBuffer;
int headerLength = DependencyManager::get<NodeList>()->populatePacketHeader(reinterpret_cast<char*>(destinationBuffer),
int headerLength = DependencyManager::get<NodeList>()->populatePacketHeader(reinterpret_cast<char*>(destinationBuffer),
PacketType::Jurisdiction);
destinationBuffer += headerLength;

2
libraries/octree/src/OctreeSceneStats.h
View file

@ -176,7 +176,7 @@ private:
bool _isReadyToSend;
std::unique_ptr<NLPacket> _statsPacket { NLPacket::create(PacketType::OctreeStats); }
std::unique_ptr<NLPacket> _statsPacket = NLPacket::create(PacketType::OctreeStats);
// scene timing data in usecs
bool _isStarted;