Skip to content

Commit ce291ca

Browse files
committed
Remove unused firstSampleNumber array
1 parent dc75005 commit ce291ca

3 files changed

Lines changed: 7 additions & 24 deletions

File tree

Source/Processors/RecordNode/BinaryFormat/BinaryRecording.cpp

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ void BinaryRecording::openFiles (File rootFolder, int experimentNumber, int reco
9797

9898
if (streamId != lastStreamId)
9999
{
100-
wroteFirstSampleNumber[streamId] = false;
101-
102100
firstChannels.add (channelInfo);
103101
streamIndex++;
104102

@@ -112,9 +110,12 @@ void BinaryRecording::openFiles (File rootFolder, int experimentNumber, int reco
112110
singleStreamJSON.clear();
113111
}
114112

113+
LOGD ("Recording channel: ", channelInfo->getName(), " from stream ", streamId, " with global index ", globalIndex, " and local index ", indexWithinStream);
114+
115115
m_fileIndexes.set (ch, streamIndex);
116116
m_channelIndexes.set (ch, indexWithinStream++);
117117

118+
118119
DynamicObject::Ptr singleChannelJSON = new DynamicObject();
119120

120121
singleChannelJSON->setProperty ("channel_name", channelInfo->getName());
@@ -678,12 +679,6 @@ void BinaryRecording::writeContinuousData (int writeChannel,
678679

679680
uint32 streamId = getContinuousChannel (realChannel)->getStreamId();
680681

681-
if (! wroteFirstSampleNumber[streamId])
682-
{
683-
firstSampleNumber[streamId] = baseSampleNumber;
684-
wroteFirstSampleNumber[streamId] = true;
685-
}
686-
687682
/* Generate sequential sample numbers using SIMD-optimized fill */
688683
SIMDConverter::fillSequentialInt64 (reinterpret_cast<int64_t*> (m_sampleNumberBuffer.getData()), baseSampleNumber, size);
689684

@@ -886,12 +881,6 @@ void BinaryRecording::writeContinuousDataBatch (const int* writeChannels,
886881
int64 baseSampleNumber = getLatestSampleNumber (writeChannels[i]);
887882
uint32 streamId = getContinuousChannel (realChannels[i])->getStreamId();
888883

889-
if (! wroteFirstSampleNumber[streamId])
890-
{
891-
firstSampleNumber[streamId] = baseSampleNumber;
892-
wroteFirstSampleNumber[streamId] = true;
893-
}
894-
895884
/* Generate sequential sample numbers using SIMD-optimized fill */
896885
SIMDConverter::fillSequentialInt64 (reinterpret_cast<int64_t*> (m_sampleNumberBuffer.getData()), baseSampleNumber, numSamples);
897886

@@ -913,13 +902,7 @@ void BinaryRecording::writeTimestampSyncText (uint64 streamId, int64 sampleNumbe
913902
String syncString = text + ": " + String (sampleNumber);
914903
LOGD (syncString);
915904

916-
int64 fsn = firstSampleNumber[streamId];
917-
918-
if (streamId > 0)
919-
jassert (fsn == sampleNumber);
920-
921905
m_syncTextFile->writeText (syncString + "\r\n", false, false, nullptr);
922-
// Note: flush removed - file will be flushed on close or by OS buffering
923906
}
924907

925908
RecordEngineManager* BinaryRecording::getEngineManager()

Source/Processors/RecordNode/BinaryFormat/BinaryRecording.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,6 @@ class BinaryRecording : public RecordEngine
141141
int m_experimentNum;
142142
Array<int64> m_samplesWritten;
143143

144-
std::map<uint64, int64> firstSampleNumber;
145-
std::map<uint64, bool> wroteFirstSampleNumber;
146-
147144
const int samplesPerBlock { 8192 }; // Larger blocks reduce memory block operations
148145
};
149146
#endif

Source/Processors/RecordNode/RecordThread.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,10 @@ void RecordThread::writeData (int minSamples,
354354
if (SystemEvent::getBaseType (event) == EventBase::Type::SYSTEM_EVENT)
355355
{
356356
String syncText = SystemEvent::getSyncText (event);
357-
m_engine->writeTimestampSyncText (SystemEvent::getStreamId (event), SystemEvent::getSampleNumber (event), 0.0f, SystemEvent::getSyncText (event));
357+
m_engine->writeTimestampSyncText (SystemEvent::getStreamId (event),
358+
SystemEvent::getSampleNumber (event),
359+
0.0f,
360+
SystemEvent::getSyncText (event));
358361
}
359362
else
360363
{

0 commit comments

Comments
 (0)