diff -r 4ce423f34688 -r e267340986c9 khronosfws/openmax_al/src/mmf_adaptation/cmmfradiobackendengine.cpp
--- a/khronosfws/openmax_al/src/mmf_adaptation/cmmfradiobackendengine.cpp	Fri Sep 17 08:33:15 2010 +0300
+++ b/khronosfws/openmax_al/src/mmf_adaptation/cmmfradiobackendengine.cpp	Mon Oct 04 00:51:56 2010 +0300
@@ -60,6 +60,7 @@
 
 CMMFRadioBackendEngine::~CMMFRadioBackendEngine()
 {
+
 }
 
 CMMFRadioBackendEngine::CMMFRadioBackendEngine()
@@ -111,7 +112,7 @@
     }
 }
 
-TInt CMMFRadioBackendEngine::GetFrequency(TInt& aFreq)
+XAresult CMMFRadioBackendEngine::GetFrequency(TInt& aFreq)
 {
 //    DEBUG_CPP_API("CMMFRadioBackendEngine::GetFrequency");
     TInt ret = KErrNotFound;
@@ -125,10 +126,10 @@
         }
     }
 //  DEBUG_CPP_API_A1("CMMFRadioBackendEngine::GetFrequency RET: %d", ret);
-    return ret;
+    return TranslateError(ret);
 }
 
-TInt CMMFRadioBackendEngine::GetSignalStrength(TInt& aSignalStrength)
+XAresult CMMFRadioBackendEngine::GetSignalStrength(TInt& aSignalStrength)
 {
     TInt ret = KErrNotFound;
     if (iFmTunerUtility)
@@ -136,8 +137,7 @@
         ret = iFmTunerUtility->GetSignalStrength(aSignalStrength);
     }
 //    DEBUG_CPP_API_A1("CMMFRadioBackendEngine::GetSignalStrength RET: %d", ret);
-//  RDebug::Print(_L("CMMFRadioBackendEngine::GetSignalStrength RET: %d"), ret);
-    return ret;
+    return TranslateError(ret);
 }
 
 void CMMFRadioBackendEngine::CancelSetFrequency()
@@ -164,7 +164,7 @@
     }
 }
 
-TInt CMMFRadioBackendEngine::GetFreqRange(TFmRadioFrequencyRange& aRange)
+XAresult CMMFRadioBackendEngine::GetFreqRange(TFmRadioFrequencyRange& aRange)
 {
     TInt ret = KErrNotFound;
     TInt minFreq;
@@ -181,11 +181,11 @@
             ret = KErrNone;
         }
     }
- //   DEBUG_CPP_API_A1("CMMFRadioBackendEngine::GetFreqRange RET: %d", ret);
-    return ret;
+//    DEBUG_CPP_API_A1("CMMFRadioBackendEngine::GetFreqRange RET: %d", ret);
+    return TranslateError(ret);
 }
 
-TInt CMMFRadioBackendEngine::GetFreqRangeProperties(TFmRadioFrequencyRange& aRange, TInt& aMinFreq, TInt& aMaxFreq)
+XAresult CMMFRadioBackendEngine::GetFreqRangeProperties(TFmRadioFrequencyRange& aRange, TInt& aMinFreq, TInt& aMaxFreq)
 {
     TInt ret = KErrNotFound;
     if (iFmTunerUtility)
@@ -199,53 +199,44 @@
             ret = KErrNone;
         }
     }
-//    DEBUG_CPP_API_A1("CMMFRadioBackendEngine::GetFreqRangeProperties RET: %d", ret);
-    return ret;
-}
-TInt CMMFRadioBackendEngine::GetMaxVolume(TInt& aMaxVol)
-{
-    TInt ret = KErrNotFound;
-    if (iRadioPlayerUtility)
-    {
-        ret = iRadioPlayerUtility->GetMaxVolume(aMaxVol);
-    }
-    return ret;
+ //   DEBUG_CPP_API_A1("CMMFRadioBackendEngine::GetFreqRangeProperties RET: %d", ret);
+    return TranslateError(ret);
 }
 
-TInt CMMFRadioBackendEngine::SetVolume(TInt aVol)
+XAresult CMMFRadioBackendEngine::SetVolume(TInt aVol)
 {
     TInt ret = KErrNotFound; 
     if (iRadioPlayerUtility)
     {
         ret = iRadioPlayerUtility->SetVolume(aVol);
     }
-    return ret;
+    return TranslateError(ret);
 }
 
