diff -r ba22309243a1 -r f8c3d4e6102c radioengine/engine/src/cradioengineimp.cpp --- a/radioengine/engine/src/cradioengineimp.cpp Thu Jul 08 12:44:18 2010 +0300 +++ b/radioengine/engine/src/cradioengineimp.cpp Fri Jul 23 10:16:59 2010 +0300 @@ -51,7 +51,7 @@ const TInt KRadioVolumeStepsDivider = 500; /** amount of volume steps used previously */ #if defined __WINS__ -const TInt KRadioVolumeStepsOld = 10; +const TInt KRadioVolumeStepsWins = 20; #endif // defined __WINS__ /** KRadioRadioSwitchDelay value must not be too small, otherwise problems with @@ -232,6 +232,7 @@ LEVEL3( LOG_METHOD_AUTO ); TRadioRegion region = ERadioRegionNone; + //TODO: Reimplement in QT side and remove the mobile network functionality MRadioEngineSettings& engineSettings = iSettings->EngineSettings(); if ( iSystemEventCollector->IsMobileNetworkCoverage() ) { @@ -300,9 +301,7 @@ // Utilities have been created now iRadioInitializationState = ERadioUtilitiesConstructed; - // Before first RequestTunerControl() call it is ok to enable offline mode without checking capabilities - iTunerUtility->EnableTunerInOfflineMode( ETrue ); - iTunerUtility->RequestTunerControl(); + RequestTunerControl(); } // --------------------------------------------------------------------------- @@ -335,7 +334,7 @@ iRadioEnabled && OkToPlay( iSettings->EngineSettings().TunedFrequency() ) ) { - iTunerUtility->RequestTunerControl(); + RequestTunerControl(); } else { @@ -486,7 +485,7 @@ iRadioEnabled && OkToPlay( iSettings->EngineSettings().TunedFrequency() ) ) { - iTunerUtility->RequestTunerControl(); + RequestTunerControl(); } else { @@ -593,6 +592,29 @@ } // --------------------------------------------------------------------------- +// Requests tuner control from tuner utility +// --------------------------------------------------------------------------- +// +void CRadioEngineImp::RequestTunerControl() + { + LOG_METHOD_AUTO; + + if ( iRadioInitializationState < ERadioTunerControlRequested ) + { + LOG( "Requesting tuner control" ); + // Before first RequestTunerControl() say that it is ok to enable offline mode without checking capabilities + iTunerUtility->EnableTunerInOfflineMode( ETrue ); + iTunerUtility->RequestTunerControl(); + + iRadioInitializationState = ERadioTunerControlRequested; + } + else + { + LOG( "Tuner control already requested" ); + } + } + +// --------------------------------------------------------------------------- // // --------------------------------------------------------------------------- // @@ -923,10 +945,8 @@ } // --------------------------------------------------------------------------- -// If CRadioPlayerUtility has 10 steps, CAknVolumeControl has also 10 steps and also -// the maximum volume level of Visual radio is 10. Otherwise CRadioPlayerUtility has -// 200 steps, and CAknVolumeControl has 20 steps, so maximum volume level of Visual radio -// is 20. +// Determine the meximum volume level by dividing the maximum volume setting +// received from player utility to get the desired 20 volume steps // --------------------------------------------------------------------------- // TInt CRadioEngineImp::MaxVolumeLevel() const @@ -935,7 +955,7 @@ TInt maxLevel = 0; #if defined __WINS__ - maxLevel = KRadioVolumeStepsOld; + maxLevel = KRadioVolumeStepsWins; #else if ( RadioInitialized() ) { @@ -1003,9 +1023,9 @@ LOG_METHOD_AUTO; TInt count = iObservers.Count(); - for ( TInt i = 0; iEngineSettings().IsPowerOn() ) + if ( !aPowerOn ) { CancelSeek(); } // If we are seeking, power event starts seeking - if ( iSeekingState != RadioEngine::ERadioNotSeeking && iSettings->EngineSettings().IsPowerOn() ) + if ( iSeekingState != RadioEngine::ERadioNotSeeking && aPowerOn ) { // Reset seeking state to enable seeking start LOG( "PowerOn event in seekingstate. Restart seeking" );