Skip to content

Commit caaceec

Browse files
committed
Fix compilation warning 2
1 parent f2cf260 commit caaceec

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

include/effectengine/AnimationBaseMusic.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ struct MovingTarget
3333
int32_t _targetFastCounter;
3434

3535
void Clear();
36+
void CopyFrom(MovingTarget* source);
3637
};
3738

3839
class AnimationBaseMusic : public AnimationBase

libsrc/effectengine/AnimationBaseMusic.cpp

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ bool AnimationBaseMusic::isSoundEffect()
1919
};
2020

2121
void AnimationBaseMusic::store(MovingTarget* source) {
22-
memcpy(&_myTarget, source, sizeof(_myTarget));
22+
_myTarget.CopyFrom(source);
2323
};
2424

2525
void AnimationBaseMusic::restore(MovingTarget* target) {
26-
memcpy(target, &_myTarget, sizeof(_myTarget));
26+
target->CopyFrom(&_myTarget);
2727
};
2828

2929
void MovingTarget::Clear()
@@ -45,4 +45,23 @@ void MovingTarget::Clear()
4545
_targetFastCounter = 0;
4646
};
4747

48+
void MovingTarget::CopyFrom(MovingTarget* source)
49+
{
50+
_averageColor = source->_averageColor;
51+
_fastColor = source->_fastColor;
52+
_slowColor = source->_slowColor;
53+
_targetAverageR = source->_targetAverageR;
54+
_targetAverageG = source->_targetAverageG;
55+
_targetAverageB = source->_targetAverageB;
56+
_targetAverageCounter = source->_targetAverageCounter;
57+
_targetSlowR = source->_targetSlowR;
58+
_targetSlowG = source->_targetSlowG;
59+
_targetSlowB = source->_targetSlowB;
60+
_targetSlowCounter = source->_targetSlowCounter;
61+
_targetFastR = source->_targetFastR;
62+
_targetFastG = source->_targetFastG;
63+
_targetFastB = source->_targetFastB;
64+
_targetFastCounter = source->_targetFastCounter;
65+
};
66+
4867

0 commit comments

Comments
 (0)