Commit 58d8daaa authored by Samuel Debionne's avatar Samuel Debionne
Browse files

Merge branch 'persistent_buffer_max_memory_on_reset' into 'master'

Persistent buffer maxMemory on reset

See merge request !71
parents 364a3337 afd19345
......@@ -57,6 +57,7 @@ namespace lima {
public:
Parameters();
void reset();
void resetNonPersistent();
BufferMode mode;
long nbBuffers;
short maxMemory;
......
......@@ -205,7 +205,7 @@ void CtBuffer::reset()
{
DEB_MEMBER_FUNCT();
m_pars.reset();
m_pars.resetNonPersistent();
}
void CtBuffer::setup(CtControl *ct)
......@@ -361,9 +361,16 @@ void CtBuffer::Parameters::reset()
{
DEB_MEMBER_FUNCT();
maxMemory= 70;
resetNonPersistent();
}
void CtBuffer::Parameters::resetNonPersistent()
{
DEB_MEMBER_FUNCT();
mode= Linear;
nbBuffers= 1;
maxMemory= 70;
DEB_TRACE() << *this;
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment