FCL/sf/mw/mmmw: comparison mmserv/radioutility/radio_utility/src/RadioFmTunerUtilityBody.cpp

equal deleted inserted replaced

-:80975da52420
+:43d09473c595
 */
 #include "RadioFmTunerUtilityBody.h"
 #include "RadioUtilityBody.h"
+#include "trace.h"
 // -----------------------------------------------------------------------------
 // CRadioFmTunerUtility::CBody::NewL
 // Two-phased constructor.
 // -----------------------------------------------------------------------------
 //
 CRadioFmTunerUtility::CBody* CRadioFmTunerUtility::CBody::NewL(
 RRadioSession& aRadioSession,
 MRadioFmTunerObserver& aObserver )
 {
-CRadioFmTunerUtility::CBody* s = new(ELeave) CRadioFmTunerUtility::CBody();
+FUNC_LOG;
-s->iRadioFmTunerUtilityClient = &aObserver;
+CRadioFmTunerUtility::CBody* s = new(ELeave) CRadioFmTunerUtility::CBody( aRadioSession, aObserver );
-s->iRadioSession = &aRadioSession;
 CleanupStack::PushL(s);
 s->ConstructL();
 CleanupStack::Pop();
 return s;
 }
 // Two-phased constructor.
 // -----------------------------------------------------------------------------
 //
 void CRadioFmTunerUtility::CBody::ConstructL()
 {
+FUNC_LOG;
 }
 // -----------------------------------------------------------------------------
 // CRadioFmTunerUtility::CBody::CBody
 // -----------------------------------------------------------------------------
 //
