From 96844f0c4facc23289d572f6efc947033db53630 Mon Sep 17 00:00:00 2001
From: Aaron Cuevas Lopez <aacuelo@teleco.upv.es>
Date: Fri, 13 Mar 2015 00:02:52 +0100
Subject: [PATCH] Replace trialbuffer pointer with scopedpointer
---
Source/Processors/PSTH/PeriStimulusTimeHistogramNode.cpp | 2 --
Source/Processors/PSTH/PeriStimulusTimeHistogramNode.h | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/Source/Processors/PSTH/PeriStimulusTimeHistogramNode.cpp b/Source/Processors/PSTH/PeriStimulusTimeHistogramNode.cpp
index 3aa78eb1f..d65d36c06 100644
--- a/Source/Processors/PSTH/PeriStimulusTimeHistogramNode.cpp
+++ b/Source/Processors/PSTH/PeriStimulusTimeHistogramNode.cpp
@@ -114,7 +114,6 @@ void PeriStimulusTimeHistogramNode::allocateTrialCircularBuffer()
void PeriStimulusTimeHistogramNode::updateSettings()
{
- delete trialCircularBuffer;
trialCircularBuffer = nullptr;
if (trialCircularBuffer == nullptr && getSampleRate() > 0 && getNumInputs() > 0)
{
@@ -388,7 +387,6 @@ void PeriStimulusTimeHistogramNode::modifyTimeRange(double preSec_, double postS
TrialCircularBufferParams params = trialCircularBuffer->getParams();
params.preSec = preSec_;
params.postSec = postSec_;
- delete trialCircularBuffer;
trialCircularBuffer = new TrialCircularBuffer(params);
trialCircularBuffer->syncInternalDataStructuresWithSpikeSorter(electrodes);
diff --git a/Source/Processors/PSTH/PeriStimulusTimeHistogramNode.h b/Source/Processors/PSTH/PeriStimulusTimeHistogramNode.h
index f5c3fdc8e..f2b798825 100644
--- a/Source/Processors/PSTH/PeriStimulusTimeHistogramNode.h
+++ b/Source/Processors/PSTH/PeriStimulusTimeHistogramNode.h
@@ -80,7 +80,7 @@ public:
void loadCustomParametersFromXml();
void modifyTimeRange(double preSec_, double postSec_);
- TrialCircularBuffer *trialCircularBuffer;
+ ScopedPointer<TrialCircularBuffer> trialCircularBuffer;
bool saveTTLs, saveNetworkEvents,saveEyeTracking ;
int spikeSavingMode;
bool saveNetworkEventsWhenNotRecording;
--
GitLab