-TInt CMMFRadioBackendEngine::SetMute(TBool aMute)
+XAresult CMMFRadioBackendEngine::SetMute(TBool aMute)
 {
     TInt ret = KErrNotFound;
     if (iRadioPlayerUtility)
     {
         ret = iRadioPlayerUtility->Mute(aMute);
     }
-    return ret;
+    return TranslateError(ret);
 }
 
-TInt CMMFRadioBackendEngine::GetVolume(TInt& aVol)
+XAresult CMMFRadioBackendEngine::GetVolume(TInt& aVol)
 {
     TInt ret = KErrNotFound;
     if (iRadioPlayerUtility)
     {
         ret = iRadioPlayerUtility->GetVolume(aVol);
     }
-    return ret;
+    return TranslateError(ret);
 }
 
-TInt CMMFRadioBackendEngine::GetForcedMonoReception(TUint& aForcedMono)
+XAresult CMMFRadioBackendEngine::GetForcedMonoReception(TUint& aForcedMono)
 {
     TInt ret = KErrNotFound;
-    TBool forceMono(EFalse);
+    TBool forceMono = XA_BOOLEAN_FALSE;
 
     if (iFmTunerUtility)
     {
@@ -253,7 +244,7 @@
         if (ret == KErrNotReady)
         {
             aForcedMono = XA_STEREOMODE_AUTO; // Radio Utility Default value
-            return KErrNone;
+            return TranslateError(KErrNone);
         }
     }
 
@@ -268,7 +259,7 @@
         else
             aForcedMono = XA_STEREOMODE_AUTO;
     }
-    return ret;
+    return TranslateError(ret);
 }
 
 void CMMFRadioBackendEngine::PlayRadio()
@@ -287,14 +278,14 @@
     }
 }
 
-TInt CMMFRadioBackendEngine::ForceMonoReception(TUint aForcedMono)
+XAresult CMMFRadioBackendEngine::ForceMonoReception(TUint aForcedMono)
 {
     TInt ret = KErrNotFound;
     TUint currentMode;
 
     ret = GetForcedMonoReception(currentMode);
     if (ret != XA_RESULT_SUCCESS)
-        return ret;
+        return TranslateError(ret);
 
     if (iFmTunerUtility)
     {
@@ -328,14 +319,14 @@
             }
         }
     }
- //   DEBUG_CPP_API_A1("CMMFRadioBackendEngine::ForceMonoReception RET: %d", ret);
-    return ret;
+//    DEBUG_CPP_API_A1("CMMFRadioBackendEngine::ForceMonoReception RET: %d", ret);
+    return TranslateError(ret);
 }
 
 XAresult CMMFRadioBackendEngine::SetForceMonoFlag() 
 {
     TInt ret = KErrNotFound;
-    TBool forceMono;
+    TBool forceMono = XA_BOOLEAN_FALSE;
 
     if (iFmTunerUtility)
     {
@@ -344,10 +335,10 @@
         {
             // For Radio Utility Default value = XA_STEREOMODE_STEREO
             iForceStereo = ETrue;
-            return KErrNone;
+            return TranslateError(KErrNone);
         }
     }
-    if (forceMono == XA_STEREOMODE_MONO)
+    if (!forceMono)
     {
         iForceStereo = EFalse;
     }
@@ -355,27 +346,27 @@
     {
         iForceStereo = ETrue;
     }
-  return ret;
+  return TranslateError(ret);
 }
 
-TInt CMMFRadioBackendEngine::GetSquelch(TBool& aSquelch)
+XAresult CMMFRadioBackendEngine::GetSquelch(TBool& aSquelch)
 {
     TInt ret = KErrNotFound;
     if (iFmTunerUtility)
     {
         ret = iFmTunerUtility->GetSquelch(aSquelch);
     }
-    return ret;
+    return TranslateError(ret);
 }
 
-TInt CMMFRadioBackendEngine::SetSquelch(TBool aSquelch)
+XAresult CMMFRadioBackendEngine::SetSquelch(TBool aSquelch)
 {
     TInt ret = KErrNotFound;
     if (iFmTunerUtility)
     {
         ret = iFmTunerUtility->SetSquelch(aSquelch);
     }
-    return ret;
+    return TranslateError(ret);
 }
 
 void CMMFRadioBackendEngine::SetAdaptContext(void * adaptcontext)
