--- a/mmmw_plat/telephony_multimedia_service_api/tsrc/TmsAudioServicesTestClass/src/TmsAudioServicesTestClassBlocks.cpp Fri Feb 19 23:19:48 2010 +0200
+++ b/mmmw_plat/telephony_multimedia_service_api/tsrc/TmsAudioServicesTestClass/src/TmsAudioServicesTestClassBlocks.cpp Fri Mar 12 15:45:41 2010 +0200
@@ -116,9 +116,6 @@
iLog->Log(_L(""));
iLog->Log(_L(""));
- delete iDTMFTonePlayerDn;
- delete iDTMFTonePlayerUp;
-
// delete iPlayBuf;
if (iTmsDnlink)
@@ -174,8 +171,6 @@
ENTRY( "GetEffectType", CTmsAudioServicesTestClass::GetEffectType ),
ENTRY( "CreateDownlinkStream", CTmsAudioServicesTestClass::CreateDownlinkStream ),
ENTRY( "CreateUplinkStream", CTmsAudioServicesTestClass::CreateUplinkStream ),
- ENTRY( "CreateDTMFTonePlayer", CTmsAudioServicesTestClass::CreateDTMFTonePlayer ),
- ENTRY( "DeleteDTMFTonePlayer", CTmsAudioServicesTestClass::DeleteDTMFTonePlayer ),
ENTRY( "GetSupportedFormats", CTmsAudioServicesTestClass::GetSupportedFormats ),
ENTRY( "IsCallTypeSupported", CTmsAudioServicesTestClass::IsCallTypeSupported ),
ENTRY( "SetDownlinkFormat", CTmsAudioServicesTestClass::SetDownlinkFormat ),
@@ -198,10 +193,6 @@
ENTRY( "GetBitRateList", CTmsAudioServicesTestClass::GetBitRateList ),
ENTRY( "SetBitrates", CTmsAudioServicesTestClass::SetBitrates ),
ENTRY( "GetBitrates", CTmsAudioServicesTestClass::GetBitrates ),
- ENTRY( "InitDTMFTonePlayer", CTmsAudioServicesTestClass::InitDTMFTonePlayer ),
- ENTRY( "DTMFTonePlay", CTmsAudioServicesTestClass::DTMFTonePlay ),
- ENTRY( "CloseDTMFPlayer", CTmsAudioServicesTestClass::CloseDTMFPlayer ),
- ENTRY( "StopDTMFPlayer", CTmsAudioServicesTestClass::StopDTMFTonePlayer ),
ENTRY( "GetDownlinkVersion", CTmsAudioServicesTestClass::GetDownlinkVersion ),
ENTRY( "GetUplinkVersion", CTmsAudioServicesTestClass::GetUplinkVersion ),
ENTRY( "GetType", CTmsAudioServicesTestClass::GetType ),
@@ -1124,75 +1115,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::GetSupportedFormats(CStifItemParser& aItem)
{
iLog->Log(_L("CTmsAudioServicesTestClass::GetSupportedFormats"));
@@ -2332,38 +2254,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::GetBitRateList(CStifItemParser& /*aItem*/)
{
iLog ->Log(_L("CTmsAudioServicesTestClass::GetBitRateList"));