From 508c0d60a1919651ab748186ebba7db4c0675ec5 Mon Sep 17 00:00:00 2001
From: jsiegle <jsiegle@mit.edu>
Date: Tue, 21 May 2013 15:06:41 -0400
Subject: [PATCH] Switch uint64_t to uint64
---
Source/Processors/DataThreads/DataBuffer.cpp | 8 +++---
Source/Processors/DataThreads/DataBuffer.h | 6 ++---
Source/Processors/DataThreads/DataThread.h | 2 +-
Source/Processors/RecordNode.cpp | 26 +++++++-------------
Source/Processors/RecordNode.h | 2 +-
Source/Processors/SourceNode.h | 2 +-
6 files changed, 19 insertions(+), 27 deletions(-)
diff --git a/Source/Processors/DataThreads/DataBuffer.cpp b/Source/Processors/DataThreads/DataBuffer.cpp
index 905aaead7..dcc8a2b37 100755
--- a/Source/Processors/DataThreads/DataBuffer.cpp
+++ b/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()) ?
diff --git a/Source/Processors/DataThreads/DataBuffer.h b/Source/Processors/DataThreads/DataBuffer.h
index 726a4d03e..be03599cd 100755
--- a/Source/Processors/DataThreads/DataBuffer.h
+++ b/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;
diff --git a/Source/Processors/DataThreads/DataThread.h b/Source/Processors/DataThreads/DataThread.h
index a9c01d009..03a18aa30 100755
--- a/Source/Processors/DataThreads/DataThread.h
+++ b/Source/Processors/DataThreads/DataThread.h
@@ -96,7 +96,7 @@ public:
SourceNode* sn;
int16 eventCode;
- uint64_t timestamp;
+ uint64 timestamp;
Time timer;
diff --git a/Source/Processors/RecordNode.cpp b/Source/Processors/RecordNode.cpp
index 4c0e6d631..8da062642 100755
--- a/Source/Processors/RecordNode.cpp
+++ b/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(×tamp, dataptr + 4, 8); // remember to skip first four bytes
}
diff --git a/Source/Processors/RecordNode.h b/Source/Processors/RecordNode.h
index 1e217d416..97b78461f 100755
--- a/Source/Processors/RecordNode.h
+++ b/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.
*/
diff --git a/Source/Processors/SourceNode.h b/Source/Processors/SourceNode.h
index 4d00d7c47..fa2d66cfe 100755
--- a/Source/Processors/SourceNode.h
+++ b/Source/Processors/SourceNode.h
@@ -103,7 +103,7 @@ private:
ScopedPointer<DataThread> dataThread;
DataBuffer* inputBuffer;
- uint64_t timestamp;
+ uint64 timestamp;
int16* eventCodeBuffer;
int* eventChannelState;
--
GitLab