diff -r 075425b8d9a4 -r bc10a61bd7d3 radioapp/radiouiengine/inc/radiouiengine.h --- a/radioapp/radiouiengine/inc/radiouiengine.h Fri Jun 11 13:38:32 2010 +0300 +++ b/radioapp/radiouiengine/inc/radiouiengine.h Fri Jun 25 19:09:05 2010 +0300 @@ -22,6 +22,8 @@ // System includes #include #include +#include +#include // User includes #include "radiouiengineexport.h" @@ -37,20 +39,37 @@ class RadioScannerEngine; class RadioMonitorService; +typedef QSharedPointer RadioScannerEnginePtr; + +// Constants +const uint DEFAULT_MIN_FREQUENCY = 87500000; + class UI_ENGINE_DLL_EXPORT RadioUiEngine : public QObject { Q_OBJECT - Q_DECLARE_PRIVATE_D( d_ptr, RadioUiEngine ) + Q_DECLARE_PRIVATE_D( d_ptr.data(), RadioUiEngine ) Q_DISABLE_COPY( RadioUiEngine ) friend class RadioScannerEngine; -public: +public: // Static functions that are used before the ui engine is created + + /*! + * Gets the last tuned frequency from central repository + */ + static uint lastTunedFrequency( uint defaultFrequency = DEFAULT_MIN_FREQUENCY ); - /** - * Static functions that are used before the ui engine is created + /*! + * Gets the last used volume level */ - static uint lastTunedFrequency(); + static int lastVolume(); + + /*! + * Launches the radio server process + */ + static void launchRadioServer(); + +public: RadioUiEngine( QObject* parent = 0 ); ~RadioUiEngine(); @@ -72,7 +91,7 @@ RadioSettingsIf& settings(); RadioStationModel& stationModel(); RadioHistoryModel& historyModel(); - RadioScannerEngine* createScannerEngine(); + RadioScannerEnginePtr createScannerEngine(); RadioScannerEngine* scannerEngine(); bool isRadioOn() const; @@ -102,6 +121,8 @@ enum MusicStore{ OviStore, OtherStore }; void openMusicStore( const RadioHistoryItem& item, MusicStore store = OviStore ); + void launchBrowser( const QString& url ); + void setManualSeekMode( bool manualSeek ); bool isInManualSeekMode() const; @@ -158,7 +179,7 @@ /** * Unmodifiable pointer to the private implementation */ - RadioUiEnginePrivate* const d_ptr; + const QScopedPointer d_ptr; };