PdGraph::getBlockIndex returns a double for increased precision.

mhroth · Feb 19, 2012 · 4e37eb7 · 4e37eb7
1 parent f3606c5
commit 4e37eb7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/DspObject.cpp b/src/DspObject.cpp
@@ -45,6 +45,7 @@ void DspObject::init(int numDspInlets, int numDspOutlets, int blockSize) {
   blockSizeInt = blockSize;
   blockIndexOfLastMessage = 0.0f;
   signalPrecedence = MESSAGE_MESSAGE; // default
+  blockIndexOfLastMessage = 0.0;
   numBytesInBlock = blockSizeInt * sizeof(float);
 
   if (zeroBufferSize < blockSize) {

diff --git a/src/DspObject.h b/src/DspObject.h
@@ -142,7 +142,7 @@ class DspObject : public MessageObject {
     int blockSizeInt;
 
     /** The sample index of the last received message, relative to the beginning of the current block. */
-    float blockIndexOfLastMessage;
+    double blockIndexOfLastMessage;
 
     /** The local message queue. Messages that are pending for the next block. */
     queue<MessageLetPair> messageQueue;

diff --git a/src/PdGraph.cpp b/src/PdGraph.cpp
@@ -434,10 +434,9 @@ void PdGraph::unregisterObject(MessageObject *messageObject) {
   }
 }
 
-float PdGraph::getBlockIndex(PdMessage *message) {
+double PdGraph::getBlockIndex(PdMessage *message) {
   // sampleRate is in samples/second, but we need samples/millisecond
-  return ((float) (message->getTimestamp() - context->getBlockStartTimestamp())) *
-      context->getSampleRate() / 1000.0f;
+  return (message->getTimestamp() - context->getBlockStartTimestamp()) * 0.001 * context->getSampleRate();
 }
 
 float PdGraph::getSampleRate() {

diff --git a/src/PdGraph.h b/src/PdGraph.h
@@ -128,7 +128,7 @@ class PdGraph : public DspObject {
     int getNumOutputChannels();
 
     /** A convenience function to determine when in a block a message occurs. */
-    float getBlockIndex(PdMessage *message);
+    double getBlockIndex(PdMessage *message);
 
     /** Returns the graphId of this graph. */
     int getGraphId();