diff -r 80975da52420 -r 43d09473c595 mmmw_plat/telephony_multimedia_service_api/tsrc/TmsAudioServicesTestClass/src/TmsAudioServicesTestClassBlocks.cpp --- a/mmmw_plat/telephony_multimedia_service_api/tsrc/TmsAudioServicesTestClass/src/TmsAudioServicesTestClassBlocks.cpp Mon May 03 12:59:52 2010 +0300 +++ b/mmmw_plat/telephony_multimedia_service_api/tsrc/TmsAudioServicesTestClass/src/TmsAudioServicesTestClassBlocks.cpp Fri May 14 16:22:35 2010 +0300 @@ -119,6 +119,7 @@ delete iRingTonePlayer; delete iDTMFTonePlayerDn; delete iDTMFTonePlayerUp; + delete iInbandTonePlayer; // delete iPlayBuf; @@ -152,8 +153,7 @@ // TInt CTmsAudioServicesTestClass::RunMethodL(CStifItemParser& aItem) { - static TStifFunctionInfo const - KFunctions[] = + static TStifFunctionInfo const KFunctions[] = { // Copy this line for every implemented function. // First string is the function name used in TestScripter script file. @@ -175,9 +175,6 @@ ENTRY( "GetEffectType", CTmsAudioServicesTestClass::GetEffectType ), ENTRY( "CreateDownlinkStream", CTmsAudioServicesTestClass::CreateDownlinkStream ), ENTRY( "CreateUplinkStream", CTmsAudioServicesTestClass::CreateUplinkStream ), - ENTRY( "CreateDTMFTonePlayer", CTmsAudioServicesTestClass::CreateDTMFTonePlayer ), - ENTRY( "DeleteDTMFTonePlayer", CTmsAudioServicesTestClass::DeleteDTMFTonePlayer ), - ENTRY( "CreateRingTonePlayer", CTmsAudioServicesTestClass::CreateRingTonePlayer ), ENTRY( "GetSupportedFormats", CTmsAudioServicesTestClass::GetSupportedFormats ), ENTRY( "IsCallTypeSupported", CTmsAudioServicesTestClass::IsCallTypeSupported ), ENTRY( "SetDownlinkFormat", CTmsAudioServicesTestClass::SetDownlinkFormat ), @@ -187,12 +184,12 @@ ENTRY( "OpenDownlink", CTmsAudioServicesTestClass::OpenDownlink ), ENTRY( "OpenUplink", CTmsAudioServicesTestClass::OpenUplink ), ENTRY( "Gain", CTmsAudioServicesTestClass::Gain ), - ENTRY( "AddGlobleGainEffectToStream", CTmsAudioServicesTestClass::AddGlobleGainEffectToStream), - ENTRY( "RemoveGlobleGainEffectToStream", CTmsAudioServicesTestClass::RemoveGlobleGainEffectToStream), + ENTRY( "AddGlobalGainEffectToStream", CTmsAudioServicesTestClass::AddGlobalGainEffectToStream), + ENTRY( "RemoveGlobalGainEffectToStream", CTmsAudioServicesTestClass::RemoveGlobalGainEffectToStream), ENTRY( "Volume", CTmsAudioServicesTestClass::Volume ), - ENTRY( "AddGlobleVolumeEffectToStream", CTmsAudioServicesTestClass::AddGlobleVolumeEffectToStream), - ENTRY( "RemoveGlobleVolumeEffectToStream", CTmsAudioServicesTestClass::RemoveGlobleVolumeEffectToStream), - ENTRY( "CreateGlobleGainEffect", CTmsAudioServicesTestClass::CreateGlobleGainEffect), + ENTRY( "AddGlobalVolumeEffectToStream", CTmsAudioServicesTestClass::AddGlobalVolumeEffectToStream), + ENTRY( "RemoveGlobalVolumeEffectToStream", CTmsAudioServicesTestClass::RemoveGlobalVolumeEffectToStream), + ENTRY( "CreateGlobalGainEffect", CTmsAudioServicesTestClass::CreateGlobalGainEffect), ENTRY( "Close", CTmsAudioServicesTestClass::Close ), ENTRY( "Start", CTmsAudioServicesTestClass::Start ), ENTRY( "Pause", CTmsAudioServicesTestClass::Pause ), @@ -200,18 +197,25 @@ ENTRY( "GetBitRateList", CTmsAudioServicesTestClass::GetBitRateList ), ENTRY( "SetBitrates", CTmsAudioServicesTestClass::SetBitrates ), ENTRY( "GetBitrates", CTmsAudioServicesTestClass::GetBitrates ), - ENTRY( "InitDTMFTonePlayer", CTmsAudioServicesTestClass::InitDTMFTonePlayer ), + ENTRY( "CreateDTMFTonePlayer", CTmsAudioServicesTestClass::CreateDTMFTonePlayer ), ENTRY( "DTMFTonePlay", CTmsAudioServicesTestClass::DTMFTonePlay ), + ENTRY( "StopDTMFTonePlayer", CTmsAudioServicesTestClass::StopDTMFTonePlayer ), + ENTRY( "ContinueDTMFStringSending", CTmsAudioServicesTestClass::ContinueDTMFStringSending ), ENTRY( "CloseDTMFPlayer", CTmsAudioServicesTestClass::CloseDTMFPlayer ), - ENTRY( "StopDTMFPlayer", CTmsAudioServicesTestClass::StopDTMFTonePlayer ), + ENTRY( "CreateRingTonePlayer", CTmsAudioServicesTestClass::CreateRingTonePlayer ), + ENTRY( "InitRingTonePlayer", CTmsAudioServicesTestClass::InitRingTonePlayer ), + ENTRY( "PlayRingTone", CTmsAudioServicesTestClass::PlayRingTone ), + ENTRY( "PlayRingToneNoEvent", CTmsAudioServicesTestClass::PlayRingToneNoEvent ), + ENTRY( "PauseRingTone", CTmsAudioServicesTestClass::PauseRingTone ), + ENTRY( "MuteRingTone", CTmsAudioServicesTestClass::MuteRingTone ), + ENTRY( "StopRingTone", CTmsAudioServicesTestClass::StopRingTone ), + ENTRY( "CloseRingTonePlayer", CTmsAudioServicesTestClass::CloseRingTonePlayer ), + ENTRY( "CreateInbandTonePlayer", CTmsAudioServicesTestClass::CreateInbandTonePlayer ), + ENTRY( "StartInbandTone", CTmsAudioServicesTestClass::StartInbandTone ), + ENTRY( "StopInbandTone", CTmsAudioServicesTestClass::StopInbandTone ), + ENTRY( "CloseInbandTonePlayer", CTmsAudioServicesTestClass::CloseInbandTonePlayer ), ENTRY( "GetDownlinkVersion", CTmsAudioServicesTestClass::GetDownlinkVersion ), ENTRY( "GetUplinkVersion", CTmsAudioServicesTestClass::GetUplinkVersion ), - ENTRY( "InitRingTonePlayer", CTmsAudioServicesTestClass::InitRingTonePlayer ), - ENTRY( "CloseRingTonePlayer", CTmsAudioServicesTestClass::CloseRingTonePlayer ), - ENTRY( "PlayRingTone", CTmsAudioServicesTestClass::PlayRingTone ), - ENTRY( "PauseRingTone", CTmsAudioServicesTestClass::PauseRingTone ), - ENTRY( "ResumeRingTone", CTmsAudioServicesTestClass::ResumeRingTone ), - ENTRY( "StopRingTone", CTmsAudioServicesTestClass::StopRingTone ), ENTRY( "GetType", CTmsAudioServicesTestClass::GetType ), ENTRY( "GetVAD", CTmsAudioServicesTestClass::GetVAD ), ENTRY( "ToggleVAD", CTmsAudioServicesTestClass::ToggleVAD ), @@ -276,6 +280,13 @@ (TText*)L"EFillBuffer", (TText*)L"EOutputChanged", (TText*)L"ESetOutputComplete", + (TText*)L"ERTInitComplete", + (TText*)L"ERTPlayComplete", + (TText*)L"ERTDeinitComplete", + (TText*)L"EInbToneStarted", + (TText*)L"EInbToneStopped", + (TText*)L"EDTMFToneStarted", + (TText*)L"EDTMFToneStopped", }; if( (TUint)aKey >= (sizeof( keywords )/sizeof(TText*)) ) @@ -692,8 +703,8 @@ break; case TMS_EFFECT_GLOBAL_VOL: { - error = CreateVolumeGlobleEffect(); - // AddGlobleVolumeEffectToStream(); + error = CreateVolumeGlobalEffect(); + // AddGlobalVolumeEffectToStream(); } break; case TMS_EFFECT_GAIN: @@ -704,8 +715,8 @@ break; case TMS_EFFECT_GLOBAL_GAIN: { - error = CreateGlobleGainEffect(); - // AddGlobleGainEffectToStream(); + error = CreateGlobalGainEffect(); + // AddGlobalGainEffectToStream(); } break; default: @@ -1051,7 +1062,8 @@ return error; } -TInt CTmsAudioServicesTestClass::CreateDownlinkStream(CStifItemParser& /*aItem*/) +TInt CTmsAudioServicesTestClass::CreateDownlinkStream( + CStifItemParser& /*aItem*/) { FTRACE(FPrint(_L("CTmsAudioServicesTestClass::CreateDownlinkStream"))); iLog->Log(_L("CTmsAudioServicesTestClass::CreateDownlinkStream")); @@ -1099,88 +1111,6 @@ return error; } -TInt CTmsAudioServicesTestClass::CreateDTMFTonePlayer(CStifItemParser& aItem) - { - iLog->Log(_L("CTmsAudioServicesTestClass::CreateDTMFTonePlayer")); - TInt error = KErrNone; - TPtrC StreamType; - error = aItem.GetNextString(StreamType); - - if (error == KErrNone) - { - if (StreamType == KTagDnlink) - { - if (iTmsCall) - { - error = iFactory->CreateDTMF(0, iDTMFTonePlayerDn); - FTRACE(FPrint(_L("CreateDTMF Error [%d]"),error)); - } - } - else if (StreamType == KTagUplink) - { - if (iTmsCall) - { - error = iFactory->CreateDTMF(0, iDTMFTonePlayerUp); - } - } - else - { - iLog->Log(KMsgBadTestParameters); - error = KErrBadTestParameter;} - } - iLog->Log(_L("CTmsAudioServicesTestClass::CreateDTMFTonePlayer Error [%d]"), - error); - return error; - } - -TInt CTmsAudioServicesTestClass::DeleteDTMFTonePlayer(CStifItemParser& aItem) - { - iLog->Log(_L("CTmsAudioServicesTestClass::DeleteDTMFTonePlayer")); - TInt error = KErrNone; - TPtrC StreamType; - error = aItem.GetNextString(StreamType); - - if (error == KErrNone) - { - if (StreamType == KTagDnlink) - { - if (iTmsCall && iDTMFTonePlayerDn) - { - error = iFactory->DeleteDTMF(iDTMFTonePlayerDn); - FTRACE(FPrint(_L("DeleteDTMF Error [%d]"),error)); - } - } - else if (StreamType == KTagUplink) - { - if (iTmsCall && iDTMFTonePlayerUp) - { - error = iFactory->DeleteDTMF(iDTMFTonePlayerUp); - } - } - else - { - iLog->Log(KMsgBadTestParameters); - error = KErrBadTestParameter; - } - } - iLog->Log(_L("CTmsAudioServicesTestClass::DeleteDTMFTonePlayer Error [%d]"), - error); - return error; - } - -TInt CTmsAudioServicesTestClass::CreateRingTonePlayer(CStifItemParser& /*aItem */) - { - iLog->Log(_L("CTmsAudioServicesTestClass::CreateRingTonePlayer")); - TInt error = KErrNone; - if (iFactory) - { - error = iFactory->CreateRingTonePlayer(iRingTonePlayer); - } - iLog->Log(_L("CTmsAudioServicesTestClass::CreateRingTonePlayer Error [%d]"), - error); - return error; - } - TInt CTmsAudioServicesTestClass::GetSupportedFormats(CStifItemParser& aItem) { iLog->Log(_L("CTmsAudioServicesTestClass::GetSupportedFormats")); @@ -1295,8 +1225,7 @@ if (error != KErrNone) { - iLog->Log(_L("CTmsAudioServicesTestClass::SetDownlinkFormat - failed, return error = %d" ), - error); + iLog->Log(_L("CTmsAudioServicesTestClass::SetDownlinkFormat - failed, return error = %d" ), error); return error; } } @@ -1320,8 +1249,7 @@ error = iTmsDnlink->ResetFormat(iTmsFormatDn); if (error != KErrNone) { - iLog->Log(_L("CTmsAudioServicesTestClass::ReSetDownlinkFormat - failed, return error = %d" ), - error); + iLog->Log(_L("CTmsAudioServicesTestClass::ReSetDownlinkFormat - failed, return error = %d" ), error); return error; } } @@ -1372,8 +1300,7 @@ { if (iTmsFormatUp) { - iLog->Log( - _L("CTmsAudioServicesTestClass::SetUplinkFormat - iTmsFormatUp")); + iLog->Log(_L("CTmsAudioServicesTestClass::SetUplinkFormat - iTmsFormatUp")); error = iTmsUplink->SetFormat(iTmsFormatUp); } else @@ -1384,8 +1311,7 @@ if (error != KErrNone) { - iLog->Log(_L("CTmsAudioServicesTestClass::SetUplinkFormat - failed, return error = %d" ), - error); + iLog->Log(_L("CTmsAudioServicesTestClass::SetUplinkFormat - failed, return error = %d" ), error); return error; } } @@ -1496,6 +1422,7 @@ iRecBufReady = EFalse; //iUpLinkCodec = ENULL; iTmsUplink->Deinit(); + iTmsUplink->RemoveObserver(*this); iUpLinkStatus = UNINITIALIZED; iLog->Log(_L("Close Uplink")); AddExpectedEvent(EUplinkClosed, KMediumTimeout); @@ -1504,6 +1431,7 @@ { //iPlayBufPtr.Set(NULL, 0, 0); iTmsDnlink->Deinit(); + iTmsDnlink->RemoveObserver(*this); iDnLinkStatus = UNINITIALIZED; iPlayBufReady = EFalse; // iDnLinkCodec = ENULL; @@ -1690,7 +1618,7 @@ if (effecttype == TMS_EFFECT_GAIN) { RDebug::Printf("[TMS STIF] GAIN, GetMaxLevel"); - ret = static_cast(iTmsUplinkEffect)->GetMaxLevel( + ret = static_cast (iTmsUplinkEffect)->GetMaxLevel( iMaxGain); RDebug::Printf("[TMS STIF] GAIN, GetMaxLevel Level [%d] Ret Err [%d]", iMaxGain, ret); RDebug::Printf("[TMS STIF] GAIN, SetLevel to [%d]", iMaxGain); @@ -1698,7 +1626,7 @@ RDebug::Printf("[TMS STIF] GAIN, SetLevel ret [%d]", ret); iLog->Log(_L("SetMaxGain: %d"), iMaxGain); RDebug::Printf("[TMS STIF] GAIN, GetLevel"); - ret = static_cast(iTmsUplinkEffect)->GetLevel(iGain); + ret = static_cast (iTmsUplinkEffect)->GetLevel(iGain); RDebug::Printf("[TMS STIF] GAIN, Exp Level [%d] Ret Level [%d] Ret Err [%d]", iMaxGain, iGain, ret); if (iGain != iMaxGain) { @@ -1706,9 +1634,9 @@ return KErrUnexpectedValue; } - static_cast(iTmsUplinkEffect)->SetLevel(0); + static_cast (iTmsUplinkEffect)->SetLevel(0); iLog->Log(_L("MuteMic")); - static_cast(iTmsUplinkEffect)->GetLevel(iGain); + static_cast (iTmsUplinkEffect)->GetLevel(iGain); if (iGain != 0) { @@ -1719,26 +1647,26 @@ else if (effecttype == TMS_EFFECT_GLOBAL_GAIN) { RDebug::Printf("[TMS STIF] GLOBAL GAIN, GetMaxLevel"); - ret = static_cast(iGlobalGain)->GetMaxLevel( + ret = static_cast (iGlobalGain)->GetMaxLevel( iMaxGain); RDebug::Printf("[TMS STIF] GLOBAL GAIN, GetMaxLevel Level [%d] Ret Err [%d]", iMaxGain, ret); RDebug::Printf("[TMS STIF] GLOBAL GAIN, SetLevel to [%d]", iMaxGain); - ret = static_cast(iGlobalGain)->SetLevel( + ret = static_cast (iGlobalGain)->SetLevel( iMaxGain); RDebug::Printf("[TMS STIF] GLOBAL GAIN, SetLevel ret [%d]", ret); - iLog->Log(_L("SetGlobleMaxGain: %d"), iMaxGain); + iLog->Log(_L("SetGlobalMaxGain: %d"), iMaxGain); RDebug::Printf("[TMS STIF] GLOBAL GAIN, GetLevel"); ret = static_cast(iGlobalGain)->GetLevel(iGain); RDebug::Printf("[TMS STIF] GLOBAL GAIN, Exp Level [%d] Ret Level [%d] Ret Err [%d]", iMaxGain, iGain, ret); if (iGain != iMaxGain) { - iLog->Log(_L("GetGain doesn't return expected Globle MaxGain!!! returned Gain = %d"), iGain); + iLog->Log(_L("GetGain doesn't return expected Global MaxGain!!! returned Gain = %d"), iGain); return KErrUnexpectedValue; } - static_cast(iGlobalGain)->SetLevel(0); + static_cast (iGlobalGain)->SetLevel(0); iLog->Log(_L("MuteMic")); - static_cast(iGlobalGain)->GetLevel(iGain); + static_cast (iGlobalGain)->GetLevel(iGain); if (iGain != 0) { @@ -1764,16 +1692,16 @@ if (effecttype == TMS_EFFECT_VOLUME) { RDebug::Printf("[TMS STIF] Volume, GetMaxLevel"); - ret = static_cast(iTmsDnlinkEffect)->GetMaxLevel( + ret = static_cast (iTmsDnlinkEffect)->GetMaxLevel( iMaxVolume); RDebug::Printf("[TMS STIF] MaxLevel [%d] Ret Error [%d]", iMaxVolume, ret); RDebug::Printf("[TMS STIF] Volume, SetLevel to MaxLevel [%d]", iMaxVolume); - ret = static_cast(iTmsDnlinkEffect)->SetLevel( + ret = static_cast (iTmsDnlinkEffect)->SetLevel( iMaxVolume); RDebug::Printf("[TMS STIF] SetLevel Ret Error [%d]", ret); iLog->Log(_L("SetMaxVolume: %d"), iMaxVolume); RDebug::Printf("[TMS STIF] GetLevel"); - ret = static_cast(iTmsDnlinkEffect)->GetLevel( + ret = static_cast (iTmsDnlinkEffect)->GetLevel( iVolume); RDebug::Printf("[TMS STIF] Level [%d] Ret Error [%d]", iVolume, ret); if (iVolume != iMaxVolume) @@ -1783,10 +1711,10 @@ } RDebug::Printf("[TMS STIF] Volume, SetLevel to 0 "); - ret = static_cast(iTmsDnlinkEffect)->SetLevel(0); + ret = static_cast (iTmsDnlinkEffect)->SetLevel(0); RDebug::Printf("[TMS STIF] SetLevel Ret Error [%d]", ret); iLog->Log(_L("Mute Volume")); - ret = static_cast(iTmsDnlinkEffect)->GetLevel( + ret = static_cast (iTmsDnlinkEffect)->GetLevel( iVolume); RDebug::Printf("[TMS STIF] Level [%d] Ret Error [%d]", iVolume, ret); if (iVolume != 0) @@ -1798,34 +1726,34 @@ else if (effecttype == TMS_EFFECT_GLOBAL_VOL) { RDebug::Printf("[TMS STIF] GLOBAL_VOL, Get Current Level"); - ret = static_cast(iGlobalVol)->GetLevel(iVolume); + ret = static_cast (iGlobalVol)->GetLevel(iVolume); RDebug::Printf("[TMS STIF] Current Vol Level [%d] Ret Error [%d]", iVolume, ret); RDebug::Printf("[TMS STIF] GLOBAL_VOL, GetMaxLevel"); - ret = static_cast(iGlobalVol)->GetMaxLevel( + ret = static_cast (iGlobalVol)->GetMaxLevel( iMaxVolume); RDebug::Printf("[TMS STIF] MaxLevel [%d] Ret Error [%d]", iMaxVolume, ret); RDebug::Printf("[TMS STIF] GLOBAL_VOL, SetLevel to [%d]", iMaxVolume); - ret = static_cast(iGlobalVol)->SetLevel( + ret = static_cast (iGlobalVol)->SetLevel( iMaxVolume); RDebug::Printf("[TMS STIF] SetLevel Ret Error [%d]", ret); - iLog->Log(_L("SetMaxGlobleVolume: %d"), iMaxVolume); + iLog->Log(_L("SetMaxGlobalVolume: %d"), iMaxVolume); RDebug::Printf("[TMS STIF] GLOBAL_VOL,GetLevel"); - ret = static_cast(iGlobalVol)->GetLevel(iVolume); + ret = static_cast (iGlobalVol)->GetLevel(iVolume); RDebug::Printf("[TMS STIF] Expected Level [%d] Ret Level [%d] Ret Error [%d]", iMaxVolume, iVolume, ret); - iLog->Log(_L("GetMaxGlobleVolume: %d"), iVolume); + iLog->Log(_L("GetMaxGlobalVolume: %d"), iVolume); if (iVolume != iMaxVolume) { - iLog->Log(_L("GetGlobleVolume doesn't return expected MaxVolume!!! returned Volume = %d"), iVolume); + iLog->Log(_L("GetGlobalVolume doesn't return expected MaxVolume!!! returned Volume = %d"), iVolume); return KErrUnexpectedValue; } - static_cast(iGlobalVol)->SetLevel(0); - iLog->Log(_L("Mute Globle Volume")); - static_cast(iGlobalVol)->GetLevel(iVolume); + static_cast (iGlobalVol)->SetLevel(0); + iLog->Log(_L("Mute Global Volume")); + static_cast (iGlobalVol)->GetLevel(iVolume); if (iVolume != 0) { - iLog->Log(_L("GetGlobleVolume does not return expected Mute value!!! returned Volume = %d"), iVolume); + iLog->Log(_L("GetGlobalVolume does not return expected Mute value!!! returned Volume = %d"), iVolume); return KErrUnexpectedValue; } } @@ -1907,7 +1835,8 @@ return error; } -TInt CTmsAudioServicesTestClass::AddGlobalRoutingObserver(CStifItemParser& /*aItem */) +TInt CTmsAudioServicesTestClass::AddGlobalRoutingObserver( + CStifItemParser& /*aItem */) { iLog->Log(_L("CTmsAudioServicesTestClass::AddGlobalRoutingObserver")); TInt error = KErrNone; @@ -1924,7 +1853,8 @@ return error; } -TInt CTmsAudioServicesTestClass::DeleteGlobalRoutingObserver(CStifItemParser& /*aItem*/) +TInt CTmsAudioServicesTestClass::DeleteGlobalRoutingObserver( + CStifItemParser& /*aItem*/) { iLog->Log(_L("CTmsAu dioServicesTestClass::DeleteGlobalRoutingObserver")); TInt error = KErrNone; @@ -1997,7 +1927,7 @@ return error; } - AddExpectedEvent(ESetOutputComplete, KLongTimeout); + AddExpectedEvent(ESetOutputComplete, KShortTimeout); } return error; @@ -2224,91 +2154,6 @@ return error; } -TInt CTmsAudioServicesTestClass::InitDTMFTonePlayer(CStifItemParser& /*aItem */) - { - FTRACE(FPrint(_L("CTmsAudioServicesTestClass::InitDTMFTonePlayer"))); - iLog->Log(_L("CTmsAudioServicesTestClass::InitDTMFTonePlayer")); - TInt error = KErrNone; - return error; - } - -TInt CTmsAudioServicesTestClass::DTMFTonePlay(CStifItemParser& /*aItem */) - { - FTRACE (FPrint(_L("CTmsAudioServicesTestClass::DTMFTonePlay"))); - iLog->Log(_L("CTmsAudioServicesTestClass::DTMFTonePlay")); - TInt error = KErrNone; - return error; - } - -TInt CTmsAudioServicesTestClass::CloseDTMFPlayer(CStifItemParser& /*aItem */) - { - FTRACE(FPrint(_L("CTmsAudioServicesTestClass::CloseDTMFPlayer"))); - iLog->Log(_L("CTmsAudioServicesTestClass::CloseDTMFPlayer")); - TInt error = KErrNone; - return error; - } - -TInt CTmsAudioServicesTestClass::StopDTMFTonePlayer(CStifItemParser& /*aItem */) - { - FTRACE(FPrint(_L("CTmsAudioServicesTestClass::StopDTMFTonePlayer"))); - iLog->Log(_L("CTmsAudioServicesTestClass::StopDTMFTonePlay")); - TInt error = KErrNone; - return error; - } - -TInt CTmsAudioServicesTestClass::InitRingTonePlayer(CStifItemParser& /*aItem */) - { - FTRACE(FPrint(_L("CTmsAudioServicesTestClass::InitRingTonePlayer"))); - iLog->Log(_L("CTmsAudioServicesTestClass::InitRingTonePlayer")); - TInt error = KErrNone; - return error; - } - -TInt CTmsAudioServicesTestClass::CloseRingTonePlayer(CStifItemParser& /*aItem*/) - { - FTRACE(FPrint(_L("CTmsAudioServicesTestClass::CloseRingTonePlayer"))); - iLog->Log(_L("CTmsAudioServicesTestClass::CloseRingTonePlayer")); - TInt error = KErrNone; - return error; - } - -TInt CTmsAudioServicesTestClass::PlayRingTone(CStifItemParser& /*aItem*/) - { - FTRACE (FPrint(_L("CTmsAudioServicesTestClass::PlayRingTone"))); - iLog->Log(_L("CTmsAudioServicesTestClass::PlayRingTone")); - TInt error = KErrNone; - - if (iRingTonePlayer) - { - //iRingTonePlayer->Play(); - AddExpectedEvent(EPlaybackComplete, KLongTimeout); - // Played ringing tone file has to be shorter than KLongTimeout - } - else - { - iLog->Log(_L("RT PLR Not Ready: error = %d"), KErrNotFound); - error = KErrNotFound; - } - - return error; - } - -TInt CTmsAudioServicesTestClass::PauseRingTone(CStifItemParser& /*aItem*/) - { - FTRACE (FPrint(_L("CTmsAudioServicesTestClass::PauseRingTone"))); - iLog->Log(_L("CTmsAudioServicesTestClass::PauseRingTone")); - TInt error = KErrNone; - return error; - } - -TInt CTmsAudioServicesTestClass::ResumeRingTone(CStifItemParser& /*aItem*/) - { - FTRACE (FPrint(_L("CTmsAudioServicesTestClass::ResumeRingTone"))); - iLog->Log(_L("CTmsAudioServicesTestClass::ResumeRingTone")); - TInt error = KErrNone; - return error; - } - TInt CTmsAudioServicesTestClass::GetBitRateList(CStifItemParser& /*aItem*/) { iLog ->Log(_L("CTmsAudioServicesTestClass::GetBitRateList")); @@ -2343,8 +2188,7 @@ { if (iBitratesVector.size() > 0) { - std::vector::iterator iBitrate = - iBitratesVector.begin(); + std::vector::iterator iBitrate = iBitratesVector.begin(); error = iTmsFormatUp -> SetBitRate(*iBitrate); iLog->Log(_L("BR set %d"), *iBitrate); } @@ -2425,13 +2269,16 @@ switch (iUpLinkCodec) { case TMS_FORMAT_G711: - error = static_cast(iTmsFormatUp)->GetVADMode(aVad); + error = static_cast (iTmsFormatUp)->GetVADMode( + aVad); break; case TMS_FORMAT_G729: - error = static_cast(iTmsFormatUp)->GetVADMode(aVad); + error = static_cast (iTmsFormatUp)->GetVADMode( + aVad); break; case TMS_FORMAT_ILBC: - error = static_cast(iTmsFormatUp)->GetVADMode(aVad); + error = static_cast (iTmsFormatUp)->GetVADMode( + aVad); break; default: break; @@ -2456,13 +2303,16 @@ switch (iUpLinkCodec) { case TMS_FORMAT_G711: - error = static_cast(iTmsFormatUp)->SetVADMode(iVad); + error = static_cast (iTmsFormatUp)->SetVADMode( + iVad); break; case TMS_FORMAT_G729: - error = static_cast(iTmsFormatUp)->SetVADMode(iVad); + error = static_cast (iTmsFormatUp)->SetVADMode( + iVad); break; case TMS_FORMAT_ILBC: - error = static_cast(iTmsFormatUp)->SetVADMode(iVad); + error = static_cast (iTmsFormatUp)->SetVADMode( + iVad); break; default: break; @@ -2482,7 +2332,7 @@ if ((linkType == KTagUplink) && (iUpLinkCodec == TMS_FORMAT_G711)) { TMSG711CodecMode aMode; - static_cast(iTmsFormatUp)->GetMode(aMode); + static_cast (iTmsFormatUp)->GetMode(aMode); if (aMode == TMS_G711_CODEC_MODE_ALAW) { @@ -2501,7 +2351,7 @@ && (iUpLinkCodec == TMS_FORMAT_ILBC)) { TMSILBCCodecMode aMode; - static_cast(iTmsFormatUp)->GetMode(aMode); + static_cast (iTmsFormatUp)->GetMode(aMode); if (aMode == TMS_ILBC_CODEC_MODE_20MS_FRAME) { @@ -2520,7 +2370,7 @@ && (iDnLinkCodec == TMS_FORMAT_G711)) { TMSG711CodecMode aMode; - static_cast(iTmsFormatDn)->GetMode(aMode); + static_cast (iTmsFormatDn)->GetMode(aMode); if (aMode == TMS_G711_CODEC_MODE_ALAW) { @@ -2539,7 +2389,7 @@ && (iDnLinkCodec == TMS_FORMAT_ILBC)) { TMSILBCCodecMode aMode; - static_cast(iTmsFormatDn)->GetMode(aMode); + static_cast (iTmsFormatDn)->GetMode(aMode); if (aMode == TMS_ILBC_CODEC_MODE_20MS_FRAME) { @@ -2582,56 +2432,56 @@ && (mode == KTagALaw)) { iLog->Log(_L("UPL Mode Set: aLaw")); - static_cast(iTmsFormatUp)->SetMode( + static_cast (iTmsFormatUp)->SetMode( TMS_G711_CODEC_MODE_ALAW); } else if ((linkType == KTagUplink) && (iUpLinkCodec == TMS_FORMAT_G711) && (mode == KTagULaw)) { iLog->Log(_L("UPL Mode Set: uLaw")); - static_cast(iTmsFormatUp)->SetMode( + static_cast (iTmsFormatUp)->SetMode( TMS_G711_CODEC_MODE_MULAW); } else if ((linkType == KTagUplink) && (iUpLinkCodec == TMS_FORMAT_ILBC) && (mode == KTag20ms)) { iLog->Log(_L("UPL Mode Set: 20ms frame")); - static_cast(iTmsFormatUp)->SetMode( + static_cast (iTmsFormatUp)->SetMode( TMS_ILBC_CODEC_MODE_20MS_FRAME); } else if ((linkType == KTagUplink) && (iUpLinkCodec == TMS_FORMAT_ILBC) && (mode == KTag30ms)) { iLog->Log(_L("UPL Mode Set: 30ms frame")); - static_cast(iTmsFormatUp)->SetMode( + static_cast (iTmsFormatUp)->SetMode( TMS_ILBC_CODEC_MODE_30MS_FRAME); } else if ((linkType == KTagDnlink) && (iDnLinkCodec == TMS_FORMAT_G711) && (mode == KTagALaw)) { iLog->Log(_L("DNL Mode Set: aLaw")); - static_cast(iTmsFormatDn)->SetMode( + static_cast (iTmsFormatDn)->SetMode( TMS_G711_CODEC_MODE_ALAW); } else if ((linkType == KTagDnlink) && (iDnLinkCodec == TMS_FORMAT_G711) && (mode == KTagULaw)) { iLog->Log(_L("DNL Mode Set: uLaw")); - static_cast(iTmsFormatDn)->SetMode( + static_cast (iTmsFormatDn)->SetMode( TMS_G711_CODEC_MODE_MULAW); } else if ((linkType == KTagDnlink) && (iDnLinkCodec == TMS_FORMAT_ILBC) && (mode == KTag20ms)) { iLog->Log(_L("DNL Mode Set: 20ms frame")); - static_cast(iTmsFormatDn)->SetMode( + static_cast (iTmsFormatDn)->SetMode( TMS_ILBC_CODEC_MODE_20MS_FRAME); } else if ((linkType == KTagDnlink) && (iDnLinkCodec == TMS_FORMAT_ILBC) && (mode == KTag30ms)) { iLog->Log(_L("DNL Mode Set: 30ms frame")); - static_cast(iTmsFormatDn)->SetMode( + static_cast (iTmsFormatDn)->SetMode( TMS_ILBC_CODEC_MODE_30MS_FRAME); } else @@ -2652,11 +2502,11 @@ switch (iDnLinkCodec) { case TMS_FORMAT_G711: - error = static_cast(iTmsFormatDn)->GetCNG(aCng); + error = static_cast (iTmsFormatDn)->GetCNG(aCng); iLog->Log(_L("CNG: %d"), aCng); break; case TMS_FORMAT_ILBC: - error = static_cast(iTmsFormatDn)->GetCNG(aCng); + error = static_cast (iTmsFormatDn)->GetCNG(aCng); iLog->Log(_L("CNG: %d"), aCng); break; default: @@ -2673,18 +2523,17 @@ TInt CTmsAudioServicesTestClass::ToggleCNG(CStifItemParser & /*aItem*/) { - iLog ->Log(_L("CTmsAudioServicesTestClass::ToggleCNG")); TInt error = KErrNone; iCng = (iCng) ? EFalse : ETrue; switch (iDnLinkCodec) { case TMS_FORMAT_G711: - static_cast(iTmsFormatDn)->SetCNG(iCng); + static_cast (iTmsFormatDn)->SetCNG(iCng); iLog->Log(_L("CNG set: %d"), iCng); break; case TMS_FORMAT_ILBC: - static_cast(iTmsFormatDn)->SetCNG(iCng); + static_cast (iTmsFormatDn)->SetCNG(iCng); iLog->Log(_L("CNG set: %d"), iCng); break; default: @@ -2700,7 +2549,7 @@ TBool aPlc = EFalse; if (iDnLinkCodec == TMS_FORMAT_G711) { - static_cast(iTmsFormatDn)->GetPlc(aPlc); + static_cast (iTmsFormatDn)->GetPlc(aPlc); iLog->Log(_L("PLC: %d"), aPlc); } @@ -2720,31 +2569,13 @@ iPlc = (iPlc) ? EFalse : ETrue; if (iDnLinkCodec == TMS_FORMAT_G711) { - error = static_cast(iTmsFormatDn)->SetPlc(iPlc); + error = static_cast (iTmsFormatDn)->SetPlc(iPlc); iLog->Log(_L("PLC set: %d"), iPlc); } return error; } -TInt CTmsAudioServicesTestClass::StopRingTone(CStifItemParser& /*aItem*/) - { - FTRACE (FPrint(_L("CTmsAudioServicesTestClass::StopRingTone"))); - iLog->Log(_L("CTmsAudioServicesTestClass::StopRingTone")); - TInt error = KErrNone; - if (iRingTonePlayer) - { - // iRingTonePlayer->Stop(); - RemoveExpectedEvent(EPlaybackComplete); - } - else - { - iLog->Log(_L("RT PLR Not Ready: error = %d"), KErrNotFound); - error = KErrNotFound; - } - return error; - } - TInt CTmsAudioServicesTestClass::GetBufferType(CStifItemParser& /*aItem*/) { FTRACE (FPrint(_L("CTmsAudioServicesTestClass::GetBufferType"))); @@ -2762,9 +2593,7 @@ { error = iTmsDnlink->AddSource(iTmsClientSource); } - iLog->Log( - _L("CTmsAudioServicesTestClass::AddClientSrcToDnlStream Error [%d]"), - error); + iLog->Log(_L("CTmsAudioServicesTestClass::AddClientSrcToDnlStream Error [%d]"), error); return error; } @@ -2842,7 +2671,7 @@ TInt error = KErrNone; if (iTmsClientSource) { - error = static_cast(iTmsClientSource)->AddObserver( + error = static_cast (iTmsClientSource)->AddObserver( *this, NULL); } return error; @@ -2855,8 +2684,7 @@ TInt error = KErrNone; if (iTmsClientSource) { - error = static_cast(iTmsClientSource)->RemoveObserver( - *this); + error = static_cast (iTmsClientSource)->RemoveObserver(*this); } return error; } @@ -2941,8 +2769,8 @@ TInt error = KErrNone; if (iTmsUplink && iTmsClientSink) { - error = static_cast(iTmsClientSink)->AddObserver(*this, - NULL); + error = static_cast (iTmsClientSink)->AddObserver( + *this, NULL); } return error; } @@ -2953,7 +2781,7 @@ TInt error = KErrNone; if (iTmsUplink && iTmsClientSink) { - error = static_cast(iTmsClientSink)->RemoveObserver( + error = static_cast (iTmsClientSink)->RemoveObserver( *this); } return error; @@ -2968,30 +2796,29 @@ status = iFactory->CreateEffect(TMS_EFFECT_VOLUME, iTmsDnlinkEffect); if (status == KErrNone) { - static_cast(iTmsDnlinkEffect)->AddObserver(*this, - NULL); + static_cast (iTmsDnlinkEffect)->AddObserver( + *this, NULL); } } RDebug::Printf("[TMS STIF] CreateVolumeEffect Return [%d]", status); return status; } -gint CTmsAudioServicesTestClass::CreateVolumeGlobleEffect() +gint CTmsAudioServicesTestClass::CreateVolumeGlobalEffect() { - iLog->Log(_L("CTmsAudioServicesTestClass::CreateVolumeGlobleEffect")); + iLog->Log(_L("CTmsAudioServicesTestClass::CreateVolumeGlobalEffect")); gint status(KErrNone); if (iFactory && !iGlobalVol) { status = iFactory->CreateEffect(TMS_EFFECT_GLOBAL_VOL, iGlobalVol); - if (status == KErrNone) { - static_cast(iGlobalVol)->AddObserver(*this, + static_cast (iGlobalVol)->AddObserver(*this, NULL); - iLog->Log(_L("CTmsAudioServicesTestClass::CreateVolumeGlobleEffect - AddObserver")); + iLog->Log(_L("CTmsAudioServicesTestClass::CreateVolumeGlobalEffect - AddObserver")); } } - RDebug::Printf("[TMS STIF] CreateVolumeGlobleEffect Return [%d]", status); + RDebug::Printf("[TMS STIF] CreateVolumeGlobalEffect Return [%d]", status); return status; } @@ -3007,10 +2834,10 @@ return error; } -TInt CTmsAudioServicesTestClass::AddGlobleVolumeEffectToStream( +TInt CTmsAudioServicesTestClass::AddGlobalVolumeEffectToStream( CStifItemParser& /*aItem*/) { - iLog->Log(_L("CTmsAudioServicesTestClass::AddGlobleVolumeEffectToStream")); + iLog->Log(_L("CTmsAudioServicesTestClass::AddGlobalVolumeEffectToStream")); TInt error = KErrNone; if (iTmsDnlink && iGlobalVol) { @@ -3019,10 +2846,10 @@ return error; } -TInt CTmsAudioServicesTestClass::RemoveGlobleVolumeEffectToStream( +TInt CTmsAudioServicesTestClass::RemoveGlobalVolumeEffectToStream( CStifItemParser& /*aItem*/) { - iLog->Log(_L("CTmsAudioServicesTestClass::RemoveGlobleVolumeEffectToStream")); + iLog->Log(_L("CTmsAudioServicesTestClass::RemoveGlobalVolumeEffectToStream")); TInt error = KErrNone; if (iTmsDnlink && iGlobalVol) { @@ -3041,28 +2868,28 @@ status = iFactory->CreateEffect(TMS_EFFECT_GAIN, iTmsUplinkEffect); if (status == KErrNone) { - static_cast(iTmsUplinkEffect)->AddObserver(*this, - NULL); + static_cast (iTmsUplinkEffect)->AddObserver( + *this, NULL); } } RDebug::Printf("[TMS STIF] CreateGainEffect Return [%d]", status); return status; } -gint CTmsAudioServicesTestClass::CreateGlobleGainEffect() +gint CTmsAudioServicesTestClass::CreateGlobalGainEffect() { - iLog->Log(_L("CTmsAudioServicesTestClass::CreateGlobleGainEffect")); + iLog->Log(_L("CTmsAudioServicesTestClass::CreateGlobalGainEffect")); gint status(KErrNone); if (iFactory && !iGlobalGain) { status = iFactory->CreateEffect(TMS_EFFECT_GLOBAL_GAIN, iGlobalGain); if (status == KErrNone) { - static_cast(iGlobalGain)->AddObserver(*this, - NULL); + static_cast (iGlobalGain)->AddObserver( + *this, NULL); } } - RDebug::Printf("[TMS STIF] CreateGlobleGainEffect Return [%d]", status); + RDebug::Printf("[TMS STIF] CreateGlobalGainEffect Return [%d]", status); return status; } @@ -3078,10 +2905,10 @@ return error; } -TInt CTmsAudioServicesTestClass::AddGlobleGainEffectToStream( +TInt CTmsAudioServicesTestClass::AddGlobalGainEffectToStream( CStifItemParser& /*aItem*/) { - iLog->Log(_L("CTmsAudioServicesTestClass::AddGlobleGainEffectToStream")); + iLog->Log(_L("CTmsAudioServicesTestClass::AddGlobalGainEffectToStream")); TInt error = KErrNone; if (iTmsUplink && iGlobalGain) { @@ -3090,10 +2917,10 @@ return error; } -TInt CTmsAudioServicesTestClass::RemoveGlobleGainEffectToStream( +TInt CTmsAudioServicesTestClass::RemoveGlobalGainEffectToStream( CStifItemParser& /*aItem*/) { - iLog->Log(_L("CTmsAudioServicesTestClass::RemoveGlobleGainEffectToStream")); + iLog->Log(_L("CTmsAudioServicesTestClass::RemoveGlobalGainEffectToStream")); TInt error = KErrNone; if (iTmsUplink && iGlobalGain) { @@ -3102,6 +2929,509 @@ return error; } +TInt CTmsAudioServicesTestClass::CreateDTMFTonePlayer(CStifItemParser& aItem) + { + iLog->Log(_L("CTmsAudioServicesTestClass::CreateDTMFTonePlayer")); + TInt error = TMS_RESULT_SUCCESS; + TPtrC StreamType; + error = aItem.GetNextString(StreamType); + + if (error == TMS_RESULT_SUCCESS) + { + if (StreamType == KTagDnlink) + { + if (iFactory && !iDTMFTonePlayerDn) + { + error = iFactory->CreateDTMF(TMS_STREAM_DOWNLINK, + iDTMFTonePlayerDn); + error |= iDTMFTonePlayerDn->AddObserver(*this, NULL); + } + FTRACE(FPrint(_L("CreateDTMF-DNL Error [%d]"), error)); + } + else if (StreamType == KTagUplink) + { + if (iFactory && !iDTMFTonePlayerUp) + { + error = iFactory->CreateDTMF(TMS_STREAM_UPLINK, + iDTMFTonePlayerUp); + error |= iDTMFTonePlayerUp->AddObserver(*this, NULL); + } + FTRACE(FPrint(_L("CreateDTMF-UPL Error [%d]"), error)); + } + else + { + iLog->Log(KMsgBadTestParameters); + error = KErrBadTestParameter; + } + } + iLog->Log(_L("CTmsAudioServicesTestClass::CreateDTMFTonePlayer Error [%d]"), error); + return error; + } + +TInt CTmsAudioServicesTestClass::DTMFTonePlay(CStifItemParser& aItem) + { + FTRACE (FPrint(_L("CTmsAudioServicesTestClass::DTMFTonePlay"))); + iLog->Log(_L("CTmsAudioServicesTestClass::DTMFTonePlay")); + GString* dtmfstring; + TInt error = TMS_RESULT_SUCCESS; + TPtrC StreamType; + error = aItem.GetNextString(StreamType); + + if (error == TMS_RESULT_SUCCESS) + { + if (StreamType == KTagDnlink) + { + if (iDTMFTonePlayerDn) + { + // NOTE: UpLink Status must be READY or STREAMING + dtmfstring = g_string_new("4723"); + dtmfstring = g_string_append_c(dtmfstring, '4'); + error = iDTMFTonePlayerDn->SetTone(dtmfstring); + if (error == TMS_RESULT_SUCCESS) + { + error = iDTMFTonePlayerDn->Start(); + } + g_string_free(dtmfstring, TRUE); + } + } + else if (StreamType == KTagUplink) + { + if (iDTMFTonePlayerUp) + { + // NOTE: UpLink Status must be READY or STREAMING + dtmfstring = g_string_new("987"); + dtmfstring = g_string_append_c(dtmfstring, '4'); + error = iDTMFTonePlayerUp->SetTone(dtmfstring); + if (error == TMS_RESULT_SUCCESS) + { + error = iDTMFTonePlayerUp->Start(); + } + g_string_free(dtmfstring, TRUE); + } + } + else + { + iLog->Log(KMsgBadTestParameters); + error = KErrBadTestParameter; + } + } + + if (error == TMS_RESULT_SUCCESS) + { + AddExpectedEvent(EDTMFToneStopped, KMediumTimeout); + } + + iLog->Log(_L("CTmsAudioServicesTestClass::DTMFTonePlay Error [%d]"), error); + return error; + } + +TInt CTmsAudioServicesTestClass::StopDTMFTonePlayer(CStifItemParser& aItem) + { + FTRACE(FPrint(_L("CTmsAudioServicesTestClass::StopDTMFTonePlayer"))); + iLog->Log(_L("CTmsAudioServicesTestClass::StopDTMFTonePlay")); + TInt error = TMS_RESULT_SUCCESS; + TPtrC StreamType; + error = aItem.GetNextString(StreamType); + + if (error == TMS_RESULT_SUCCESS) + { + if (StreamType == KTagDnlink) + { + if (iFactory && iDTMFTonePlayerDn) + { + iDTMFTonePlayerDn->Stop(); + RemoveExpectedEvent(EDTMFToneStopped); + } + } + else if (StreamType == KTagUplink) + { + if (iFactory && iDTMFTonePlayerUp) + { + iDTMFTonePlayerUp->Stop(); + RemoveExpectedEvent(EDTMFToneStopped); + } + } + else + { + iLog->Log(KMsgBadTestParameters); + error = KErrBadTestParameter; + } + } + + iLog->Log(_L("CTmsAudioServicesTestClass::StopDTMFTonePlayer Error [%d]"), error); + return error; + } + +TInt CTmsAudioServicesTestClass::ContinueDTMFStringSending( + CStifItemParser& aItem) + { + FTRACE(FPrint(_L("CTmsAudioServicesTestClass::ContinueDTMFStringSending"))); + iLog->Log(_L("CTmsAudioServicesTestClass::ContinueDTMFStringSending")); + TInt error = TMS_RESULT_SUCCESS; + TPtrC StreamType; + error = aItem.GetNextString(StreamType); + + if (error == TMS_RESULT_SUCCESS) + { + if (StreamType == KTagDnlink) + { + if (iFactory && iDTMFTonePlayerDn) + { + //case not supported for DNL, should return valid error + error = iDTMFTonePlayerDn->ContinueDTMFStringSending(TRUE); + } + } + else if (StreamType == KTagUplink) + { + if (iFactory && iDTMFTonePlayerUp) + { + error = iDTMFTonePlayerUp->ContinueDTMFStringSending(TRUE); + } + } + else + { + iLog->Log(KMsgBadTestParameters); + error = KErrBadTestParameter; + } + } + iLog->Log(_L("CTmsAudioServicesTestClass::ContinueDTMFStringSending Error [%d]"), error); + return error; + } + +TInt CTmsAudioServicesTestClass::CloseDTMFPlayer(CStifItemParser& aItem) + { + FTRACE(FPrint(_L("CTmsAudioServicesTestClass::CloseDTMFPlayer"))); + iLog->Log(_L("CTmsAudioServicesTestClass::CloseDTMFPlayer")); + TInt error = TMS_RESULT_SUCCESS; + TPtrC StreamType; + error = aItem.GetNextString(StreamType); + + if (error == TMS_RESULT_SUCCESS) + { + if (StreamType == KTagDnlink) + { + if (iFactory && iDTMFTonePlayerDn) + { + iDTMFTonePlayerDn->RemoveObserver(*this); + iFactory->DeleteDTMF(iDTMFTonePlayerDn); + } + } + else if (StreamType == KTagUplink) + { + if (iFactory && iDTMFTonePlayerUp) + { + iDTMFTonePlayerUp->RemoveObserver(*this); + iFactory->DeleteDTMF(iDTMFTonePlayerUp); + } + } + else + { + iLog->Log(KMsgBadTestParameters); + error = KErrBadTestParameter; + } + } + iLog->Log(_L("CTmsAudioServicesTestClass::StopDTMFTonePlayer Error [%d]"), error); + return error; + } + +TInt CTmsAudioServicesTestClass::CreateRingTonePlayer( + CStifItemParser& /*aItem */) + { + FTRACE(FPrint(_L("CTmsAudioServicesTestClass::CreateRingTonePlayer"))); + iLog->Log(_L("CTmsAudioServicesTestClass::CreateRingTonePlayer")); + TInt error = TMS_RESULT_SUCCESS; + if (iFactory) + { + error = iFactory->CreateRingTonePlayer(iRingTonePlayer); + if (error == TMS_RESULT_SUCCESS) + { + iRingTonePlayer->AddObserver(*this, NULL); + } + } + iLog->Log(_L("CTmsAudioServicesTestClass::CreateRingTonePlayer Error [%d]"), error); + return error; + } + +TInt CTmsAudioServicesTestClass::InitRingTonePlayer(CStifItemParser& aItem) + { + FTRACE(FPrint(_L("CTmsAudioServicesTestClass::InitRingTonePlayer"))); + iLog->Log(_L("CTmsAudioServicesTestClass::InitRingTonePlayer")); + + TInt error = TMS_RESULT_SUCCESS; + TPtrC StreamType; + error = aItem.GetNextString(StreamType); + + if (error == TMS_RESULT_SUCCESS && iRingTonePlayer) + { + if (StreamType == KTagRTDefault) + { + error = iRingTonePlayer->Init(TMS_RINGTONE_DEFAULT); + } + else if (StreamType == KTagRTFile) + { + TBuf buf(KTestFile3); + iRTStr = g_string_new_len((gchar*) buf.Ptr(), buf.Length() * 2); + error = iRingTonePlayer->Init(TMS_RINGTONE_FILE, iRTStr); + g_string_free(iRTStr, TRUE); + iRTStr = NULL; + } + else if (StreamType == KTagRTBeepOnce) + { + error = iRingTonePlayer->Init(TMS_RINGTONE_BEEP_ONCE); + } + else if (StreamType == KTagRTSilent) + { + error = iRingTonePlayer->Init(TMS_RINGTONE_SILENT); + } + else if (StreamType == KTagRTUnsecureVoIP) + { + error = iRingTonePlayer->Init(TMS_RINGTONE_UNSECURE_VOIP); + } + else if (StreamType == KTagRTSequence) + { + TBuf8 buf(KRTBeepSequence); + iRTStr = g_string_new_len((gchar*) buf.Ptr(), buf.Length()); + error = iRingTonePlayer->Init(TMS_RINGTONE_SEQUENCE, iRTStr); + g_string_free(iRTStr, TRUE); + } + else if (StreamType == KTagRTTts) + { + TBuf buf(KTextToSpeak); + iTTSStr = g_string_new_len((gchar*) buf.Ptr(), buf.Length() * 2); + error = iRingTonePlayer->Init(TMS_RINGTONE_DEFAULT, NULL, + iTTSStr); + g_string_free(iTTSStr, TRUE); + iTTSStr = NULL; + } + else + { + iLog->Log(KMsgBadTestParameters); + error = KErrBadTestParameter; + } + + if (error == TMS_RESULT_SUCCESS) + { + AddExpectedEvent(ERTInitComplete, KMediumTimeout); + } + } + iLog->Log(_L("CTmsAudioServicesTestClass::InitRingTonePlayer Error [%d]"), error); + return error; + } + +TInt CTmsAudioServicesTestClass::PlayRingTone(CStifItemParser& /*aItem*/) + { + FTRACE (FPrint(_L("CTmsAudioServicesTestClass::PlayRingTone"))); + iLog->Log(_L("CTmsAudioServicesTestClass::PlayRingTone")); + TInt error = KErrNone; + + if (iRingTonePlayer) + { + iRingTonePlayer->Play(); + AddExpectedEvent(ERTPlayComplete, KMediumTimeout); + } + else + { + error = KErrNotFound; + } + + iLog->Log(_L("CTmsAudioServicesTestClass::PlayRingTone Error [%d]"), error); + return error; + } + +TInt CTmsAudioServicesTestClass::PlayRingToneNoEvent(CStifItemParser& /*aItem*/) + { + FTRACE (FPrint(_L("CTmsAudioServicesTestClass::PlayRingToneNoEvent"))); + iLog->Log(_L("CTmsAudioServicesTestClass::PlayRingToneNoEvent")); + TInt error = KErrNone; + + if (iRingTonePlayer) + { + iRingTonePlayer->Play(); + // Not expecting any event - will allow to cancel + } + else + { + error = KErrNotFound; + } + + iLog->Log(_L("CTmsAudioServicesTestClass::PlayRingToneNoEvent Error [%d]"), error); + return error; + } + +TInt CTmsAudioServicesTestClass::PauseRingTone(CStifItemParser& /*aItem*/) + { + FTRACE (FPrint(_L("CTmsAudioServicesTestClass::PauseRingTone"))); + iLog->Log(_L("CTmsAudioServicesTestClass::PauseRingTone")); + TInt error = KErrNone; + + if (iRingTonePlayer) + { + iRingTonePlayer->Pause(); + RemoveExpectedEvent(ERTPlayComplete); + } + else + { + error = KErrNotFound; + } + + iLog->Log(_L("CTmsAudioServicesTestClass::PauseRingTone Error [%d]"), error); + return error; + } + +TInt CTmsAudioServicesTestClass::StopRingTone(CStifItemParser& /*aItem*/) + { + FTRACE (FPrint(_L("CTmsAudioServicesTestClass::StopRingTone"))); + iLog->Log(_L("CTmsAudioServicesTestClass::StopRingTone")); + TInt error = KErrNotFound; + if (iRingTonePlayer) + { + error = iRingTonePlayer->Stop(); + RemoveExpectedEvent(ERTPlayComplete); + } + iLog->Log(_L("CTmsAudioServicesTestClass::StopRingTone Error [%d]"), error); + return error; + } + +TInt CTmsAudioServicesTestClass::MuteRingTone(CStifItemParser& /*aItem*/) + { + FTRACE (FPrint(_L("CTmsAudioServicesTestClass::MuteRingTone"))); + iLog->Log(_L("CTmsAudioServicesTestClass::MuteRingTone")); + TInt error = KErrNotFound; + if (iRingTonePlayer) + { + error = iRingTonePlayer->Mute(); + } + iLog->Log(_L("CTmsAudioServicesTestClass::MuteRingTone Error [%d]"), error); + return error; + } + +TInt CTmsAudioServicesTestClass::CloseRingTonePlayer(CStifItemParser& /*aItem*/) + { + FTRACE (FPrint(_L("CTmsAudioServicesTestClass::CloseRingTonePlayer"))); + iLog->Log(_L("CTmsAudioServicesTestClass::CloseRingTonePlayer")); + TInt error = KErrNotFound; + if (iFactory && iRingTonePlayer) + { + error = iRingTonePlayer->Deinit(); + error |= iRingTonePlayer->RemoveObserver(*this); + error |= iFactory->DeleteRingTonePlayer(iRingTonePlayer); + } + iLog->Log(_L("CTmsAudioServicesTestClass::CloseRingTonePlayer Error [%d]"), error); + return error; + } + +TInt CTmsAudioServicesTestClass::CreateInbandTonePlayer(CStifItemParser& /*aItem*/) + { + FTRACE (FPrint(_L("CTmsAudioServicesTestClass::CreateInbandTonePlayer"))); + iLog->Log(_L("CTmsAudioServicesTestClass::CreateInbandTonePlayer")); + TInt error = KErrNotFound; + + if (iFactory && !iInbandTonePlayer) + { + error = iFactory->CreateInbandTonePlayer(iInbandTonePlayer); + if (iInbandTonePlayer) + { + iInbandTonePlayer->AddObserver(*this, NULL); + } + } + iLog->Log(_L("CTmsAudioServicesTestClass::CreateInbandTonePlayer Error [%d]"), error); + return error; + } + +TInt CTmsAudioServicesTestClass::StartInbandTone(CStifItemParser& aItem) + { + FTRACE (FPrint(_L("CTmsAudioServicesTestClass::StartInbandTone"))); + iLog->Log(_L("CTmsAudioServicesTestClass::StartInbandTone")); + TInt error = TMS_RESULT_SUCCESS; + TPtrC StreamType; + error = aItem.GetNextString(StreamType); + + if (error == TMS_RESULT_SUCCESS && iInbandTonePlayer) + { + if (StreamType == KTagUserBusy) + { + error = iInbandTonePlayer->Start(TMS_INBAND_USER_BUSY); + } + else if (StreamType == KTagRadioPathNotFound) + { + error = iInbandTonePlayer->Start(TMS_INBAND_RADIO_PATH_NOT_AVAIL); + } + else if (StreamType == KTagCongestion) + { + error = iInbandTonePlayer->Start(TMS_INBAND_CONGESTION); + } + else if (StreamType == KTagSpecialInfo) + { + error = iInbandTonePlayer->Start(TMS_INBAND_SPECIAL_INFO); + } + else if (StreamType == KTagReorder) + { + error = iInbandTonePlayer->Start(TMS_INBAND_REORDER); + } + else if (StreamType == KTagAlerting) + { + error = iInbandTonePlayer->Start(TMS_INBAND_REMOTE_ALEARTING); + } + else if (StreamType == KTagWaiting) + { + error = iInbandTonePlayer->Start(TMS_INBAND_CALL_WAITING); + } + else if (StreamType == KTagDataCall) + { + error = iInbandTonePlayer->Start(TMS_INBAND_DATA_CALL); + } + else if (StreamType == KTagNoSequence) + { + error = iInbandTonePlayer->Start(TMS_INBAND_NO_SEQUENCE); + } + else if (StreamType == KTagBeepSequence) + { + error = iInbandTonePlayer->Start(TMS_INBAND_BEEP_SEQUENCE); + } + else + { + iLog->Log(KMsgBadTestParameters); + error = KErrBadTestParameter; + } + } + + if (error == TMS_RESULT_SUCCESS) + { + AddExpectedEvent(EInbToneStarted, KShortTimeout); + } + + iLog->Log(_L("CTmsAudioServicesTestClass::StartInbandTone Error [%d]"), error); + return error; + } + +TInt CTmsAudioServicesTestClass::StopInbandTone(CStifItemParser& /*aItem*/) + { + FTRACE (FPrint(_L("CTmsAudioServicesTestClass::StopInbandTone"))); + iLog->Log(_L("CTmsAudioServicesTestClass::StopInbandTone")); + TInt error = KErrNotFound; + if (iFactory && iInbandTonePlayer) + { + error = iInbandTonePlayer->Stop(); + RemoveExpectedEvent(EInbToneStarted); + } + iLog->Log(_L("CTmsAudioServicesTestClass::StopInbandTone Error [%d]"), error); + return error; + } + +TInt CTmsAudioServicesTestClass::CloseInbandTonePlayer(CStifItemParser& /*aItem*/) + { + FTRACE (FPrint(_L("CTmsAudioServicesTestClass::CloseInbandTonePlayer"))); + iLog->Log(_L("CTmsAudioServicesTestClass::CloseInbandTonePlayer")); + TInt error = KErrNotFound; + if (iFactory && iInbandTonePlayer) + { + error = iInbandTonePlayer->RemoveObserver(*this); + error |= iFactory->DeleteInbandTonePlayer(iInbandTonePlayer); + } + iLog->Log(_L("CTmsAudioServicesTestClass::CloseInbandTonePlayer Error [%d]"), error); + return error; + } + // ---------------------------------------------------------------------------- // CTmsTestEngine::DoLoopback // @@ -3127,12 +3457,12 @@ Mem::Copy(desptr, srcptr, srcsize); - static_cast(iTmsClientSource)->BufferFilled( + static_cast (iTmsClientSource)->BufferFilled( *iPlayBuf); - static_cast(iTmsClientSink)->BufferProcessed(iRecBuf); + static_cast (iTmsClientSink)->BufferProcessed(iRecBuf); iPlayBufReady = EFalse; // buf filled, ready for FillBuffer - iRecBufReady = EFalse; // buf consumed, ready for EmptyBuffer + iRecBufReady = EFalse; // buf consumed, ready for EmptyBuffer } iLog->Log(_L("CTmsAudioServicesTestClass::DoLoopback END"));