Update of /cvsroot/clientapps/symbianMmf
In directory cvs02.internal.helixcommunity.org:/tmp/cvs-serv28598

Modified Files:
	hxmmfctrlimpl.cpp 
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with Real Networks, and I am authorized to contribute this code under said agreement."

Modified by:
    Arnel.Periquet at nokia.com

Reviewed by:

Date:
    03-27-2006

Project:
    MP4 datatype Helix plugin for Symbian 

ErrorId: 
    ESKU-6MWMV5

Synopsis:
    Change MMF error mapping to map "System Error -2" to "Invalid Clip" in the case of unsupported formats

Files Modified:
    clientapps/symbianmmf/hxmmfctrlimpl.cpp

Files Added:
    none

Image Size and Heap Use impact:
    none

Platforms and Profiles Build Verified:
    helix-client-s60-mmf-mdf-basic

Platforms and Profiles Functionality verified:
    armv5

Branch: 
    hxclient_2_1_0_cayennes and head



Index: hxmmfctrlimpl.cpp
===================================================================
RCS file: /cvsroot/clientapps/symbianMmf/hxmmfctrlimpl.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- hxmmfctrlimpl.cpp	13 Mar 2006 21:52:07 -0000	1.29
+++ hxmmfctrlimpl.cpp	28 Mar 2006 00:31:17 -0000	1.30
@@ -174,8 +174,9 @@
     { HXR_NET_RESOURCES_IN_USE,   KErrInUse                },
     { HXR_CANCELLED,              KErrCancel               },
     { HXR_DNR,                    KErrCouldNotConnect      },
-    { HXR_PARSE_ERROR,            KErrNotSupported         }
-
+    { HXR_PARSE_ERROR,            KErrNotSupported         },
+    { HXR_BAD_FORMAT,             KErrNotSupported         },
+    { HXR_DEC_NOT_FOUND,          KErrNotSupported         }
 /*
     { scUserStopped,           KErrCancel               },
     { scCanceled,              KErrCancel               },
@@ -286,12 +287,12 @@
     // m_pFileSource weak ref.
 }
 
-// 
+//
 // HXMMFCtrlImpl::GetInstallDrive
 // Returns the MMFController installation drive
-// strDrive : [OUT] Paramater to retrieve the Drive 
+// strDrive : [OUT] Paramater to retrieve the Drive
 // Return Value: KErrNone on success else system-wise error
-// 
+//
 TInt
 HXMMFCtrlImpl::GetInstallDrive(CHXString &strDrive)
 {
@@ -314,7 +315,7 @@
             if(RetVal == KErrNone)
             {
                 // File() returns the full path of the file including
-                // the drive letter. 
+                // the drive letter.
                 file = pFF->File();
                 // Since, we are interested on the drive letter we consider
                 // only 3 chars of full file path
@@ -329,13 +330,13 @@
     return RetVal;
 }
 
-// 
+//
 // HXMMFCtrlImpl::GetFullPath
 // Returns the absolute path. Appends installation drive
 // strRelPath : [IN] Relative path
 // strAbsPath : [OUT] Absolute path
 //
-void 
+void
 HXMMFCtrlImpl::GetFullPath(const CHXString &strRelPath, CHXString &strAbsPath)
 {
     GetInstallDrive(strAbsPath);
@@ -361,10 +362,10 @@
 {
     CHXString rootPath ;
     CHXString shadowPath;
-    
+
     // Config file path is same irrespective of SIS or ROM build
     rootPath = CHXAvStringUtils::DescToString(KHXMMFConfigFilePath);
-    
+
     GetFullPath(CHXAvStringUtils::DescToString(KHXMMFShadowFilePath),
                 shadowPath);
 
@@ -375,16 +376,16 @@
     User::LeaveIfError(fsSession.Connect());
 
     TBuf<256> filePath;
-    filePath.Format(_L("%S\\%S_%u_%u.cfg"), &KHXMMFConfigFilePath, 
-                                            &KProductName, 
-                                            TARVER_MAJOR_VERSION, 
+    filePath.Format(_L("%S\\%S_%u_%u.cfg"), &KHXMMFConfigFilePath,
+                                            &KProductName,
+                                            TARVER_MAJOR_VERSION,
                                             TARVER_MINOR_VERSION);
-    
+
 
     TInt err = rfile.Open(fsSession, filePath, EFileStreamText|EFileRead);
     if ( err == KErrNone)
     {
-       rfile.Close(); 
+       rfile.Close();
     }
     else
     {
@@ -397,15 +398,15 @@
         err = KErrNotFound;
     }
 
-    if (err == KErrNotFound) 
+    if (err == KErrNotFound)
     {
         err = rfile.Create(fsSession, filePath, EFileStreamText|EFileWrite);
         if(err == KErrNone)
         {
             TBuf<128> KWriteBuf;
             _LIT(KOperator, "Operator");
-            KWriteBuf.Format(_L("[%S_%u_%u_%S.cfg]\n"), &KProductName, 
-                                                      TARVER_MAJOR_VERSION, 
+            KWriteBuf.Format(_L("[%S_%u_%u_%S.cfg]\n"), &KProductName,
+                                                      TARVER_MAJOR_VERSION,
                                                       TARVER_MINOR_VERSION,
                                                       &KOperator);
             TBuf8<128> KWriteBuf8;
@@ -418,7 +419,7 @@
 
     fsSession.Close();
     User::LeaveIfError(err);
-    
+
 
     CHXString productNameStr = CHXAvStringUtils::DescToString(KProductName);
     CHXString companyNameStr = CHXAvStringUtils::DescToString(KCompanyName);
@@ -629,7 +630,7 @@
 void
 HXMMFCtrlImpl::SendEvent( Event event, HX_RESULT status )
 {
-    HXLOGL2(HXLOG_SMMF, "HXMMFCtrlImpl::SendEvent(%s,%lx)", 
+    HXLOGL2(HXLOG_SMMF, "HXMMFCtrlImpl::SendEvent(%s,%lx)",
          EventToName(event), status);
 
     TMMFEvent mmfEvent;
@@ -645,7 +646,7 @@
         if ( mmfEvent.iErrorCode != KErrNone )
         {
             CHXString errText;
-            errText.Format( 
+            errText.Format(
                 "%d,%s (%lx)", mmfEvent.iErrorCode, EventToName(event), status );
 
             m_pLogSink->LogMessage( KMMFROPErrorLogSendEvents, errText );
@@ -1188,14 +1189,14 @@
     int dataLen;
     const unsigned char* pXferData = 0;
 
-    //  
+    //
     //  Get the log
     //
     m_pLogSink->GetLog( data );
 
     HXLOGL2(HXLOG_SMMF, "HXMMFCtrlImpl::GetErrorLog()\n%s", (const char*)data);
 
-    dataLen = data.GetLength(); 
+    dataLen = data.GetLength();
     pXferData = (const unsigned char *)(const char*)data;
 
     if (( pXferData ) && ( dataLen > 0 ))
@@ -1204,14 +1205,14 @@
 
         if ( aMessage.WriteDataToClient( TPtrC8( pXferData, dataLen )) == KErrNone )
         {
-            //  
+            //
             //  Reset log on successful write
             //
             m_pLogSink->ResetLog();
         }
         else
         {
-            //  
+            //
             //  UI's buffer wasn't big enough.  Give them needed size.
             HXLOGL1(HXLOG_SMMF, "HXMMFCtrlImpl::GetErrorLog() overFlow, need %d", dataLen);