diff -r e35735ece90c -r 3d8c721bf319 mmserv/tms/tmsimpl/src/tmsvolumeeffectbodyimpl.cpp --- a/mmserv/tms/tmsimpl/src/tmsvolumeeffectbodyimpl.cpp Mon Mar 15 12:42:35 2010 +0200 +++ b/mmserv/tms/tmsimpl/src/tmsvolumeeffectbodyimpl.cpp Wed Mar 31 22:29:45 2010 +0300 @@ -17,6 +17,7 @@ #include #include +#include "tmsutility.h" #include "tmscallproxy.h" #include "tmsqueuehandler.h" #include "tmsvolumeeffectbodyimpl.h" @@ -26,12 +27,14 @@ TMSVolumeEffectBodyImpl::TMSVolumeEffectBodyImpl() : iObserver(NULL), iProxy(NULL), - iParentEffect(NULL) + iParent(NULL) { } TMSVolumeEffectBodyImpl::~TMSVolumeEffectBodyImpl() { + TRACE_PRN_FN_ENT; + TRACE_PRN_FN_EXT; } gint TMSVolumeEffectBodyImpl::Create(TMSVolumeEffectBody*& bodyimpl) @@ -136,12 +139,9 @@ return ret; } -gint TMSVolumeEffectBodyImpl::SetParentEffect(TMSEffect*& parenteffect) +void TMSVolumeEffectBodyImpl::SetParent(TMSEffect*& parent) { - gint ret(TMS_RESULT_SUCCESS); - iParentEffect = NULL; - iParentEffect = parenteffect; - return ret; + iParent = parent; } void TMSVolumeEffectBodyImpl::SetProxy(TMSCallProxy* aProxy, @@ -150,7 +150,8 @@ iProxy = aProxy; if (queuehandler) { - ((TMSQueueHandler*) queuehandler)->AddObserver(*this, TMS_EFFECT_VOLUME); + ((TMSQueueHandler*) queuehandler)->AddObserver(*this, + TMS_EFFECT_VOLUME); } } @@ -158,7 +159,6 @@ void* /*user_data*/) { TMSSignalEvent event; - event.type = TMS_EVENT_EFFECT_VOL_CHANGED; event.reason = aError; @@ -166,9 +166,9 @@ { case TMS_EVENT_EFFECT_VOL_CHANGED: { - if (iObserver && iParentEffect) + if (iObserver && iParent) { - iObserver->EffectsEvent(iParentEffect, event); + iObserver->EffectsEvent(iParent, event); } } break; @@ -177,4 +177,3 @@ } } -// End of file