inlet~ and outlet~ pass on their input buffers directly to following …

…objects. When the input buffer to these objects is updated, they inform following objects of the buffer update.
mhroth · Feb 26, 2012 · 7bd3d98 · 7bd3d98
1 parent c2cb504
commit 7bd3d98
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 27 deletions.
diff --git a/src/DspFilter.cpp b/src/DspFilter.cpp
@@ -44,7 +44,7 @@ void DspFilter::onInletConnectionUpdate(unsigned int inletIndex) {
   // TODO(mhroth)
 }
 
-float *DspFilter::getDspBufferRefAtOutlet(int outletIndex) {
+float *DspFilter::getDspBufferAtOutlet(int outletIndex) {
   return dspBufferAtOutlet0+2;
 }
 

diff --git a/src/DspFilter.h b/src/DspFilter.h
@@ -32,7 +32,7 @@ class DspFilter : public DspObject {
     DspFilter(int numMessageInlets, PdGraph *graph);
     ~DspFilter();
 
-    float *getDspBufferRefAtOutlet(int outletIndex);
+    float *getDspBufferAtOutlet(int outletIndex);
 
     void onInletConnectionUpdate(unsigned int inletIndex);
 

diff --git a/src/DspInlet.cpp b/src/DspInlet.cpp
@@ -29,7 +29,8 @@ MessageObject *DspInlet::newObject(PdMessage *initMessage, PdGraph *graph) {
 }
 
 DspInlet::DspInlet(PdGraph *graph) : DspObject(0, 1, 0, 1, graph) {
-  // nothing to do
+  free(dspBufferAtOutlet0); // this buffer is not needed
+  dspBufferAtOutlet0 = NULL; // the inlet buffer is passed directly to subsequent dsp objects
 }
 
 DspInlet::~DspInlet() {
@@ -70,10 +71,20 @@ list<MessageObject *> *DspInlet::getProcessOrderFromInlet() {
   return processList;
 }
 
-void DspInlet::receiveMessage(int inletIndex, PdMessage *message) {
-  graph->printErr("DspInlet has received a message in error: %s", message->toString());
+void DspInlet::onDspBufferAtInletUpdate(float *buffer, unsigned int inletIndex) {
+  // when the dsp buffer updates at a given inlet, inform all receiving objects
+  list<ObjectLetPair> dspConnections = outgoingDspConnections[0];
+  for (list<ObjectLetPair>::iterator it = dspConnections.begin(); it != dspConnections.end(); ++it) {
+    ObjectLetPair letPair = *it;
+    DspObject *dspObject = reinterpret_cast<DspObject *>(letPair.first);
+    dspObject->setDspBufferAtInlet(dspBufferAtInlet[inletIndex], letPair.second);
+  }
+}
+
+float *DspInlet::getDspBufferAtOutlet(int outletIndex) {
+  return dspBufferAtInlet[outletIndex];
 }
 
 void DspInlet::processDsp() {
-  memcpy(dspBufferAtOutlet0, dspBufferAtInlet[0], numBytesInBlock);
+  // nothing to do
 }
diff --git a/src/DspInlet.h b/src/DspInlet.h
@@ -46,8 +46,12 @@ class DspInlet : public DspObject {
     list<MessageObject *> *getProcessOrder();
     list<MessageObject *> *getProcessOrderFromInlet();
 
-    void receiveMessage(int inletIndex, PdMessage *message);
+    float *getDspBufferAtOutlet(int outletIndex);
+
     void processDsp();
+
+  protected:
+    void onDspBufferAtInletUpdate(float *buffer, unsigned int inletIndex);
 };
 
 #endif // _DSP_INLET_H_
diff --git a/src/DspObject.cpp b/src/DspObject.cpp
@@ -98,7 +98,7 @@ ConnectionType DspObject::getConnectionType(int outletIndex) {
   return DSP;
 }
 
-float *DspObject::getDspBufferRefAtOutlet(int outletIndex) {
+float *DspObject::getDspBufferAtOutlet(int outletIndex) {
   // sanity check on outletIndex
   return (outletIndex < outgoingDspConnections.size()) ? dspBufferAtOutlet0 + (outletIndex * blockSizeInt) : NULL;
 }
@@ -141,21 +141,21 @@ void DspObject::addConnectionFromObjectToInlet(MessageObject *messageObject, int
     list<ObjectLetPair> *connections = &incomingDspConnections[inletIndex];
     ObjectLetPair objectLetPair = make_pair(messageObject, outletIndex);
     connections->push_back(objectLetPair);
-
-    onInletConnectionUpdate(inletIndex);
   }
+
+  onInletConnectionUpdate(inletIndex);
 }
 
 void DspObject::removeConnectionFromObjectToInlet(MessageObject *messageObject, int outletIndex, int inletIndex) {
   if (messageObject->getConnectionType(outletIndex) == DSP) {
     list<ObjectLetPair> *connections = &incomingDspConnections[inletIndex];
     ObjectLetPair objectLetPair = make_pair(messageObject, outletIndex);
     connections->remove(objectLetPair); // NOTE(mhroth): does this work?
-
-    onInletConnectionUpdate(inletIndex);
   } else {
     MessageObject::removeConnectionFromObjectToInlet(messageObject, outletIndex, inletIndex);
   }
+
+  onInletConnectionUpdate(inletIndex);
 }
 
 void DspObject::onInletConnectionUpdate(unsigned int inletIndex) {
@@ -183,8 +183,14 @@ void DspObject::removeConnectionToObjectFromOutlet(MessageObject *messageObject,
   }
 }
 
-void DspObject::setDspBufferRefAtInlet(float *buffer, unsigned int inletIndex) {
+void DspObject::setDspBufferAtInlet(float *buffer, unsigned int inletIndex) {
   dspBufferAtInlet[inletIndex] = buffer;
+
+  onDspBufferAtInletUpdate(buffer, inletIndex);
+}
+
+void DspObject::onDspBufferAtInletUpdate(float *buffer, unsigned int inletIndex) {
+  // nothign to do
 }
 
 

diff --git a/src/DspObject.h b/src/DspObject.h
@@ -67,9 +67,9 @@ class DspObject : public MessageObject {
     /** Returns the connection type of the given outlet. */
     virtual ConnectionType getConnectionType(int outletIndex);
 
-    virtual float *getDspBufferRefAtOutlet(int outletIndex);
+    virtual float *getDspBufferAtOutlet(int outletIndex);
 
-    virtual void setDspBufferRefAtInlet(float *buffer, unsigned int inletIndex);
+    virtual void setDspBufferAtInlet(float *buffer, unsigned int inletIndex);
 
     virtual void addConnectionFromObjectToInlet(MessageObject *messageObject, int outletIndex, int inletIndex);
     virtual void addConnectionToObjectFromOutlet(MessageObject *messageObject, int inletIndex, int outletIndex);
@@ -117,6 +117,8 @@ class DspObject : public MessageObject {
      */
     virtual void onInletConnectionUpdate(unsigned int inletIndex);
 
+    virtual void onDspBufferAtInletUpdate(float *buffer, unsigned int inletIndex);
+
     /** Immediately deletes all messages in the message queue without executing them. */
     void clearMessageQueue();
 

diff --git a/src/DspOutlet.cpp b/src/DspOutlet.cpp
@@ -27,7 +27,8 @@ MessageObject *DspOutlet::newObject(PdMessage *initMessage, PdGraph *graph) {
 }
 
 DspOutlet::DspOutlet(PdGraph *graph) : DspObject(0, 1, 0, 1, graph) {
-  canvasX = 0.0f;
+  free(dspBufferAtOutlet0);
+  dspBufferAtOutlet0 = NULL;
 }
 
 DspOutlet::~DspOutlet() {
@@ -50,10 +51,20 @@ bool DspOutlet::isLeafNode() {
   return true;
 }
 
-float *DspOutlet::getDspBufferRefAtOutlet(int outletIndex) {
-  return dspBufferAtOutlet0;
+void DspOutlet::onDspBufferAtInletUpdate(float *buffer, unsigned int inletIndex) {
+  // when the dsp buffer updates at a given inlet, inform all receiving objects
+  list<ObjectLetPair> dspConnections = outgoingDspConnections[0];
+  for (list<ObjectLetPair>::iterator it = dspConnections.begin(); it != dspConnections.end(); ++it) {
+    ObjectLetPair letPair = *it;
+    DspObject *dspObject = reinterpret_cast<DspObject *>(letPair.first);
+    dspObject->setDspBufferAtInlet(dspBufferAtInlet[inletIndex], letPair.second);
+  }
+}
+
+float *DspOutlet::getDspBufferAtOutlet(int outletIndex) {
+  return dspBufferAtInlet[outletIndex];
 }
 
 void DspOutlet::processDsp() {
-  memcpy(dspBufferAtOutlet0, dspBufferAtInlet[0], numBytesInBlock);
+  // nothing to do
 }
diff --git a/src/DspOutlet.h b/src/DspOutlet.h
@@ -48,9 +48,12 @@ class DspOutlet : public DspObject {
 
     bool isLeafNode();
 
-    float *getDspBufferRefAtOutlet(int outletIndex);
+    float *getDspBufferAtOutlet(int outletIndex);
 
     void processDsp();
+
+  protected:
+    void onDspBufferAtInletUpdate(float *buffer, unsigned int inletIndex);
 };
 
 #endif // _DSP_OUTLET_H_
diff --git a/src/DspRfft.cpp b/src/DspRfft.cpp
@@ -54,7 +54,7 @@ void DspRfft::processDsp() {
   inputVector.imagp = DspObject::zeroBuffer;
   DSPSplitComplex outputVector;
   outputVector.realp = dspBufferAtOutlet0;
-  outputVector.imagp = getDspBufferRefAtOutlet(1);
+  outputVector.imagp = getDspBufferAtOutlet(1);
   vDSP_fft_zop(fftSetup, &inputVector, 1, &outputVector, 1, log2n, kFFTDirection_Forward);
 
   // NOTE(mhroth): vDSP_fft_zop outputs the entire series of symmetric coefficients.

diff --git a/src/PdGraph.cpp b/src/PdGraph.cpp
@@ -219,9 +219,9 @@ void PdGraph::addLetObjectToLetList(MessageObject *inletObject, float newPositio
 
 #pragma mark -
 
-float *PdGraph::getDspBufferRefAtOutlet(int outletIndex) {
+float *PdGraph::getDspBufferAtOutlet(int outletIndex) {
   DspObject *dspOutlet = (DspObject *) outletList.at(outletIndex);
-  return dspOutlet->getDspBufferRefAtOutlet(0);
+  return dspOutlet->getDspBufferAtOutlet(0);
 }
 
 
@@ -694,15 +694,15 @@ void PdGraph::computeLocalDspProcessOrder() {
         switch (incomingDspConnectionsList.size()) {
           case 0: {
             // if no connections are made to an inlet, then it receives a zero buffer
-            dspObject->setDspBufferRefAtInlet(zeroBuffer, i);
+            dspObject->setDspBufferAtInlet(zeroBuffer, i);
             break;
           }
           case 1: {
             // if only one connections exists to the object, add the connection directly
             ObjectLetPair objectLetPair = incomingDspConnectionsList.front();
             DspObject *prevObject = (DspObject *) objectLetPair.first;
             unsigned int outletIndex = objectLetPair.second;
-            dspObject->setDspBufferRefAtInlet(prevObject->getDspBufferRefAtOutlet(outletIndex), i);
+            dspObject->setDspBufferAtInlet(prevObject->getDspBufferAtOutlet(outletIndex), i);
             break;
           }
           default: {
@@ -722,7 +722,7 @@ void PdGraph::computeLocalDspProcessOrder() {
               implicitDspAddList.push_back(dspAdd);
             }
             // set dsp ref at inlet of dspObject to prevObject
-            dspObject->setDspBufferRefAtInlet(prevObject->getDspBufferRefAtOutlet(0), i);
+            dspObject->setDspBufferAtInlet(prevObject->getDspBufferAtOutlet(0), i);
             break;
           }
         }

diff --git a/src/PdGraph.h b/src/PdGraph.h
@@ -189,7 +189,7 @@ class PdGraph : public DspObject {
     void setValueForName(char *name, float constant);
     float getValueForName(char *name);
 
-    float *getDspBufferRefAtOutlet(int outletIndex);
+    float *getDspBufferAtOutlet(int outletIndex);
 
     void processDsp();