Merge branch 'development' into channel-map-fix

Author: ethanbb

Source/Processors/DataThreads/DataBuffer.cpp

@@ -30,6 +30,8 @@ DataBuffer::DataBuffer (int chans, int size)
 {
     timestampBuffer.malloc (size);
     eventCodeBuffer.malloc (size);
+
+	lastTimestamp = 0;
 }
 
 
@@ -40,6 +42,7 @@ void DataBuffer::clear()
 {
     buffer.clear();
     abstractFifo.reset();
+	lastTimestamp = 0;
 }
 
 
@@ -50,6 +53,8 @@ void DataBuffer::resize (int chans, int size)
     timestampBuffer.malloc (size);
     eventCodeBuffer.malloc (size);
 
+	lastTimestamp = 0;
+
     numChans = chans;
 }
 
@@ -65,6 +70,9 @@ int DataBuffer::addToBuffer (float* data, int64* timestamps, uint64* eventCodes,
     int idx = 0;
     int blkIdx;
 
+	if (numItems > 0)
+		lastTimestamp = timestamps[numItems-1]; 
+
     for (int i = 0; bs[i] != 0; ++i)
     {                                // for each of the dest blocks we can write to...
         blkIdx = 0;
@@ -89,6 +97,8 @@ int DataBuffer::addToBuffer (float* data, int64* timestamps, uint64* eventCodes,
         }
     }
 
+	
+
     // finish write
     abstractFifo.finishedWrite (idx);
 
@@ -133,7 +143,7 @@ int DataBuffer::readAllFromBuffer (AudioSampleBuffer& data, uint64* timestamp, u
     }
     else
     {
-        memcpy (timestamp, timestampBuffer + startIndex2, 8);
+		memcpy(timestamp, &lastTimestamp, 8);
     }
 
     if (blockSize2 > 0)

Source/Processors/DataThreads/DataBuffer.h

@@ -72,6 +72,8 @@ class PLUGIN_API DataBuffer
     HeapBlock<int64> timestampBuffer;
     HeapBlock<uint64> eventCodeBuffer;
 
+	int64 lastTimestamp;
+
     int numChans;
 
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (DataBuffer);

Source/Processors/RecordNode/RecordNode.cpp

@@ -448,7 +448,7 @@ float RecordNode::getFreeSpace() const
 
 void RecordNode::handleEvent(const EventChannel* eventInfo, const MidiMessage& event, int samplePosition)
 {
-    if (isRecording)
+    if (true)
     {
 
             if ((*(event.getRawData()+0) & 0x80) == 0) // saving flag > 0 (i.e., event has not already been processed)
@@ -459,7 +459,8 @@ void RecordNode::handleEvent(const EventChannel* eventInfo, const MidiMessage& e
 					eventIndex = getEventChannelIndex(Event::getSourceIndex(event), Event::getSourceID(event), Event::getSubProcessorIdx(event));
 				else
 					eventIndex = -1;
-				m_eventQueue->addEvent(event, timestamp, eventIndex);
+				if (isRecording)
+					m_eventQueue->addEvent(event, timestamp, eventIndex);
             }
     }
 }

Source/Processors/RecordNode/RecordThread.cpp

@@ -80,7 +80,7 @@ void RecordThread::run()
 	//1-Wait until the first block has arrived, so we can align the timestamps
 	while (!m_receivedFirstBlock && !threadShouldExit())
 	{
-		wait(100);
+		wait(1);
 	}
 
 	//2-Open Files
@@ -145,7 +145,7 @@ void RecordThread::writeData(const AudioSampleBuffer& dataBuffer, int maxSamples
 			uint16 sourceID = SystemEvent::getSourceID(event);
 			uint16 subProcIdx = SystemEvent::getSubProcessorIdx(event);
 			int64 timestamp = SystemEvent::getTimestamp(event);
-			EVERY_ENGINE->writeTimestampSyncText(sourceID, subProcIdx, timestamp,
+				EVERY_ENGINE->writeTimestampSyncText(sourceID, subProcIdx, timestamp,
 				AccessClass::getProcessorGraph()->getRecordNode()->getSourceTimestamp(sourceID, subProcIdx),
 				SystemEvent::getSyncText(event));
 		}

Source/Processors/SourceNode/SourceNode.cpp

@@ -356,13 +356,15 @@ void SourceNode::process(AudioSampleBuffer& buffer)
 {
 	int nSubs = dataThread->getNumSubProcessors();
 	int copiedChannels = 0;
+
 	for (int sub = 0; sub < nSubs; sub++)
 	{
 		int channelsToCopy = getNumOutputs(sub);
+		
 		int nSamples = inputBuffers[sub]->readAllFromBuffer(buffer, &timestamp, static_cast<uint64*>(eventCodeBuffers[sub]->getData()), buffer.getNumSamples(), copiedChannels, channelsToCopy);
 		copiedChannels += channelsToCopy;
 
-		setTimestampAndSamples(timestamp, nSamples, sub);
+		setTimestampAndSamples(timestamp, nSamples, sub); 
 
 		if (ttlChannels[sub])
 		{