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

equal deleted inserted replaced

-:6df133bd92e1
+:075425b8d9a4
 * Constructor
 */
 RadioEngineWrapper::RadioEngineWrapper( RadioStationHandlerIf& stationHandler ) :
 d_ptr( new RadioEngineWrapperPrivate( this, stationHandler ) )
 {
-Q_D( RadioEngineWrapper );
-d->init();
 }
 /*!
 * Destructor
 */
 }
 /*!
 *
 */
+bool RadioEngineWrapper::init()
+{
+Q_D( RadioEngineWrapper );
+return d->init();
+}
+/*!
+*
+*/
 void RadioEngineWrapper::addObserver( RadioEngineWrapperObserver* observer )
 {
 Q_D( RadioEngineWrapper );
 d->mObservers.append( observer );
 }
 Q_D( RadioEngineWrapper );
 d->mObservers.removeAll( observer );
 }
 /*!
-* Checks if the radio engine has been constructed properly
-*/
-bool RadioEngineWrapper::isEngineConstructed()
-{
-Q_D( RadioEngineWrapper );
-return d->isEngineConstructed();
-}
-/*!
 * Returns the settings handler owned by the engine
 */
 RadioSettingsIf& RadioEngineWrapper::settings()
 {
 Q_D( RadioEngineWrapper );
 }
 /*!
 * Returns the frequency step size from the selected region
 */
-bool RadioEngineWrapper::isFrequencyValid( uint frequency )
+bool RadioEngineWrapper::isFrequencyValid( uint frequency ) const
 {
-Q_D( const RadioEngineWrapper );
+return frequency >= minFrequency() && frequency <= maxFrequency() && frequency % frequencyStepSize() == 0;
-return d->mEngineHandler->IsFrequencyValid( frequency );
 }
 /*!
 * Checks if the radio engine is on
 */
 * Returns the currently tuned frequency
 */
 uint RadioEngineWrapper::currentFrequency() const
 {
 Q_D( const RadioEngineWrapper );
-return d->mEngineHandler->TunedFrequency();
+return d->mEngineHandler->CurrentFrequency();
 }
 /*!
 * Returns the mute status
 */
 Q_D( const RadioEngineWrapper );
 return d->mUseLoudspeaker;
 }
 /*!
+* Sets or unsets the engine to manual seek mode
+*/
+void RadioEngineWrapper::setManualSeekMode( bool manualSeek )
+{
+Q_D( RadioEngineWrapper );
+d->mEngineHandler->SetManualSeekMode( manualSeek );
+}
+/*!
+* Checks if the engine is in manual seek mode
+*/
+bool RadioEngineWrapper::isInManualSeekMode() const
+{
+Q_D( const RadioEngineWrapper );
+return d->mEngineHandler->IsInManualSeekMode();
+}
+/*!
+*
+*/
+void RadioEngineWrapper::setRdsEnabled( bool rdsEnabled )
+{
+Q_D( RadioEngineWrapper );
+d->mEngineHandler->SetRdsEnabled( rdsEnabled );
+}
+/*!
 * Tunes to the given frequency
 */
-void RadioEngineWrapper::tuneFrequency( uint frequency, const int reason )
+void RadioEngineWrapper::setFrequency( uint frequency, const int reason )
 {
 Q_D( RadioEngineWrapper );
-d->tuneFrequency( frequency, reason );
+d->setFrequency( frequency, reason );
 }
 /*!
-* Tunes to the given frequency after a delay
+* volume increase command for the engine
 */
-void RadioEngineWrapper::tuneWithDelay( uint frequency, const int reason )
+void RadioEngineWrapper::increaseVolume()
 {
 Q_D( RadioEngineWrapper );
-d->tuneWithDelay( frequency, reason );
+d->mEngineHandler->IncreaseVolume();
+}
+/*!
+* volume decrease command for the engine
+*/
+void RadioEngineWrapper::decreaseVolume()
+{
+Q_D( RadioEngineWrapper );
+d->mEngineHandler->DecreaseVolume();
 }
 /*!
 * volume update command for the engine
 */
 }
 /*!
 *
 */
-void RadioEngineWrapper::setMute( bool muted )
+void RadioEngineWrapper::setMute( bool muted, bool updateSettings )
 {
 Q_D( RadioEngineWrapper );
-d->mEngineHandler->SetMuted( muted );
+d->mEngineHandler->SetMuted( muted, updateSettings );
 }
 /*!
 *
 */
 }
 /*!
 *
 */
-void RadioEngineWrapper::startSeeking( Seeking::Direction direction, const int reason )
+void RadioEngineWrapper::startSeeking( Seek::Direction direction, const int reason )
 {
 Q_D( RadioEngineWrapper );
 d->startSeeking( direction, reason );
 }

changeset 28	075425b8d9a4
parent 24	6df133bd92e1
child 32	189d20c34778
child 34	bc10a61bd7d3