FCL/sf/app/internetradio: comparison qtinternetradio/ui/src/irapplication.cpp

equal deleted inserted replaced

-:896e9dbc5f19
+:065198191975
 createComponents();
 // get advertisement setting
 iSettings->getGlobalAdvFlag(iEnableGlobalAdv);
 setupConnection();
-if ( !iIsEmbedded )
+if ( !XQServiceUtil::isService() )
 {
 setLaunchView();
 }
 QString name = XQServiceUtil::interfaceName();
 * Parameters  : None
 * Return      : None
 */
 void IRApplication::setLaunchView()
 {
+LOG_METHOD;
 //get starting view id according to activate reason
 TIRViewId viewId = EIRView_CategoryView;
 HbApplication *hbApp = qobject_cast<HbApplication*>(qApp);
 if (hbApp->activateReason() == Hb::ActivationReasonActivity)
 * Return      : true : network connection has been established
 *               false : network connection has not been established
 */
 bool IRApplication::verifyNetworkConnectivity(const QString &aConnectingText)
 {
+LOG_METHOD;
 Q_ASSERT(iNetworkController);
 bool ret = true;
 if (!iNetworkController->getNetworkStatus())
 return ret;
 }
 void IRApplication::startLoadingAnimation(const QObject *aReceiver, const char *aFunc)
 {
-LOG_METHOD_ENTER;
+LOG_METHOD;;
 //for downloading logos in stations view, favorites view and history view, network connection
 //is initiated by low layer, we don't show any dialog
 if (!iNetworkController->getNetworkStatus())
 {
 iLoadingNote->show();
 }
 void IRApplication::stopLoadingAnimation()
 {
-LOG_METHOD_ENTER;
+LOG_METHOD;;
 // this function is the endpoint of cancel loading actions for all views
 	// so we can do cleanup action here, including player stop action.
 	// No need to stop the player in each views in the slot connected to the cancel signal of the loading note
 if (!getPlayController()->isPlaying())
 * Parameters  : None
 * Return      : the pointer to the network controller object
 */
 IRQNetworkController* IRApplication::getNetworkController()
 {
+LOG_METHOD;
 if(NULL == iNetworkController)
 {
 iNetworkController = IRQNetworkController::openInstance();
 connect(iNetworkController, SIGNAL(networkEventNotified(IRQNetworkEvent)),
 this, SLOT(networkEventNotified(IRQNetworkEvent)));
 * Parameters  : None
 * Return      : the pointer to the isds client object
 */
 IRQIsdsClient* IRApplication::getIsdsClient()
 {
+LOG_METHOD;
 if(NULL == iIsdsClient)
 {
 iIsdsClient = IRQIsdsClient::openInstance();
 }
 return iIsdsClient;
 * Parameters  : None
 * Return      : the pointer to the play controller object
 */
 IRPlayController* IRApplication::getPlayController()
 {
+LOG_METHOD;
 if(NULL == iPlayController)
 {
 iPlayController = new IRPlayController(this);
 }
 return iPlayController;
 }
 IRLastPlayedStationInfo* IRApplication::getLastPlayedStationInfo()
 {
+LOG_METHOD;
 if( iIsEmbedded )
 {
 return NULL;
 }
 return iLastPlayedStationInfo;
 }
 IRQFavoritesDB* IRApplication::getFavoritesDB()
 {
+LOG_METHOD;
 if(NULL == iFavPresets)
 {
 iFavPresets = new IRQFavoritesDB();
 }
 return iFavPresets;
 }
 IRQSettings * IRApplication::getSettings()
 {
+LOG_METHOD;
 if(NULL == iSettings)
 {
 iSettings = IRQSettings::openInstance();
 }
 return iSettings;
 }
 IRMediaKeyObserver* IRApplication::getMediaKeyObserver()
 {
+LOG_METHOD;
 if(NULL == iMediaKeyObserver)
 {
 iMediaKeyObserver = new IRMediaKeyObserver(this);
 }
 return iMediaKeyObserver;
 }
 IRQAdvClient* IRApplication::getAdvClient()
 {
+LOG_METHOD;
 if(iEnableGlobalAdv && (NULL == iAdvertisementClient))
 {
 //iAdvertisementClient = IRQAdvClient::openInstance();
 }
 return iAdvertisementClient;
 }
 IRPlayList* IRApplication::getPlayList() const
 {
+LOG_METHOD;
 if (NULL == iFileViewService)
 {
 return NULL;
 }
 * Parameters  : None
 * Return      : None
 */
 void IRApplication::createComponents()
 {
+LOG_METHOD;
 getSettings();
 #ifdef HS_WIDGET_ENABLED
 if( !iIsEmbedded )
 {
 iControlService = new IrControlService(this);
 * Parameters   : None
 * Return       : None
 */
 void IRApplication::destroyComponents()
 {
+LOG_METHOD;
 delete iPlayController;
 iPlayController = NULL;
 delete iSystemEventHandler;
 iSystemEventHandler = NULL;
 #endif
 }
 void IRApplication::setupConnection()
 {
+LOG_METHOD;
 connect(this, SIGNAL(quit()), qApp, SLOT(quit()));
 }
 void IRApplication::cancelConnect()
 {
+LOG_METHOD;
 if (iConnectingCanceled)
 {
 return;
 }
 //connect to signal 'networkEventNotified' from IRQNetworkController
 void IRApplication::networkEventNotified(IRQNetworkEvent aEvent)
 {
+LOG_METHOD;
 LOG_SLOT_CALLER;
+LOG_FORMAT("IRQNetworkEvent = %d", aEvent);
 switch (aEvent)
 {
 case EIRQNetworkConnectionConnecting :
 startLoadingAnimation(this, SLOT(cancelConnect()));
 iConnectingCanceled = false;
 }
 void IRApplication::loadGenre()
 {
+LOG_METHOD;
 LOG_SLOT_CALLER;
 bool hasCache = iIsdsClient->isdsIsCategoryCached(IRQIsdsClient::EGenre);
 if (!hasCache)
 {
 categoryView->loadCategory(IRQIsdsClient::EGenre);
 }
 void IRApplication::initApp()
 {
+LOG_METHOD;
 getNetworkController();
 IRBaseView *view = static_cast<IRBaseView*> (iViewManager->currentView());
 if (view)
 {
-view->lazyInit();
 view->launchAction();
 }
 getMediaKeyObserver();
 startSystemEventMonitor();
 if (psUtils.defineProperty(irStartupKey, XQSettingsManager::TypeInt))
 {
 settingsManager.writeItemValue(irStartupKey, (int)QDateTime::currentDateTime().toTime_t());
 }
 }
 #endif
+emit applicationReady();
 }
 bool IRApplication::event(QEvent* e)
 {
 if(e->type() == iInitEvent)
 {
+LOG_METHOD;
 initApp();
 return true;
 }
 return QObject::event(e);
 }
 TIRHandleResult IRApplication::handleConnectionEstablished()
 {
+LOG_METHOD;
 TIRHandleResult retVal = EIR_DoDefault;
 switch (iUseNetworkReason)
 {
 case EIR_UseNetwork_LoadCategory:
 {
 iUseNetworkReason = EIR_UseNetwork_NoReason;
 return retVal;
 }
+#ifdef TERMS_CONDITIONS_VIEW_ENABLED
 void IRApplication::handleTermsConsAccepted()
 {
+LOG_METHOD;
 iSettings->reSetFlagTermsAndConditions();
 IRBaseView * termsConsView = iViewManager->getView(EIRView_TermsConsView);
 iViewManager->removeView(termsConsView);
 termsConsView->deleteLater();
 iViewManager->activateView(iStartingViewId);
-QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
 QEvent* initEvent = new QEvent(iInitEvent);
 QCoreApplication::postEvent(this, initEvent, Qt::HighEventPriority);
 }
+#endif
 void IRApplication::launchStartingView(TIRViewId aViewId)
 {
+LOG_METHOD;
 iStartingViewId = aViewId;
-/* bool isFirstTimeUsage = false;
+#ifdef TERMS_CONDITIONS_VIEW_ENABLED
+bool isFirstTimeUsage = false;
 iSettings->isFlagTermsAndConditions(isFirstTimeUsage);
 if(isFirstTimeUsage)
 {
 iViewManager->activateView(EIRView_TermsConsView);
-		QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+}
-}
+else
-else*/
+#endif
 {
 iViewManager->activateView(iStartingViewId);
-QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
 QEvent* initEvent = new QEvent(iInitEvent);
 QCoreApplication::postEvent(this, initEvent, Qt::HighEventPriority);
 }
 iAppFullyStarted = true;
 {
 return iIsEmbedded;
 }
 void IRApplication::setExitingView()
 {
+LOG_METHOD;
 TIRViewId viewId = iViewManager->getExitingView();
 if(EIRView_InvalidId != viewId)
 {
 getSettings()->setStartingViewId(viewId);
 }
 #ifdef HS_WIDGET_ENABLED
 bool IRApplication::startPlaying()
 {
+LOG_METHOD;
 // if any loading is in progress, disallow to play
 if (iLoadingNote && iLoadingNote->isVisible())
 {
 LOG( "IRApplication::startPlaying() in the return false1");
 return false;
 }
 }
 void IRApplication::cancelPlayerLoading()
 {
+LOG_METHOD;
 if (IRPlayController::EConnecting == getPlayController()->state()
 || IRPlayController::EBuffering == getPlayController()->state())
 {
 if (iLoadingNote && iLoadingNote->isVisible())
 {

changeset 15	065198191975
parent 14	896e9dbc5f19
child 16	5723da102db1