Switch uint64_t to uint64

Source/Processors/DataThreads/DataBuffer.cpp

@@ -26,7 +26,7 @@
 DataBuffer::DataBuffer(int chans, int size)
     : abstractFifo(size), buffer(chans, size), numChans(chans)
 {
-    timestampBuffer = new uint64_t[size];
+    timestampBuffer = new uint64[size];
     eventCodeBuffer = new int16[size];
 
 }
@@ -42,13 +42,13 @@ void DataBuffer::clear()
 void DataBuffer::resize(int chans, int size)
 {
     buffer.setSize(chans, size);
-    timestampBuffer = new uint64_t[size];
+    timestampBuffer = new uint64[size];
     eventCodeBuffer = new int16[size];
 
     numChans = chans;
 }
 
-void DataBuffer::addToBuffer(float* data, uint64_t* timestamps, int16* eventCodes, int numItems)
+void DataBuffer::addToBuffer(float* data, uint64* timestamps, int16* eventCodes, int numItems)
 {
     // writes one sample for all channels
     int startIndex1, blockSize1, startIndex2, blockSize2;
@@ -75,7 +75,7 @@ int DataBuffer::getNumSamples()
 }
 
 
-int DataBuffer::readAllFromBuffer(AudioSampleBuffer& data, uint64_t* timestamp, int16* eventCodes, int maxSize)
+int DataBuffer::readAllFromBuffer(AudioSampleBuffer& data, uint64* timestamp, int16* eventCodes, int maxSize)
 {
     // check to see if the maximum size is smaller than the total number of available ints
     int numItems = (maxSize < abstractFifo.getNumReady()) ?

Source/Processors/DataThreads/DataBuffer.h

@@ -45,13 +45,13 @@ public:
     void clear();
 
     /** Add an array of floats to the buffer.*/
-    void addToBuffer(float* data, uint64_t* ts, int16* eventCodes, int numItems);
+    void addToBuffer(float* data, uint64* ts, int16* eventCodes, int numItems);
 
     /** Returns the number of samples currently available in the buffer.*/
     int getNumSamples();
 
     /** Copies as many samples as possible from the DataBuffer to an AudioSampleBuffer.*/
-    int readAllFromBuffer(AudioSampleBuffer& data, uint64_t* ts, int16* eventCodes, int maxSize);
+    int readAllFromBuffer(AudioSampleBuffer& data, uint64* ts, int16* eventCodes, int maxSize);
 
     /** Resizes the data buffer */
     void resize(int chans, int size);
@@ -60,7 +60,7 @@ private:
     AbstractFifo abstractFifo;
     AudioSampleBuffer buffer;
 
-    uint64_t* timestampBuffer;
+    uint64* timestampBuffer;
     int16* eventCodeBuffer;
 
     int numChans;

Source/Processors/DataThreads/DataThread.h

@@ -96,7 +96,7 @@ public:
     SourceNode* sn;
 
     int16 eventCode;
-    uint64_t timestamp;
+    uint64 timestamp;
 
     Time timer;
 

Source/Processors/RecordNode.cpp

@@ -597,23 +597,15 @@ void RecordNode::handleEvent(int eventType, MidiMessage& event, int samplePositi
     {
     	const uint8* dataptr = event.getRawData();
 
-        std::cout << (int) *(dataptr + 11) << " " <<
-                    (int) *(dataptr + 10) << " " <<
-                    (int) *(dataptr + 9) << " " <<
-                    (int) *(dataptr + 8) << " " <<
-                    (int) *(dataptr + 7) << " " <<
-                    (int) *(dataptr + 6) << " " <<
-                    (int) *(dataptr + 5) << " " <<
-                    (int) *(dataptr + 4) << std::endl;
-
-       // timestamp = ((uint64) *(dataptr + 4)) +
-       //             ((uint64) *(dataptr + 5)) << 8;
-       //             ((uint64) *(dataptr + 6)) << 16;
-        //            ((uint64) *(dataptr + 7)) << 24;
-                   // ((uint64) *(dataptr + 8)) << 32 + 
-                   // ((uint64) *(dataptr + 9)) << 40 + 
-                   // ((uint64) *(dataptr + 10)) << 48 + 
-                   // ((uint64) *(dataptr + 11)) << 56;
+        // std::cout << (int) *(dataptr + 11) << " " <<
+        //             (int) *(dataptr + 10) << " " <<
+        //             (int) *(dataptr + 9) << " " <<
+        //             (int) *(dataptr + 8) << " " <<
+        //             (int) *(dataptr + 7) << " " <<
+        //             (int) *(dataptr + 6) << " " <<
+        //             (int) *(dataptr + 5) << " " <<
+        //             (int) *(dataptr + 4) << std::endl;
+
 
     	memcpy(&timestamp, dataptr + 4, 8); // remember to skip first four bytes
     }

Source/Processors/RecordNode.h

@@ -131,7 +131,7 @@ private:
 
     /** Integer timestamp saved for each buffer.
     */
-    uint64_t timestamp;
+    uint64 timestamp;
 
     /** Used to generate timestamps if none are given.
     */

Source/Processors/SourceNode.h

@@ -103,7 +103,7 @@ private:
     ScopedPointer<DataThread> dataThread;
     DataBuffer* inputBuffer;
 
-    uint64_t timestamp;
+    uint64 timestamp;
     int16* eventCodeBuffer;
     int* eventChannelState;