--- a/khronosfws/openmax_al/src/mmf_adaptation/cmmfradiobackendengine.cpp Fri Jul 23 17:29:03 2010 -0500
+++ b/khronosfws/openmax_al/src/mmf_adaptation/cmmfradiobackendengine.cpp Fri Aug 06 16:55:00 2010 -0500
@@ -86,7 +86,7 @@
iRadioPlayerUtility = &iRadioUtility->RadioPlayerUtilityL( *this );
}
-// SetForceMonoFlag();
+ SetForceMonoFlag();
iDefaultFrequency = RADIO_DEFAULT_FREQ;
iDefaultFreqRange = (TFmRadioFrequencyRange)RADIO_DEFAULT_FREQ_RANGE;
iDefaultMinFreq = RADIO_DEFAULT_MIN_FREQ;
@@ -104,6 +104,7 @@
void CMMFRadioBackendEngine::SetFrequency(TInt aFreq)
{
DEBUG_API_A1("CMMFRadioBackendEngine::SetFrequency: %d", aFreq);
+
if (iFmTunerUtility)
{
iFmTunerUtility->SetFrequency(aFreq);
@@ -167,17 +168,17 @@
TInt CMMFRadioBackendEngine::GetFreqRange(TFmRadioFrequencyRange& aRange)
{
TInt ret = KErrNotFound;
- TInt minFreq = 0;
- TInt maxFreq = 0;
+ TInt minFreq;
+ TInt maxFreq;
if (iFmTunerUtility)
{
ret = iFmTunerUtility->GetFrequencyRange((TFmRadioFrequencyRange&)aRange, (TInt&)minFreq, (TInt&)maxFreq);
if (ret != KErrNone)
{
- aRange = iDefaultFreqRange;
minFreq = iDefaultMinFreq;
maxFreq = iDefaultMaxFreq;
+ aRange = iDefaultFreqRange;
ret = KErrNone;
}
}
@@ -259,7 +260,7 @@
ret = iFmTunerUtility->GetForcedMonoReception(forceMono);
if (ret == KErrNotReady)
{
- aForcedMono = XA_STEREOMODE_STEREO; // Radio Utility Default value
+ aForcedMono = XA_STEREOMODE_AUTO; // Radio Utility Default value
return KErrNone;
}
}
@@ -298,9 +299,9 @@
TInt CMMFRadioBackendEngine::ForceMonoReception(XAuint32 aForcedMono)
{
TInt ret = KErrNotFound;
- TBool currentMode;
+ XAuint32 currentMode;
- ret = GetForcedMonoReception((XAuint32&)currentMode);
+ ret = GetForcedMonoReception(currentMode);
if (ret != XA_RESULT_SUCCESS)
return ret;
@@ -706,9 +707,9 @@
return ((CMMFRadioBackendEngine*)(context))->GetFreqRange((TFmRadioFrequencyRange&)*range);
}
- XAresult get_freq_range_properties(void* context, XAuint8 range, XAuint32* aMinFreq, XAuint32* aMaxFreq)
+ XAresult get_freq_range_properties(void* context, XAuint8 aRange, XAuint32* aMinFreq, XAuint32* aMaxFreq)
{
- return ((CMMFRadioBackendEngine*)(context))->GetFreqRangeProperties((TFmRadioFrequencyRange&)range, (TInt&) *aMinFreq, (TInt&) *aMaxFreq);
+ return ((CMMFRadioBackendEngine*)(context))->GetFreqRangeProperties((TFmRadioFrequencyRange&) aRange, (TInt&) *aMinFreq, (TInt&) *aMaxFreq);
}
XAresult get_max_volume(void* context, XAmillibel* maxVol)