-CRadioFmTunerUtility::CBody::CBody()
+CRadioFmTunerUtility::CBody::CBody(
-{
+RRadioSession& aRadioSession,
+MRadioFmTunerObserver& aObserver )
+: iRadioSession(aRadioSession),
+iRadioFmTunerUtilityClient(aObserver)
+{
+FUNC_LOG;
 }
 // -----------------------------------------------------------------------------
 // CRadioFmTunerUtility::CBody::~CBody
 // -----------------------------------------------------------------------------
 //
 CRadioFmTunerUtility::CBody::~CBody()
 {
+FUNC_LOG;
 }
 // -----------------------------------------------------------------------------
 // CRadioFmTunerUtility::CBody::RequestTunerControl
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CRadioFmTunerUtility::CBody::RequestTunerControl()
 {
-iRadioSession->RequestTunerControl( ERsTunerFm );
+FUNC_LOG;
+iRadioSession.RequestTunerControl( ERsTunerFm );
 }
 // -----------------------------------------------------------------------------
 // CRadioFmTunerUtility::CBody::Close
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CRadioFmTunerUtility::CBody::Close()
 {
+FUNC_LOG;
 // Consider releasing tuner control here.
 }
 // -----------------------------------------------------------------------------
 // CRadioFmTunerUtility::CBody::GetCapabilities
 // -----------------------------------------------------------------------------
 //
 TInt CRadioFmTunerUtility::CBody::GetCapabilities(
 TFmTunerCapabilities& aCaps ) const
 {
+FUNC_LOG;
 TRsTunerCapabilities caps;
-TInt error = iRadioSession->GetTunerCapabilities( caps );
+TInt error = iRadioSession.GetTunerCapabilities( caps );
 if ( !error )
 {
 aCaps.iTunerBands = caps.iFrequencyRange;
 aCaps.iTunerFunctions = caps.iCapabilities;
 // -----------------------------------------------------------------------------
 //
 TInt CRadioFmTunerUtility::CBody::EnableTunerInOfflineMode(
 TBool aEnable )
 {
-return iRadioSession->EnableTunerInOfflineMode( aEnable );
+FUNC_LOG;
+return iRadioSession.EnableTunerInOfflineMode( aEnable );
 }
 // -----------------------------------------------------------------------------
 // CRadioFmTunerUtility::CBody::GetFrequencyRange
 // (other items were commented in a header).
 TInt CRadioFmTunerUtility::CBody::GetFrequencyRange(
 TFmRadioFrequencyRange& aRange,
 TInt& aMinFreq,
 TInt& aMaxFreq ) const
 {
+FUNC_LOG;
 TRsFrequencyRange range;
-TInt error = iRadioSession->GetFrequencyRange( range, aMinFreq, aMaxFreq );
+TInt error = iRadioSession.GetFrequencyRange( range, aMinFreq, aMaxFreq );
 if ( !error )
 {
 switch ( range )
 {
 case ERsRangeFmEuroAmerica:
 break;
 default:
 break;
 }
 }
-#ifdef _DEBUG
+INFO_3("aRange = %d, aMinFreq = %d, aMaxFreq = %d", aRange, aMinFreq, aMaxFreq);
-RDebug::Print(_L("CRadioFmTunerUtility::CBody::GetFrequencyRange, aRange = %d, aMinFreq = %d, aMaxFreq = %d"),
-aRange, aMinFreq, aMaxFreq);
-#endif
 return error;
 }
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 //
 void CRadioFmTunerUtility::CBody::SetFrequencyRange(
 TFmRadioFrequencyRange aRange )
 {
-#ifdef _DEBUG
+FUNC_LOG;
-RDebug::Print(_L("CRadioFmTunerUtility::CBody::SetFrequencyRange, aRange = %d"), aRange);
+INFO_1("aRange = %d", aRange);
-#endif
 TRsFrequencyRange range = ERsRangeFmEuroAmerica;    //default
 switch (aRange)
 {
 case EFmRangeEuroAmerica:
 range = ERsRangeFmEuroAmerica;
 range = ERsRangeFmJapan;
 break;
 default:
 break;
 }
-iRadioSession->SetFrequencyRange( range );
+iRadioSession.SetFrequencyRange( range );
 }
 // -----------------------------------------------------------------------------
 // CRadioFmTunerUtility::CBody::CancelSetFrequencyRange
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CRadioFmTunerUtility::CBody::CancelSetFrequencyRange()
 {
-iRadioSession->CancelSetFrequencyRange();
+FUNC_LOG;
+iRadioSession.CancelSetFrequencyRange();
 }
 // -----------------------------------------------------------------------------
 // CRadioFmTunerUtility::CBody::SetFrequency
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CRadioFmTunerUtility::CBody::SetFrequency(
 TInt aFrequency )
 {
-#ifdef _DEBUG
+FUNC_LOG;
-RDebug::Print(_L("CRadioFmTunerUtility::CBody::SetFrequency, aFrequency = %d"), aFrequency);
+INFO_1("aFrequency = %d", aFrequency);
-#endif
+iRadioSession.SetFrequency(aFrequency);
-iRadioSession->SetFrequency(aFrequency);
 }
 // -----------------------------------------------------------------------------
 // CRadioFmTunerUtility::CBody::CancelSetFrequencyRange
 // Body of CancelSetFrequencyRange
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CRadioFmTunerUtility::CBody::CancelSetFrequency()
 {
-iRadioSession->CancelSetFrequency();
+FUNC_LOG;
+iRadioSession.CancelSetFrequency();
 }
 // -----------------------------------------------------------------------------
 // CRadioFmTunerUtility::CBody::GetFrequency
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 TInt CRadioFmTunerUtility::CBody::GetFrequency(
 TInt& aFrequency ) const
 {
-return iRadioSession->GetFrequency(aFrequency);
+FUNC_LOG;
+return iRadioSession.GetFrequency(aFrequency);
 }
 // -----------------------------------------------------------------------------
 // CRadioFmTunerUtility::CBody::StationSeek
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CRadioFmTunerUtility::CBody::StationSeek(
 TBool aUpwards )
 {
-#ifdef _DEBUG
+FUNC_LOG;
-RDebug::Print(_L("CRadioFmTunerUtility::CBody::StationSeek, aUpwards = %d"), aUpwards);
+INFO_1("aUpwards = %d", aUpwards);
-#endif
+iRadioSession.StationSeek(aUpwards);
-iRadioSession->StationSeek(aUpwards);
 }
 // -----------------------------------------------------------------------------
 // CRadioFmTunerUtility::CBody::CancelStationSeek
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 void CRadioFmTunerUtility::CBody::CancelStationSeek()
 {
-iRadioSession->CancelStationSeek();
+FUNC_LOG;
+iRadioSession.CancelStationSeek();
 }
 // -----------------------------------------------------------------------------
 // CRadioFmTunerUtility::CBody::GetSignalStrength
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 TInt CRadioFmTunerUtility::CBody::GetSignalStrength(
 TInt& aSignalStrength ) const
 {
-return iRadioSession->GetSignalStrength(aSignalStrength);
+FUNC_LOG;
+return iRadioSession.GetSignalStrength(aSignalStrength);
 }
 // -----------------------------------------------------------------------------
 // CRadioFmTunerUtility::GetMaxSignalStrength
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 TInt CRadioFmTunerUtility::CBody::GetMaxSignalStrength(
 TInt& aMaxSignalStrength ) const
 {
-return iRadioSession->GetMaxSignalStrength(aMaxSignalStrength);
+FUNC_LOG;
+return iRadioSession.GetMaxSignalStrength(aMaxSignalStrength);
 }
 // -----------------------------------------------------------------------------
 // CRadioFmTunerUtility::CBody::GetStereoMode
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 TInt CRadioFmTunerUtility::CBody::GetStereoMode(
 TBool& aStereo ) const
 {
-return iRadioSession->GetStereoMode(aStereo);
+FUNC_LOG;
+return iRadioSession.GetStereoMode(aStereo);
 }
 // -----------------------------------------------------------------------------
 // CRadioFmTunerUtility::CBody::ForceMonoReception
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 TInt CRadioFmTunerUtility::CBody::ForceMonoReception(
 TBool aForcedMono)
 {
-return iRadioSession->ForceMonoReception(aForcedMono);
+FUNC_LOG;
+return iRadioSession.ForceMonoReception(aForcedMono);
 }
 // -----------------------------------------------------------------------------
 // CRadioFmTunerUtility::CBody::GetForcedMonoReception
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 TInt CRadioFmTunerUtility::CBody::GetForcedMonoReception(
 TBool& aForcedMono ) const
 {
-return iRadioSession->GetForceMonoReception(aForcedMono);
+FUNC_LOG;
+return iRadioSession.GetForceMonoReception(aForcedMono);
 }
 // -----------------------------------------------------------------------------
 // CRadioFmTunerUtility::CBody::SetSquelch
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 TInt CRadioFmTunerUtility::CBody::SetSquelch(
 TBool aSquelch )
 {
-return iRadioSession->SetSquelch(aSquelch);
+FUNC_LOG;
+return iRadioSession.SetSquelch(aSquelch);
 }
 // -----------------------------------------------------------------------------
 // CRadioFmTunerUtility::CBody::GetSquelch
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
 TInt CRadioFmTunerUtility::CBody::GetSquelch(
 TBool& aSquelch ) const
 {
-return iRadioSession->GetSquelch(aSquelch);
+FUNC_LOG;
+return iRadioSession.GetSquelch(aSquelch);
 }
 // End of File

changeset 16	43d09473c595
parent 0	71ca22bcf22a
child 46	0ac9a5310753