diff -r 6bcf277166c1 -r 451b2e1545b2 radioapp/radiouiengine/inc/radiouiengine_p.h --- a/radioapp/radiouiengine/inc/radiouiengine_p.h Fri Jun 11 16:24:13 2010 +0100 +++ b/radioapp/radiouiengine/inc/radiouiengine_p.h Thu Jul 22 16:33:45 2010 +0100 @@ -20,7 +20,7 @@ // System includes #include -#include +#include // User includes #include "radio_global.h" @@ -31,11 +31,11 @@ class RadioEngineWrapper; class RadioStationModel; class RadioHistoryModel; -class RadioCarouselModel; class RadioPresetStorage; class RadioControlService; class RadioMonitorService; class RadioScannerEngine; +class QTimer; class RadioUiEnginePrivate : public RadioEngineWrapperObserver { @@ -62,6 +62,8 @@ void tunedToFrequency( uint frequency, int reason ); void radioStatusChanged( bool radioIsOn ); void rdsAvailabilityChanged( bool available ); + void increaseVolume(); + void decreaseVolume(); void volumeChanged( int volume ); void muteChanged( bool muted ); void audioRouteChanged( bool loudspeaker ); @@ -74,7 +76,7 @@ /*! * Tunes to next or previous station */ - uint skip( StationSkip::Mode mode, uint startFrequency = 0 ); + uint skip( StationSkip::Mode mode, uint startFrequency = 0, const int reason = TuneReason::Skip ); private: // data @@ -92,15 +94,17 @@ QScopedPointer mHistoryModel; - QScopedPointer mCarouselModel; - -#ifndef BUILD_WIN32 QScopedPointer mControlService; -#endif QScopedPointer mMonitorService; - QPointer mScannerEngine; + QWeakPointer mScannerEngine; + + /** + * Power off timer + * Owned by public class by setting parent + */ + QTimer* mPowerOffTimer; };