Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Jens Krüger
Lima
Commits
58d8daaa
Commit
58d8daaa
authored
Jul 09, 2018
by
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
control/include/lima/CtBuffer.h
View file @
58d8daaa
...
...
@@ -57,6 +57,7 @@ namespace lima {
public:
Parameters
();
void
reset
();
void
resetNonPersistent
();
BufferMode
mode
;
long
nbBuffers
;
short
maxMemory
;
...
...
control/src/CtBuffer.cpp
View file @
58d8daaa
...
...
@@ -205,7 +205,7 @@ void CtBuffer::reset()
{
DEB_MEMBER_FUNCT
();
m_pars
.
reset
();
m_pars
.
reset
NonPersistent
();
}
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
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment