From a05e07460f919e6b7489474aa7662bff4d27df13 Mon Sep 17 00:00:00 2001 From: Brad Hefta-Gaub Date: Wed, 5 Feb 2014 13:54:17 -0800 Subject: [PATCH] fix windows build errors and warnings --- interface/src/Audio.cpp | 3 ++- libraries/metavoxels/src/DatagramSequencer.cpp | 2 +- libraries/shared/src/NodeList.cpp | 2 +- libraries/shared/src/PacketHeaders.cpp | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp index 6b6de5a51d..d7aae8e6f3 100644 --- a/interface/src/Audio.cpp +++ b/interface/src/Audio.cpp @@ -481,7 +481,7 @@ void Audio::addReceivedAudioToBuffer(const QByteArray& audioByteArray) { // copy the samples we'll resample from the ring buffer - this also // pushes the read pointer of the ring buffer forwards - int16_t ringBufferSamples[numNetworkOutputSamples]; + int16_t* ringBufferSamples= new int16_t[numNetworkOutputSamples]; _ringBuffer.readSamples(ringBufferSamples, numNetworkOutputSamples); // add the next numNetworkOutputSamples from each QByteArray @@ -502,6 +502,7 @@ void Audio::addReceivedAudioToBuffer(const QByteArray& audioByteArray) { Q_ARG(QByteArray, QByteArray((char*) ringBufferSamples, numNetworkOutputSamples)), Q_ARG(bool, true), Q_ARG(bool, false)); } + delete[] ringBufferSamples; } } diff --git a/libraries/metavoxels/src/DatagramSequencer.cpp b/libraries/metavoxels/src/DatagramSequencer.cpp index 83ef641b39..8daec16511 100644 --- a/libraries/metavoxels/src/DatagramSequencer.cpp +++ b/libraries/metavoxels/src/DatagramSequencer.cpp @@ -138,7 +138,7 @@ void DatagramSequencer::receivedDatagram(const QByteArray& datagram) { } // read and dispatch the high-priority messages - quint32 highPriorityMessageCount; + int highPriorityMessageCount; _incomingPacketStream >> highPriorityMessageCount; int newHighPriorityMessages = highPriorityMessageCount - _receivedHighPriorityMessages; for (int i = 0; i < highPriorityMessageCount; i++) { diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp index cd9356ab15..d6b8005263 100644 --- a/libraries/shared/src/NodeList.cpp +++ b/libraries/shared/src/NodeList.cpp @@ -337,7 +337,7 @@ void NodeList::processSTUNResponse(const QByteArray& packet) { const uint32_t RFC_5389_MAGIC_COOKIE_NETWORK_ORDER = htonl(RFC_5389_MAGIC_COOKIE); - size_t attributeStartIndex = NUM_BYTES_STUN_HEADER; + int attributeStartIndex = NUM_BYTES_STUN_HEADER; if (memcmp(packet.data() + NUM_BYTES_MESSAGE_TYPE_AND_LENGTH, &RFC_5389_MAGIC_COOKIE_NETWORK_ORDER, diff --git a/libraries/shared/src/PacketHeaders.cpp b/libraries/shared/src/PacketHeaders.cpp index 67b534bc34..16e7cca1c1 100644 --- a/libraries/shared/src/PacketHeaders.cpp +++ b/libraries/shared/src/PacketHeaders.cpp @@ -37,7 +37,7 @@ int packArithmeticallyCodedValue(int value, char* destination) { return 1; } else { // pack 255 and then recursively pack on - destination[0] = 255; + ((unsigned char*)destination)[0] = 255; return 1 + packArithmeticallyCodedValue(value - 255, destination + 1); } }