FCL/sf/app/radio: comparison radioapp/radioenginewrapper/src/radioenginewrapper

equal deleted inserted replaced

-:63aabac4416d
+:f54ebcfc1b80
 #include "radiosettings.h"
 #include "radiosettings_p.h"
 #include "radiologger.h"
 #include "radio_global.h"
 #include "cradioenginehandler.h"
-#include "radiofrequencyscanninghandler.h"
 #include "radiostationhandlerif.h"
 #include "cradiopubsub.h"
 #include "radiocontroleventlistener.h"
 #include "radiordslistener.h"
 #include "cradiorepositorymanager.h"
 /*!
 *
 */
 RadioEngineWrapperPrivate::RadioEngineWrapperPrivate( RadioEngineWrapper* wrapper,
-RadioStationHandlerIf& stationHandler,
+RadioStationHandlerIf& stationHandler ) :
-RadioEngineWrapperObserver& observer ) :
 q_ptr( wrapper ),
 mStationHandler( stationHandler ),
-mObserver( observer ),
 mEngineHandler( new CRadioEngineHandler( *this ) ),
 mControlEventListener( new RadioControlEventListener( *this ) ),
 mRdsListener ( new RadioRdsListener( mStationHandler, *this ) ),
-mCommandSender( 0 ),
+mTuneReason( 0 ),
-mUseLoudspeaker( false ),
+mUseLoudspeaker( false )
-mIsSeeking( false )
 {
 }
 /*!
 *
 KProEngActiveProfile,
 CRadioRepositoryManager::ERadioEntityInt );
 mUseLoudspeaker = mEngineHandler->IsAudioRoutedToLoudspeaker();
 if ( !mUseLoudspeaker ) {
-mObserver.audioRouteChanged( false );
+RUN_NOTIFY_LOOP( mObservers, audioRouteChanged( false ) );
 }
 }
 /*!
 * Starts up the radio engine
 }
 /*!
 * Tunes to the given frequency
 */
-void RadioEngineWrapperPrivate::tuneFrequency( uint frequency, const int sender )
+void RadioEngineWrapperPrivate::tuneFrequency( uint frequency, const int reason )
 {
-mCommandSender = sender;
+if ( mEngineHandler->TunedFrequency() != frequency ) {
-mEngineHandler->Tune( frequency );
+mTuneReason = reason;
+mEngineHandler->Tune( frequency );
+}
 }
 /*!
 * Tunes to the given frequency after a delay
 */
