diff -r 6bcf277166c1 -r 451b2e1545b2 radioapp/radiouiengine/inc/radiomonitorservice.h --- a/radioapp/radiouiengine/inc/radiomonitorservice.h Fri Jun 11 16:24:13 2010 +0100 +++ b/radioapp/radiouiengine/inc/radiomonitorservice.h Thu Jul 22 16:33:45 2010 +0100 @@ -28,6 +28,7 @@ // Forward declarations class RadioUiEnginePrivate; class RadioStation; +class QTimer; class RadioMonitorService : public XQServiceProvider , public RadioEngineWrapperObserver @@ -41,8 +42,6 @@ void init(); - void notifySong( const QString& song ); - public slots: void requestNotifications(); // Slot called by Qt Highway @@ -53,9 +52,10 @@ void notifyRadioStatus(); void notifyFavoriteCount(); void notifyStationChange( const RadioStation& station ); + void sendNotifications(); private: - + // from base class RadioEngineWrapperObserver void tunedToFrequency( uint frequency, int reason ); @@ -63,17 +63,26 @@ // New functions RadioStatus::Status determineRadioStatus() const; + + void checkIfCurrentStationIsFavorite(); + + QString trimHtmlTags( const QString& html ); + void notify( const QVariant& notification ); void notifyList( const QVariantList& list ); - + private: // data RadioUiEnginePrivate& mUiEngine; QList mRequestIndexes; - + RadioStatus::Status mRadioStatus; + QVariantList mNotificationList; + + QTimer* mNotificationTimer; + }; #endif // RADIOMONITORSERVICE_H