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

equal deleted inserted replaced

-:04837bf3a628
+:21be958eb3ce
 this,           SLOT(notifyLocalCount()) );
 Radio::connect( stationModel,   SIGNAL(stationDataChanged(RadioStation)),
 this,           SLOT(notifyStationChange(RadioStation)) );
 Radio::connect( stationModel,   SIGNAL(radioTextReceived(RadioStation)),
 this,           SLOT(notifyStationChange(RadioStation)) );
+Radio::connect( stationModel,   SIGNAL(dynamicPsChanged(RadioStation)),
+this,           SLOT(notifyStationChange(RadioStation)) );
 RadioUiEngine* uiEngine = &mUiEngine.api();
 Radio::connect( uiEngine,       SIGNAL(seekingStarted(int)),
 this,           SLOT(notifyRadioStatus()) );
 Radio::connect( uiEngine,       SIGNAL(muteChanged(bool)),
 this,           SLOT(notifyRadioStatus()) );
 Radio::connect( uiEngine,       SIGNAL(antennaStatusChanged(bool)),
 this,           SLOT(notifyRadioStatus()) );
-Radio::connect( uiEngine,       SIGNAL(powerOffRequested()),
+//    Radio::connect( uiEngine,       SIGNAL(powerOffRequested()),
-this,           SLOT(notifyRadioStatus()) );
+//                    this,           SLOT(notifyRadioStatus()) );
 mUiEngine.wrapper().addObserver( this );
 notifyRadioStatus();
 }
 {
 RadioStatus::Status radioStatus = determineRadioStatus();
 if ( radioStatus != mRadioStatus ) {
 if ( radioStatus == RadioStatus::Seeking ) {
-if ( RadioScannerEngine* scannerEngine = mUiEngine.api().scannerEngine() ) {
+RadioScannerEngine* scannerEngine = mUiEngine.api().scannerEngine();
+if ( scannerEngine ) {
 Radio::connect( scannerEngine,  SIGNAL(destroyed()),
 this,           SLOT(notifyRadioStatus()) );
 }
 }
 */
 void RadioMonitorService::notifyFavoriteCount()
 {
 const int favoriteCount = mUiEngine.api().stationModel().favoriteCount();
 RUN_NOTIFY( FavoriteCount, favoriteCount );
+checkIfCurrentStationIsFavorite();
-if ( favoriteCount == 1 ) {
-checkIfCurrentStationIsFavorite();
-}
 }
 /*!
 * Private slot
 *
 const QString trimmedRadioText = trimHtmlTags( station.radioText() );
 notification.setValue( RadioNotificationData( RadioServiceNotification::RadioText, trimmedRadioText ) );
 list.append( notification );
 }
-notifyList( list );
+notify( list );
 }
 /*!
 * Private slot
 *
 */
 void RadioMonitorService::sendNotifications()
 {
-notifyList( mNotificationList );
-mNotificationList.clear();
+if ( !mNotificationQueue.isEmpty() )
+{
+notifyList( mNotificationQueue.dequeue() );
+}
+if ( !mNotificationQueue.isEmpty() )
+{
+mNotificationTimer->start();
+}
 }
 /*!
 * \reimp
 */
 void RadioMonitorService::tunedToFrequency( uint frequency, int reason )
 {
 Q_UNUSED( reason );
 if ( !mUiEngine.api().isScanning() ) {
+// frequency changed, cancel any pending notification as it has become invalid
+mNotificationTimer->stop();
+mNotificationQueue.clear();
 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();
-checkIfCurrentStationIsFavorite();
-}
 }
 }
 /*!
 *
 /*!
 *
 */
 void RadioMonitorService::notify( const QVariant& notification )
 {
-mNotificationTimer->stop();
+QVariantList list;
-mNotificationList.append( notification );
+list.append( notification );
-mNotificationTimer->start();
+notify( list );
+}
+/*!
+*
+*/
+void RadioMonitorService::notify( const QVariantList& list )
+{
+mNotificationQueue.enqueue( list );
+if ( !mNotificationTimer->isActive() )
+{
+mNotificationTimer->start();
+}
 }
 /*!
 *
 */

changeset 57	21be958eb3ce
parent 51	bbebb0235466