FCL/sf/app/radio: comparison radioapp/radiouiengine/src/radiomonitorservice.cpp

equal deleted inserted replaced

-:6bcf277166c1
+:451b2e1545b2
 *
 * Description:
 *
 */
+// System includes
+#include <QTimer>
+#include <QRegExp>
 // User includes
 #include "radiomonitorservice.h"
 #include "radiouiengine.h"
 #include "radiouiengine_p.h"
 #include "radiostationmodel.h"
 #include "radiostation.h"
 #include "radioservicedef.h"
 #include "radionotificationdata.h"
 #include "radiologger.h"
+// Constants
+const int NOTIFICATION_DELAY = 200;
 #define RUN_NOTIFY( type, data ) \
 do { \
 QVariant variant; \
 variant.setValue( RadioNotificationData( RadioServiceNotification::type, data ) ); \
 notify( variant ); \
 /*!
 *
 */
 RadioMonitorService::RadioMonitorService( RadioUiEnginePrivate& engine ) :
-XQServiceProvider( RADIO_MONITOR_SERVICE, &engine.api() ),
+XQServiceProvider( RADIO_SERVICE +"."+ RADIO_MONITOR_SERVICE, &engine.api() ),
 mUiEngine( engine ),
-mRadioStatus( RadioStatus::UnSpecified )
+mRadioStatus( RadioStatus::UnSpecified ),
-{
+mNotificationTimer( new QTimer( this ) )
+{
+mNotificationTimer->setSingleShot( true );
+mNotificationTimer->setInterval( NOTIFICATION_DELAY );
+Radio::connect( mNotificationTimer, SIGNAL(timeout()),
+this,               SLOT(sendNotifications()) );
 publishAll();
 }
 /*!
 *
 *
 */
 void RadioMonitorService::init()
 {
 RadioStationModel* stationModel = &mUiEngine.api().stationModel();
-connectAndTest( stationModel,   SIGNAL(rowsRemoved(QModelIndex,int,int)),
+Radio::connect( stationModel,   SIGNAL(rowsRemoved(QModelIndex,int,int)),
 this,           SLOT(notifyFavoriteCount()) );
-connectAndTest( stationModel,   SIGNAL(favoriteChanged(RadioStation)),
+Radio::connect( stationModel,   SIGNAL(favoriteChanged(RadioStation)),
 this,           SLOT(notifyFavoriteCount()) );
-connectAndTest( stationModel,   SIGNAL(stationDataChanged(RadioStation)),
+Radio::connect( stationModel,   SIGNAL(stationDataChanged(RadioStation)),
 this,           SLOT(notifyStationChange(RadioStation)) );
-connectAndTest( stationModel,   SIGNAL(radioTextReceived(RadioStation)),
+Radio::connect( stationModel,   SIGNAL(radioTextReceived(RadioStation)),
 this,           SLOT(notifyStationChange(RadioStation)) );
 RadioUiEngine* uiEngine = &mUiEngine.api();
-connectAndTest( uiEngine,       SIGNAL(seekingStarted(int)),
+Radio::connect( uiEngine,       SIGNAL(seekingStarted(int)),
 this,           SLOT(notifyRadioStatus()) );
-connectAndTest( uiEngine,       SIGNAL(muteChanged(bool)),
+Radio::connect( uiEngine,       SIGNAL(muteChanged(bool)),
 this,           SLOT(notifyRadioStatus()) );
-connectAndTest( uiEngine,       SIGNAL(antennaStatusChanged(bool)),
+Radio::connect( uiEngine,       SIGNAL(antennaStatusChanged(bool)),
 this,           SLOT(notifyRadioStatus()) );
+Radio::connect( uiEngine,       SIGNAL(powerOffRequested()),
+this,           SLOT(notifyRadioStatus()) );
 mUiEngine.wrapper().addObserver( this );
 notifyRadioStatus();
 }
 /*!
-*
-*/
-void RadioMonitorService::notifySong( const QString& song )
-{
-RUN_NOTIFY( Song, song );
-}
-/*!
 * Public slot
 *
 */
 void RadioMonitorService::requestNotifications()
 {
-mRequestIndexes.append( setCurrentRequestAsync() );
+//TODO: Uncomment when vendor id can be read from the client
+//    if ( requestInfo().clientVendorId() == NOKIA_VENDORID ) {
+mRequestIndexes.append( setCurrentRequestAsync() );
+//    }
 }
 /*!
 * Public slot
 *
 notificationList.append( notification );
 notification.setValue( RadioNotificationData( RadioServiceNotification::FavoriteCount, stationModel.favoriteCount() ) );
 notificationList.append( notification );
-notification.setValue( RadioNotificationData( RadioServiceNotification::Frequency, station.frequency() ) );
+notification.setValue( RadioNotificationData( RadioServiceNotification::Frequency, RadioStation::parseFrequency( station.frequency() ) ) );
 notificationList.append( notification );
 if ( !station.name().isEmpty() ) {
 notification.setValue( RadioNotificationData( RadioServiceNotification::Name, station.name() ) );
 notificationList.append( notification );
 mUiEngine.api().genreToString( station.genre(), GenreTarget::HomeScreen ) ) );
 notificationList.append( notification );
 }
 if ( !station.radioText().isEmpty() ) {
-notification.setValue( RadioNotificationData( RadioServiceNotification::RadioText, station.radioText() ) );
+const QString trimmedRadioText = trimHtmlTags( station.radioText() );
+notification.setValue( RadioNotificationData( RadioServiceNotification::RadioText, trimmedRadioText ) );
 notificationList.append( notification );
 }
-if ( !station.url().isEmpty() ) {
+if ( !station.dynamicPsText().isEmpty() ) {
-notification.setValue( RadioNotificationData( RadioServiceNotification::HomePage, station.url() ) );
+notification.setValue( RadioNotificationData( RadioServiceNotification::DynamicPS, station.dynamicPsText() ) );
 notificationList.append( notification );
 }
-//TODO: To be implemented
+checkIfCurrentStationIsFavorite();
-//    notification.setValue( RadioNotificationData( RadioServiceNotification::Song,  ) );
-//    notificationList.append( notification );
 completeRequest( setCurrentRequestAsync(), notificationList );
 }
 /*!
 {
 RadioStatus::Status radioStatus = determineRadioStatus();
 if ( radioStatus != mRadioStatus ) {
 if ( radioStatus == RadioStatus::Seeking ) {
-connectAndTest( mUiEngine.api().scannerEngine(),    SIGNAL(destroyed()),
+if ( RadioScannerEngine* scannerEngine = mUiEngine.api().scannerEngine() ) {
-this,                               SLOT(notifyRadioStatus()) );
+Radio::connect( scannerEngine,  SIGNAL(destroyed()),
+this,           SLOT(notifyRadioStatus()) );
+}
 }
 mRadioStatus = radioStatus;
 RUN_NOTIFY( RadioStatus, radioStatus );
 }
 */
 void RadioMonitorService::notifyFavoriteCount()
 {
 const int favoriteCount = mUiEngine.api().stationModel().favoriteCount();
 RUN_NOTIFY( FavoriteCount, favoriteCount );
+if ( favoriteCount == 1 ) {
+checkIfCurrentStationIsFavorite();
+}
 }
 /*!
 * Private slot
 *
 const QString genre = uiEngine.genreToString( station.genre(), GenreTarget::HomeScreen );
 notification.setValue( RadioNotificationData( RadioServiceNotification::Genre, genre ) );
 list.append( notification );
 }
+if ( station.hasDataChanged( RadioStation::DynamicPsChanged ) ) {
+notification.setValue( RadioNotificationData( RadioServiceNotification::DynamicPS, station.dynamicPsText() ) );
+list.append( notification );
+}
 if ( station.hasDataChanged( RadioStation::NameChanged ) ) {
 notification.setValue( RadioNotificationData( RadioServiceNotification::Name, station.name() ) );
 list.append( notification );
 }
-if ( station.hasDataChanged( RadioStation::UrlChanged ) ) {
+if ( station.hasDataChanged( RadioStation::RadioTextChanged ) ) {
-notification.setValue( RadioNotificationData( RadioServiceNotification::HomePage, station.url() ) );
+const QString trimmedRadioText = trimHtmlTags( station.radioText() );
+notification.setValue( RadioNotificationData( RadioServiceNotification::RadioText, trimmedRadioText ) );
 list.append( notification );
 }
-if ( station.hasDataChanged( RadioStation::RadioTextChanged ) ) {
-notification.setValue( RadioNotificationData( RadioServiceNotification::RadioText, station.radioText() ) );
-list.append( notification );
-}
 notifyList( list );
+}
+/*!
+* Private slot
+*
+*/
+void RadioMonitorService::sendNotifications()
+{
+notifyList( mNotificationList );
+mNotificationList.clear();
 }
 /*!
 * \reimp
 */
 void RadioMonitorService::tunedToFrequency( uint frequency, int reason )
 {
 Q_UNUSED( reason );
 if ( !mUiEngine.api().isScanning() ) {
-RUN_NOTIFY( Frequency, frequency );
+RUN_NOTIFY( Frequency, RadioStation::parseFrequency( frequency ) );
 RadioStation station;
 if ( mUiEngine.api().stationModel().findFrequency( frequency, station ) && !station.name().isEmpty() ) {
 RUN_NOTIFY( Name, station.name() );
 }
+const int favoriteCount = mUiEngine.api().stationModel().favoriteCount();
+if ( favoriteCount == 1 ) {
+checkIfCurrentStationIsFavorite();
+}
 }
 }
 /*!
 *
 */
 RadioStatus::Status RadioMonitorService::determineRadioStatus() const
 {
 RadioUiEngine& uiEngine = mUiEngine.api();
-if ( uiEngine.isScanning() ) {
+if ( uiEngine.isPoweringOff() ) {
+return RadioStatus::PoweringOff;
+} else if ( uiEngine.isScanning() ) {
 return RadioStatus::Seeking;
 } else if ( !uiEngine.isAntennaAttached() ) {
 return RadioStatus::NoAntenna;
 } else if ( uiEngine.isMuted() ) {
 return RadioStatus::Muted;
 }
 /*!
 *
 */
+void RadioMonitorService::checkIfCurrentStationIsFavorite()
+{
+const bool currentIsFavorite = mUiEngine.api().stationModel().currentStation().isFavorite();
+RUN_NOTIFY( CurrentIsFavorite, currentIsFavorite );
+}
+/*!
+*
+*/
+QString RadioMonitorService::trimHtmlTags( const QString& html )
+{
+QString trimmed = html;
+QRegExp rex( "<.+>" );
+rex.setMinimal( true );
+trimmed.remove( rex );
+return trimmed;
+}
+/*!
+*
+*/
 void RadioMonitorService::notify( const QVariant& notification )
 {
-QVariantList list;
+mNotificationTimer->stop();
-list.append( notification );
+mNotificationList.append( notification );
-notifyList( list );
+mNotificationTimer->start();
 }
 /*!
 *
 */

branch	GCC_SURGE
changeset 37	451b2e1545b2
parent 19	afea38384506
parent 32	189d20c34778