diff -r 6df133bd92e1 -r 075425b8d9a4 radioapp/radiouiengine/src/radioscannerengine.cpp --- a/radioapp/radiouiengine/src/radioscannerengine.cpp Fri Jun 04 10:21:36 2010 +0100 +++ b/radioapp/radiouiengine/src/radioscannerengine.cpp Fri Jun 11 13:38:32 2010 +0300 @@ -27,6 +27,7 @@ #include "radiostationhandlerif.h" #include "radiostationmodel.h" #include "radiostation.h" +#include "radiologger.h" /*! * @@ -54,6 +55,8 @@ Q_D( RadioScannerEngine ); d->mUiEngine.cancelSeeking(); +// d->mUiEngine.wrapper().setRdsEnabled( false ); + d->mIsScanning = true; if ( !d->mUiEngine.api().isMuted() ) { @@ -61,17 +64,17 @@ d->mMutedByScanner = true; } - d->mUiEngine.api().emitSeekingStarted( Seeking::Up ); + d->mUiEngine.api().emitSeekingStarted( Seek::Up ); d->mUiEngine.api().stationModel().removeAll( RadioStationModel::RemoveLocalStations ); d->mLastFoundFrequency = d->mUiEngine.api().minFrequency(); if ( d->mUiEngine.wrapper().currentFrequency() == d->mLastFoundFrequency ) { // Engine was already at the minimun frequency so start scanning - d->mUiEngine.wrapper().startSeeking( Seeking::Up, TuneReason::StationScan ); + d->mUiEngine.wrapper().startSeeking( Seek::Up, TuneReason::StationScan ); } else { // Engine must be initialized to minimum frequency before scanning can start - d->mUiEngine.wrapper().tuneFrequency( d->mLastFoundFrequency, TuneReason::StationScanInitialization ); + d->mUiEngine.wrapper().setFrequency( d->mLastFoundFrequency, TuneReason::StationScanInitialization ); } } @@ -81,7 +84,7 @@ void RadioScannerEngine::continueScanning() { Q_D( RadioScannerEngine ); - d->mUiEngine.wrapper().startSeeking( Seeking::Up, TuneReason::StationScan ); + d->mUiEngine.wrapper().startSeeking( Seek::Up, TuneReason::StationScan ); } /*! @@ -108,6 +111,8 @@ d->mUiEngine.api().setMute( false ); d->mMutedByScanner = false; } + +// d->mUiEngine.wrapper().setRdsEnabled( true ); } /*!