Some buffer fixes

Author: aacuevas

Source/Processors/DataThreads/DataBuffer.cpp

@@ -26,8 +26,8 @@
 DataBuffer::DataBuffer(int chans, int size)
     : abstractFifo(size), buffer(chans, size), numChans(chans)
 {
-    timestampBuffer = new int64[size];
-    eventCodeBuffer = new uint64[size];
+    timestampBuffer.malloc(size);
+    eventCodeBuffer.malloc(size);
 
 }
 
@@ -43,8 +43,8 @@ void DataBuffer::clear()
 void DataBuffer::resize(int chans, int size)
 {
     buffer.setSize(chans, size);
-    timestampBuffer = new int64[size];
-    eventCodeBuffer = new uint64[size];
+    timestampBuffer.malloc(size);
+    eventCodeBuffer.malloc(size);
 
     numChans = chans;
 }

Source/Processors/DataThreads/DataBuffer.h

@@ -60,8 +60,8 @@ class DataBuffer
     AbstractFifo abstractFifo;
     AudioSampleBuffer buffer;
 
-    int64* timestampBuffer;
-    uint64* eventCodeBuffer;
+    HeapBlock<int64> timestampBuffer;
+    HeapBlock<uint64> eventCodeBuffer;
 
     int numChans;
 

Source/Processors/DataThreads/RHD2000Thread.cpp

@@ -139,7 +139,7 @@ RHD2000Thread::RHD2000Thread(SourceNode* sn) : DataThread(sn),
             dacChannelsToUpdate[k] = true;
             dacStream[k] = 0;
             setDACthreshold(k, 65534);
-            dacChannels[k] = -1;
+            dacChannels[k] = 0;
             dacThresholds[k] = 0;
         }
 
@@ -205,6 +205,7 @@ void RHD2000Thread::setDACchannel(int dacOutput, int channel)
             {
                 dacChannels[dacOutput] = channel - channelCount;
                 dacStream[dacOutput] = i;
+				break;
             }
             else
             {
@@ -507,7 +508,7 @@ void RHD2000Thread::scanPorts()
     evalBoard->setMaxTimeStep(64);
     evalBoard->setContinuousRunMode(false);
 
-    Rhd2000DataBlock* dataBlock =
+    ScopedPointer<Rhd2000DataBlock> dataBlock =
         new Rhd2000DataBlock(evalBoard->getNumEnabledDataStreams(), evalBoard->isUSB3());
 
     Array<int> sumGoodDelays;
@@ -1598,7 +1599,7 @@ bool RHD2000Thread::updateBuffer()
             }
         }
 
-        evalBoard->setTtlMode(ttlMode);
+        evalBoard->setTtlMode(ttlMode ? 1 : 0);
         evalBoard->enableExternalFastSettle(fastTTLSettleEnabled);
         evalBoard->setExternalFastSettleChannel(fastSettleTTLChannel);
         evalBoard->setDacHighpassFilter(desiredDAChpf);

Source/Processors/DataThreads/rhythm-api/rhd2000evalboard.cpp

@@ -1100,7 +1100,7 @@ void Rhd2000EvalBoard::selectDacDataStream(int dacChannel, int stream)
         return;
     }
 
-    if (stream < 0 || stream > MAX_NUM_DATA_STREAMS(usb3)) {
+    if (stream < 0 || stream > MAX_NUM_DATA_STREAMS(usb3)+1) {
         cerr << "Error in Rhd2000EvalBoard::selectDacDataStream: stream out of range." << endl;
         return;
     }