-void RadioEngineWrapperPrivate::tuneWithDelay( uint frequency, const int sender )
+void RadioEngineWrapperPrivate::tuneWithDelay( uint frequency, const int reason )
 {
-mCommandSender = sender;
+if ( mEngineHandler->TunedFrequency() != frequency ) {
-mEngineHandler->TuneWithDelay( frequency );
+mTuneReason = reason;
-}
+mEngineHandler->TuneWithDelay( frequency );
+}
-/*!
+}
-*
-*/
+/*!
-RadioEngineWrapperObserver& RadioEngineWrapperPrivate::observer()
+*
-{
+*/
-return mObserver;
+ObserverList& RadioEngineWrapperPrivate::observers()
-}
+{
+return mObservers;
-/*!
+}
-*
-*/
+/*!
-void RadioEngineWrapperPrivate::startSeeking( Seeking::Direction direction )
+*
-{
+*/
+void RadioEngineWrapperPrivate::startSeeking( Seeking::Direction direction, const int reason )
+{
+mTuneReason = reason;
 mEngineHandler->Seek( direction );
-mObserver.seekingStarted( direction );
 }
 /*!
 * \reimp
 */
 void RadioEngineWrapperPrivate::PowerEventL( TBool aPowerState, TInt DEBUGVAR( aError ) )
 {
 LOG_FORMAT( "RadioEngineWrapperPrivate::PowerEventL, PowerState: %d, Error: %d", aPowerState, aError );
-mObserver.radioStatusChanged( aPowerState );
+RUN_NOTIFY_LOOP( mObservers, radioStatusChanged( aPowerState ) );
-mEngineHandler->PubSub().PublishPowerState( aPowerState );
 }
 /*!
 * \reimp
 */
 void RadioEngineWrapperPrivate::FrequencyEventL( TUint32 aFrequency,
 RadioEngine::TRadioFrequencyEventReason aReason,
 TInt aError )
 {
+Q_UNUSED( aReason );
 LOG_FORMAT( "RadioEngineWrapperPrivate::FrequencyEventL - Frequency: %d, Reason: %d, Error: %d", aFrequency, aReason, aError );
-if ( mFrequencyScanningHandler )
-{
-// frequencyevents not handled during scanning //TODO remove
-return;
-}
 if ( !aError ) {
 const uint frequency = static_cast<uint>( aFrequency );
+RUN_NOTIFY_LOOP( mObservers, tunedToFrequency( frequency, mTuneReason ) );
-mStationHandler.setCurrentStation( frequency );
-// Stations found by seeking (autotune) are saved as local stations
-if ( aReason == RadioEngine::ERadioFrequencyEventReasonSeekUp
-|| aReason == RadioEngine::ERadioFrequencyEventReasonSeekDown  )
-{
-mStationHandler.addScannedFrequency( frequency );
-mCommandSender = 0;
-}
-//mEngineHandler->SetMuted( EFalse );
-LOG_TIMESTAMP( "Channel change finished" );
-mObserver.tunedToFrequency( frequency, mCommandSender );
-mStationHandler.startDynamicPsCheck();
-mEngineHandler->PubSub().PublishFrequency( aFrequency );
 }
 }
 /*!
 * \reimp
 */
 void RadioEngineWrapperPrivate::VolumeEventL( TInt aVolume, TInt aError )
 {
 Q_UNUSED( aError );
-mObserver.volumeChanged( aVolume );
+RUN_NOTIFY_LOOP( mObservers, volumeChanged( aVolume ) );
-mEngineHandler->PubSub().PublishVolume( aVolume );
 }
 /*!
 * \reimp
 */
 void RadioEngineWrapperPrivate::MuteEventL( TBool aMuteState, TInt aError )
 {
 Q_UNUSED( aError );
-mObserver.muteChanged( aMuteState );
+RUN_NOTIFY_LOOP( mObservers, muteChanged( aMuteState ) );
-mEngineHandler->PubSub().PublishRadioMuteState( aMuteState );
 }
 /*!
 * \reimp
 */
 * \reimp
 */
 void RadioEngineWrapperPrivate::AntennaEventL( TBool aAntennaAttached, TInt aError )
 {
 Q_UNUSED( aError );
-mObserver.headsetStatusChanged( aAntennaAttached );
+RUN_NOTIFY_LOOP( mObservers, antennaStatusChanged( aAntennaAttached ) );
-//    doc->PubSubL().PublishHeadsetStatusL( EVRPSHeadsetConnected );
 }
 /*!
 * \reimp
 */
 void RadioEngineWrapperPrivate::AudioRoutingEventL( TInt aAudioDestination, TInt aError )
 {
 //TODO: Check how this event differs from AudioRoutingChangedL
 Q_UNUSED( aAudioDestination )
 Q_UNUSED( aError )
-//    doc->PubSubL().PublishLoudspeakerStatusL( EVRPSLoudspeakerNotInUse );
 //    Q_Q( RadioEngineWrapper );
 //    q->audioRouteChanged( aAudioDestination == RadioEngine::ERadioSpeaker );
 }
 /*!
 //    LOG_FORMAT( "RadioEngineWrapperPrivate::SeekingEventL, aSeekingState: %d, Error: %d", aSeekingState, aError );
 //    if ( aSeekingState != RadioEngine::ERadioNotSeeking ) {
 //        // We only set the flag here. It is reset in the FrequencyEventL
 //        mIsSeeking = true;
 //    }
-//    Document()->PubSubL().PublishTuningStateL( EVRPSTuningStarted );
 }
 /*!
 * \reimp
 */
 void RadioEngineWrapperPrivate::RegionEventL( TInt DEBUGVAR( aRegion ), TInt DEBUGVAR( aError ) )
 {
 LOG_FORMAT( "RadioEngineWrapperPrivate::RegionEventL, aRegion: %d, Error: %d", aRegion, aError );
-//    Document()->PubSubL().PublishFrequencyDecimalCountL(
-//        static_cast<TVRPSFrequencyDecimalCount>( Document()->RadioSettings()->DecimalCount() ) );
 }
 /*!
 * \reimp
 */
 void RadioEngineWrapperPrivate::AudioRouteChangedL( RadioEngine::TRadioAudioRoute aRoute )
 {
 mUseLoudspeaker = aRoute == RadioEngine::ERadioSpeaker;
-mObserver.audioRouteChanged( mUseLoudspeaker );
+RUN_NOTIFY_LOOP( mObservers, audioRouteChanged( mUseLoudspeaker ) );
 }
 /*!
 * \reimp
 */
 {
 if ( aUid == KCRUidProfileEngine && aKey == KProEngActiveProfile && !aError && aValue == KOfflineProfileId ) {
 LOG( "RadioEngineWrapperPrivate::HandleRepositoryValueChangeL: Offline profile activated" );
 }
 }
-/*!
-*
-*/
-void RadioEngineWrapperPrivate::frequencyScannerFinished()
-{
-RadioFrequencyScanningHandler* handler = mFrequencyScanningHandler.take(); // Nulls the pointer
-handler->deleteLater();
-mObserver.scanAndSaveFinished();
-}

changeset 16	f54ebcfc1b80
parent 14	63aabac4416d
child 19	afea38384506