@@ -383,7 +374,7 @@
     iAdaptContext = (XAAdaptationBaseCtx*)adaptcontext;
 }
 
-XAresult TranslateError(TInt error)
+XAresult CMMFRadioBackendEngine::TranslateError(TInt error)
     {
     XAresult status(XA_RESULT_SUCCESS);
     switch(error)
@@ -391,6 +382,9 @@
         case KErrNone:
             status = XA_RESULT_SUCCESS;
             break;
+        case KErrNotFound:
+            status = XA_RESULT_MEMORY_FAILURE;
+            break;
         // to do: investigate and add other possible errors:
             
        /* case XA_RESULT_PRECONDITIONS_VIOLATED:
@@ -399,9 +393,7 @@
         case XA_RESULT_PARAMETER_INVALID:
 
             break;
-        case XA_RESULT_MEMORY_FAILURE:
 
-            break;
         case XA_RESULT_RESOURCE_ERROR:
 
             break;
@@ -432,9 +424,7 @@
         case XA_RESULT_INTERNAL_ERROR:
 
             break;
-        case XA_RESULT_UNKNOWN_ERROR:
 
-            break;
         case XA_RESULT_OPERATION_ABORTED:
 
             break;
@@ -443,7 +433,8 @@
             break;
             */
         default:
-        	break;
+            status = XA_RESULT_UNKNOWN_ERROR;
+            break;
         } // end switch
     return status;
     }
@@ -502,7 +493,7 @@
 void CMMFRadioBackendEngine::MrftoFrequencyRangeChange(
     TFmRadioFrequencyRange aNewRange )
 {
- //   DEBUG_CPP_API_A1("CMMFRadioBackendEngine::MrftoFrequencyRangeChange: aNewRange =  %d", aNewRange);
+//    DEBUG_CPP_API_A1("CMMFRadioBackendEngine::MrftoFrequencyRangeChange: aNewRange =  %d", aNewRange);
     XARadioItfAdapt_FrequencyRangeChange((XAAdaptationBaseCtx*)iAdaptContext, aNewRange);
 }
 
@@ -559,9 +550,8 @@
     TInt aError )
 {
 //    DEBUG_CPP_API_A1("CMMFRadioBackendEngine::MrftoSetFrequencyComplete: aError =  %d", aError);
-//  RDebug::Print(_L("CMMFRadioBackendEngine::MrftoFrrequencyComplete: aError = %d"), aError);
     TInt freq = 0;
-    if (!aError)
+    if (aError == KErrNone)
     {
         iFmTunerUtility->GetFrequency(freq);
     }
@@ -636,7 +626,7 @@
 {
 //    if ( aError )
 //    {
- //       DEBUG_CPP_API_A1("CMMFRadioBackendEngine::MrpoStateChange: aError =  %d", aError);
+//        DEBUG_CPP_API_A1("CMMFRadioBackendEngine::MrpoStateChange: aError =  %d", aError);
 //    }
 
 //    DEBUG_CPP_API_A1("CMMFRadioBackendEngine::MrpoStateChange: new state =  %d", aState);
@@ -662,6 +652,7 @@
     void cmmfradiobackendengine_delete(void* pContext)
     { 
         ((CMMFRadioBackendEngine*)(pContext))->DeleteInstance();
+        delete ((CMMFRadioBackendEngine*)pContext);
     }
 
     void  set_frequency(void* pContext, void* pAdaptcontext, XAuint32 freq)
@@ -712,11 +703,6 @@
         return ((CMMFRadioBackendEngine*)(pContext))->GetFreqRangeProperties((TFmRadioFrequencyRange&) aRange, (TInt&) *pMinFreq, (TInt&) *pMaxFreq);
     }
 
-    XAresult  get_max_volume(void* pContext, XAmillibel* pMaxVol)
-    {
-        return  ((CMMFRadioBackendEngine*)(pContext))->GetMaxVolume((TInt&)*pMaxVol);
-    }
-
     XAresult  set_volume(void* pContext, void* pAdaptcontext, XAuint32 vol)
     {
         ((CMMFRadioBackendEngine*)(pContext))->SetAdaptContext(pAdaptcontext);