diff -r ebf79c79991a -r 5e8b14bae8c3 mmserv/tms/tmsimpl/src/tmsdtmfimpl.cpp --- a/mmserv/tms/tmsimpl/src/tmsdtmfimpl.cpp Fri Jun 25 17:36:03 2010 -0500 +++ b/mmserv/tms/tmsimpl/src/tmsdtmfimpl.cpp Fri Jul 09 16:43:35 2010 -0500 @@ -21,10 +21,9 @@ using namespace TMS; -TMSDTMFImpl::TMSDTMFImpl(TMSStreamType streamtype) +TMSDTMFImpl::TMSDTMFImpl() { TRACE_PRN_FN_ENT; - iStreamType = streamtype; TRACE_PRN_FN_EXT; } @@ -34,12 +33,12 @@ TRACE_PRN_FN_EXT; } -gint TMSDTMFImpl::PostConstruct() +gint TMSDTMFImpl::PostConstruct(TMSStreamType streamtype) { + TRACE_PRN_FN_ENT; gint ret(TMS_RESULT_INSUFFICIENT_MEMORY); TMSDTMFBody* bodyimpl(NULL); - TRACE_PRN_FN_ENT; - ret = TMSDTMFBodyImpl::Create(iStreamType, bodyimpl); + ret = TMSDTMFBodyImpl::Create(streamtype, *this, bodyimpl); if (ret == TMS_RESULT_SUCCESS) { @@ -51,49 +50,32 @@ EXPORT_C gint TMSDTMFImpl::Create(TMSStreamType streamtype, TMSDTMF*& dtmf) { + TRACE_PRN_FN_ENT; gint ret(TMS_RESULT_INSUFFICIENT_MEMORY); - TMSDTMFImpl *self = new TMSDTMFImpl(streamtype); + TMSDTMFImpl *self = new TMSDTMFImpl(); - TRACE_PRN_FN_ENT; if (self) { - ret = self->PostConstruct(); + ret = self->PostConstruct(streamtype); if (ret != TMS_RESULT_SUCCESS) { delete self; self = NULL; } } - if (self && ret == TMS_RESULT_SUCCESS) - { - dtmf = self; - ret = self->SetParent(dtmf); - } + + dtmf = self; TRACE_PRN_FN_EXT; return ret; } EXPORT_C gint TMSDTMFImpl::Delete(TMSDTMF*& dtmf) { + TRACE_PRN_FN_ENT; gint ret(TMS_RESULT_SUCCESS); - TRACE_PRN_FN_ENT; - delete (static_cast(dtmf)); + delete (static_cast (dtmf)); dtmf = NULL; TRACE_PRN_FN_EXT; return ret; } -gint TMSDTMFImpl::SetParent(TMSDTMF*& parent) - { - gint ret(TMS_RESULT_SUCCESS); - if (this->iBody) - { - static_cast(this->iBody)->SetParent(parent); - } - else - { - ret = TMS_RESULT_UNINITIALIZED_OBJECT; - } - return ret; - } -