Fix an issue the Adaptor is not resumed

[platform/core/uifw/dali-adaptor.git] / dali / internal / adaptor / common / adaptor-impl.cpp

diff --git a/dali/internal/adaptor/common/adaptor-impl.cpp b/dali/internal/adaptor/common/adaptor-impl.cpp
index b43c376..b598079 100644 (file)
--- a/dali/internal/adaptor/common/adaptor-impl.cpp
+++ b/dali/internal/adaptor/common/adaptor-impl.cpp
@@ -17,6 +17,8 @@
 
 // CLASS HEADER
 #include <dali/internal/adaptor/common/adaptor-impl.h>
+#include <dali/internal/addons/common/addon-manager-impl.h>
+#include <dali/internal/addons/common/addon-manager-factory.h>
 #include <dali/internal/adaptor/common/adaptor-builder-impl.h>
 
 // EXTERNAL INCLUDES
@@ -35,6 +37,7 @@
 #include <dali/integration-api/events/touch-event-integ.h>
 #include <dali/integration-api/events/wheel-event-integ.h>
 #include <dali/integration-api/processor-interface.h>
+#include <dali/integration-api/addon-manager.h>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/dali-adaptor-common.h>
@@ -174,6 +177,9 @@ void Adaptor::Initialize( GraphicsFactory& graphicsFactory, Dali::Configuration:
   EglSyncImplementation& eglSyncImpl = eglGraphics->GetSyncImplementation();
   EglContextHelperImplementation& eglContextHelperImpl = eglGraphics->GetContextHelperImplementation();
 
+  // Create the AddOnManager
+  mAddOnManager.reset( Dali::Internal::AddOnManagerFactory::CreateAddOnManager() );
+
   mCore = Integration::Core::New( *this,
                                   *mPlatformAbstraction,
                                   mGLES,
@@ -184,6 +190,7 @@ void Adaptor::Initialize( GraphicsFactory& graphicsFactory, Dali::Configuration:
                                   mGraphics->GetStencilBufferRequired(),
                                   mGraphics->GetPartialUpdateRequired() );
 
+
   defaultWindow->SetAdaptor( Get() );
 
   Dali::Integration::SceneHolder defaultSceneHolder( defaultWindow );
@@ -401,6 +408,11 @@ void Adaptor::Start()
   {
     (*iter)->OnStart();
   }
+
+  if (mAddOnManager)
+  {
+    mAddOnManager->Start();
+  }
 }
 
 // Dali::Internal::Adaptor::Adaptor::Pause
@@ -415,6 +427,12 @@ void Adaptor::Pause()
       (*iter)->OnPause();
     }
 
+    // Extensions
+    if (mAddOnManager)
+    {
+      mAddOnManager->Pause();
+    }
+
     // Pause all windows event handlers when adaptor paused
     for( auto window : mWindows )
     {
@@ -449,6 +467,12 @@ void Adaptor::Resume()
       window->Resume();
     }
 
+    // Resume AddOnManager
+    if (mAddOnManager)
+    {
+      mAddOnManager->Resume();
+    }
+
     // Inform observers that we have resumed.
     for( ObserverContainer::iterator iter = mObservers.begin(), endIter = mObservers.end(); iter != endIter; ++iter )
     {
@@ -480,6 +504,11 @@ void Adaptor::Stop()
       (*iter)->OnStop();
     }
 
+    if (mAddOnManager)
+    {
+      mAddOnManager->Stop();
+    }
+
     mThreadController->Stop();
 
     // Delete the TTS player
@@ -921,6 +950,11 @@ void Adaptor::OnWindowShown()
 
     DALI_LOG_RELEASE_INFO( "Adaptor::OnWindowShown: Update requested.\n" );
   }
+  else if( PAUSED_WHILE_INITIALIZING == mState )
+  {
+    // Change the state to READY again. It will be changed to RUNNING after the adaptor is started.
+    mState = READY;
+  }
   else
   {
     DALI_LOG_RELEASE_INFO( "Adaptor::OnWindowShown: Adaptor is not paused state.[%d]\n", mState );
@@ -1195,6 +1229,12 @@ bool Adaptor::AddIdleEnterer( CallbackBase* callback, bool forceAdd )
     idleAdded = mCallbackManager->AddIdleEntererCallback( callback );
   }
 
+  if( !idleAdded )
+  {
+    // Delete callback
+    delete callback;
+  }
+
   return idleAdded;
 }