diff -r ebf79c79991a -r 5e8b14bae8c3 mmserv/tms/tmsproxy/src/tmsproxy.cpp --- a/mmserv/tms/tmsproxy/src/tmsproxy.cpp Fri Jun 25 17:36:03 2010 -0500 +++ b/mmserv/tms/tmsproxy/src/tmsproxy.cpp Fri Jul 09 16:43:35 2010 -0500 @@ -30,12 +30,12 @@ using namespace TMS; // CONSTANTS -const TUint KTMSServerConnectRetries = 2; -const TUint KSessionMessageSlots = 10; -const TUint KUTF8Multiply = 2; +const guint KTMSServerConnectRetries = 2; +const guint KSessionMessageSlots = 10; +const guint KUTF8Multiply = 2; // ----------------------------------------------------------------------------- -// StartServer +// TMSProxy::StartServer // // Function that will launch TMS server executable in it its own process. // Start the server process/thread, which lives in an EPOCEXE object. @@ -119,14 +119,13 @@ { TRACE_PRN_FN_ENT; - gint retry = KTMSServerConnectRetries; + guint retry = KTMSServerConnectRetries; gint err(TMS_RESULT_GENERAL_ERROR); - gint numMessageSlots = KSessionMessageSlots; for (;;) { // Try to create a new session with the server - err = CreateSession(KTMSServerName, Version(), numMessageSlots); + err = CreateSession(KTMSServerName, Version(), KSessionMessageSlots); if ((err != KErrNotFound) && (err != KErrServerTerminated)) { @@ -183,9 +182,8 @@ EXPORT_C gint TMSProxy::GetTMSCallSessionHandle() { - gint err(TMS_RESULT_SUCCESS); - err = SendReceive(ETMSCallSessionHandle); - return TMSRESULT(err); + gint handle = SendReceive(ETMSCallSessionHandle); + return handle; } EXPORT_C gint TMSProxy::GetSupportedDecoders(RArray& aDecoders, @@ -414,7 +412,7 @@ { // Convert buffer from UTF-8 to unicode (16-bit) // Note: UTF-8 strings can take up to 4 bytes per character - gint unilen = tts->len / KUTF8Multiply; + guint unilen = tts->len / KUTF8Multiply; TRAP(status, ttsBuf = HBufC::NewL(unilen)); if (status == KErrNone) { @@ -438,7 +436,7 @@ HBufC* buf(NULL); // Convert buffer from UTF-8 to unicode (16-bit) // Note: UTF-8 strings can take up to 4 bytes per character - gint unilen = str->len / KUTF8Multiply; + guint unilen = str->len / KUTF8Multiply; TRAP(status, buf = HBufC::NewL(unilen)); if (buf && status == KErrNone) @@ -537,6 +535,15 @@ return TMSRESULT(status); } +EXPORT_C gint TMSProxy::InitDTMFPlayer(TMSStreamType streamtype) + { + gint status(TMS_RESULT_SUCCESS); + TIpcArgs args; + args.Set(0, streamtype); + status = RSessionBase::SendReceive(ETMSInitDTMF, args); + return TMSRESULT(status); + } + EXPORT_C gint TMSProxy::StartDTMF(TMSStreamType streamtype, GString* tone) { TRACE_PRN_FN_ENT;