diff -r 5a06f39ad45b -r 80975da52420 mmserv/tms/tmsserver/src/tmsrtaudiohdlr.cpp --- a/mmserv/tms/tmsserver/src/tmsrtaudiohdlr.cpp Fri Apr 16 15:29:42 2010 +0300 +++ b/mmserv/tms/tmsserver/src/tmsrtaudiohdlr.cpp Mon May 03 12:59:52 2010 +0300 @@ -99,11 +99,15 @@ iTtsPlayer = NULL; iTtsPlayer = CMdaAudioPlayerUtility::NewL(*this, aPriority, aPreference); + __ASSERT_DEBUG(iTtsPlayer, PANIC(TMS_RESULT_UNINITIALIZED_OBJECT)); + delete iTtsText; iTtsText = NULL; // UTF-8 strings can take up to 4 bytes per character iTtsText = HBufC8::NewL(aTtsText.Length() << KUTF8Multiply); + __ASSERT_DEBUG(iTtsText, PANIC(TMS_RESULT_UNINITIALIZED_OBJECT)); + TPtr8 refText = iTtsText->Des(); User::LeaveIfError(CnvUtfConverter::ConvertFromUnicodeToUtf8(refText, aTtsText)); @@ -534,6 +538,7 @@ TInt rampTime(0); if (iFormat == EFormatTone) { + __ASSERT_DEBUG(iTonePlayer, PANIC(TMS_RESULT_UNINITIALIZED_OBJECT)); switch (iRingType) { case ETypeRinging: @@ -604,6 +609,7 @@ } else if (iFormat == EFormatTts) { + __ASSERT_DEBUG(iTtsPlayer, PANIC(TMS_RESULT_UNINITIALIZED_OBJECT)); switch (iRingType) { case ETypeRinging: @@ -628,6 +634,7 @@ } else { + __ASSERT_DEBUG(iSamplePlayer, PANIC(TMS_RESULT_UNINITIALIZED_OBJECT)); switch (iRingType) { case ETypeRinging: @@ -707,20 +714,29 @@ // Check that volume is in a valid range. TInt volume = aVolume < 1 ? 1 : aVolume; - if (iFormat == EFormatTone && iTonePlayer) + if (iFormat == EFormatTone) { - iTonePlayer->SetVolumeRamp(TTimeIntervalMicroSeconds(aRamptime)); - iTonePlayer->SetVolume(ConvertVolume(volume)); + if (iTonePlayer) + { + iTonePlayer->SetVolumeRamp(TTimeIntervalMicroSeconds(aRamptime)); + iTonePlayer->SetVolume(ConvertVolume(volume)); + } } - else if (iFormat == EFormatTts && iTtsPlayer) + else if (iFormat == EFormatTts) { - iTtsPlayer->SetVolumeRamp(TTimeIntervalMicroSeconds(aRamptime)); - iTtsPlayer->SetVolume(ConvertVolume(volume)); + if (iTtsPlayer) + { + iTtsPlayer->SetVolumeRamp(TTimeIntervalMicroSeconds(aRamptime)); + iTtsPlayer->SetVolume(ConvertVolume(volume)); + } } else { - iSamplePlayer->SetVolumeRamp(TTimeIntervalMicroSeconds(aRamptime)); - iSamplePlayer->SetVolume(ConvertVolume(volume)); + if (iSamplePlayer) + { + iSamplePlayer->SetVolumeRamp(TTimeIntervalMicroSeconds(aRamptime)); + iSamplePlayer->SetVolume(ConvertVolume(volume)); + } } } @@ -734,15 +750,24 @@ if (iFormat == EFormatTone) { - result = iTonePlayer->MaxVolume() * aVolume / KMaxVolumeLevel; + if (iTonePlayer) + { + result = iTonePlayer->MaxVolume() * aVolume / KMaxVolumeLevel; + } } else if (iFormat == EFormatTts) { - result = iTtsPlayer->MaxVolume() * aVolume / KMaxVolumeLevel; + if (iTtsPlayer) + { + result = iTtsPlayer->MaxVolume() * aVolume / KMaxVolumeLevel; + } } else { - result = iSamplePlayer->MaxVolume() * aVolume / KMaxVolumeLevel; + if (iSamplePlayer) + { + result = iSamplePlayer->MaxVolume() * aVolume / KMaxVolumeLevel; + } } // If user selected minimum volume level set HW volume 1 @@ -772,15 +797,24 @@ { if (iFormat == EFormatTone) { - iTonePlayer->SetVolume(0); + if (iTonePlayer) + { + iTonePlayer->SetVolume(0); + } } - else if (iFormat == EFormatTts) + else if (iFormat == EFormatTts && iTtsPlayer) { - iTtsPlayer->SetVolume(0); + if (iTtsPlayer) + { + iTtsPlayer->SetVolume(0); + } } else // EFormatSample { - iSamplePlayer->SetVolume(0); + if (iSamplePlayer) + { + iSamplePlayer->SetVolume(0); + } } } else