Skip to content

Change some integers in OriginalRecording to more specific types #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aacuevas merged 1 commit into from
Nov 16, 2018
Merged

Change some integers in OriginalRecording to more specific types #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Source/Processors/RecordNode/OriginalRecording.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ void OriginalRecording::writeTTLEvent(int eventIndex, const MidiMessage& event)
*(data + 11) = static_cast<uint8>(ev->getSourceID());
*(data + 12) = (ev->getEventType() == EventChannel::TTL) ? (dynamic_cast<TTLEvent*>(ev.get())->getState() ? 1 : 0) : 0;
*(data + 13) = static_cast<uint8>(ev->getChannel());
*reinterpret_cast<uint16*>(data + 14) = static_cast<uint16>(recordingNumber);
*reinterpret_cast<uint16*>(data + 14) = recordingNumber;


diskWriteLock.enter();
Expand Down
4 changes: 2 additions & 2 deletions Source/Processors/RecordNode/OriginalRecording.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class OriginalRecording : public RecordEngine
bool separateFiles;
Array<int> blockIndex;
Array<int> samplesSinceLastTimestamp;
int recordingNumber;
uint16 recordingNumber;
int experimentNumber;

bool renameFiles;
Expand All @@ -96,7 +96,7 @@ class OriginalRecording : public RecordEngine
//float* continuousDataFloatBuffer;

/** Used to indicate the end of each record */
HeapBlock<char> recordMarker;
HeapBlock<uint8> recordMarker;
//char* recordMarker;

AudioSampleBuffer zeroBuffer;
Expand Down