Change to use new AppFW APi for TV profile

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

diff --git a/adaptors/common/application-impl.cpp b/adaptors/common/application-impl.cpp
old mode 100644 (file)
new mode 100755 (executable)
index a925de5..fa34d9c
--- a/adaptors/common/application-impl.cpp
+++ b/adaptors/common/application-impl.cpp
@@ -20,12 +20,13 @@
 
 // EXTERNAL INCLUDES
 #include <dali/integration-api/debug.h>
-#include <style-monitor.h>
 
 // INTERNAL INCLUDES
+#include <style-monitor.h>
 #include <command-line-options.h>
 #include <common/adaptor-impl.h>
 #include <singleton-service-impl.h>
+#include <lifecycle-controller-impl.h>
 
 namespace Dali
 {
@@ -67,13 +68,17 @@ ApplicationPtr Application::New(
 }
 
 Application::Application( int* argc, char** argv[], const std::string& name, const DeviceLayout& baseLayout, Dali::Application::WINDOW_MODE windowMode)
-: mInitSignalV2(),
-  mTerminateSignalV2(),
-  mPauseSignalV2(),
-  mResumeSignalV2(),
-  mResetSignalV2(),
-  mResizeSignalV2(),
-  mLanguageChangedSignalV2(),
+: mInitSignal(),
+  mTerminateSignal(),
+  mPauseSignal(),
+  mResumeSignal(),
+  mResetSignal(),
+  mResizeSignal(),
+  mAppControlSignal(),
+  mLanguageChangedSignal(),
+  mRegionChangedSignal(),
+  mBatteryLowSignal(),
+  mMemoryLowSignal(),
   mEventLoop( NULL ),
   mFramework( NULL ),
   mCommandLineOptions( NULL ),
@@ -93,6 +98,8 @@ Application::Application( int* argc, char** argv[], const std::string& name, con
 
 Application::~Application()
 {
+  mSingletonService.UnregisterAll();
+
   delete mFramework;
   delete mCommandLineOptions;
   delete mAdaptor;
@@ -152,7 +159,7 @@ void Application::Lower()
 void Application::Quit()
 {
   // Actually quit the application.
-  AddIdle(boost::bind(&Application::QuitFromMainLoop, this));
+  AddIdle( MakeCallback( this, &Application::QuitFromMainLoop ) );
 }
 
 void Application::QuitFromMainLoop()
@@ -160,7 +167,7 @@ void Application::QuitFromMainLoop()
   mAdaptor->Stop();
 
   Dali::Application application(this);
-  mTerminateSignalV2.Emit( application );
+  mTerminateSignal.Emit( application );
 
   mFramework->Quit();
   // This will trigger OnTerminate(), below, after the main loop has completed.
@@ -169,7 +176,7 @@ void Application::QuitFromMainLoop()
 
 void Application::OnInit()
 {
-  mFramework->AddAbortCallback(boost::bind(&Application::QuitFromMainLoop, this));
+  mFramework->AddAbortCallback( MakeCallback( this, &Application::QuitFromMainLoop ) );
 
   CreateWindow();
   CreateAdaptor();
@@ -196,11 +203,21 @@ void Application::OnInit()
 
   mInitialized = true;
 
-  // in default, auto hide indicator mode
-  mWindow.ShowIndicator(Dali::Window::AUTO);
+  // Wire up the LifecycleController
+  Dali::LifecycleController lifecycleController = Dali::LifecycleController::Get();
+
+  InitSignal().Connect( &GetImplementation( lifecycleController ), &LifecycleController::OnInit );
+  TerminateSignal().Connect( &GetImplementation( lifecycleController ), &LifecycleController::OnTerminate );
+  PauseSignal().Connect( &GetImplementation( lifecycleController ), &LifecycleController::OnPause );
+  ResumeSignal().Connect( &GetImplementation( lifecycleController ), &LifecycleController::OnResume );
+  ResetSignal().Connect( &GetImplementation( lifecycleController ), &LifecycleController::OnReset );
+  ResizeSignal().Connect( &GetImplementation( lifecycleController ), &LifecycleController::OnResize );
+  LanguageChangedSignal().Connect( &GetImplementation( lifecycleController ), &LifecycleController::OnLanguageChanged );
 
   Dali::Application application(this);
-  mInitSignalV2.Emit( application );
+  mInitSignal.Emit( application );
+
+  Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).GetCore().SceneCreated();
 }
 
 void Application::OnTerminate()
@@ -216,14 +233,14 @@ void Application::OnPause()
 {
   mAdaptor->Pause();
   Dali::Application application(this);
-  mPauseSignalV2.Emit( application );
+  mPauseSignal.Emit( application );
 }
 
 void Application::OnResume()
 {
   mAdaptor->Resume();
   Dali::Application application(this);
-  mResumeSignalV2.Emit( application );
+  mResumeSignal.Emit( application );
 }
 
 void Application::OnReset()
@@ -233,25 +250,49 @@ void Application::OnReset()
    * because Application class already handled initialization in OnInit(), OnReset do nothing.
    */
   Dali::Application application(this);
-  mResetSignalV2.Emit( application );
+  mResetSignal.Emit( application );
 
   mWindow.Raise();
 }
 
+void Application::OnAppControl(void *data)
+{
+  Dali::Application application(this);
+  mAppControlSignal.Emit( application , data );
+}
+
 void Application::OnLanguageChanged()
 {
   mAdaptor->NotifyLanguageChanged();
 }
 
+void Application::OnRegionChanged()
+{
+  Dali::Application application(this);
+  mRegionChangedSignal.Emit( application );
+}
+
+void Application::OnBatteryLow()
+{
+  Dali::Application application(this);
+  mBatteryLowSignal.Emit( application );
+}
+
+void Application::OnMemoryLow()
+{
+  Dali::Application application(this);
+  mMemoryLowSignal.Emit( application );
+}
+
 void Application::OnResize(Dali::Adaptor& adaptor)
 {
   Dali::Application application(this);
-  mResizeSignalV2.Emit( application );
+  mResizeSignal.Emit( application );
 }
 
-bool Application::AddIdle(boost::function<void(void)> callBack)
+bool Application::AddIdle( CallbackBase* callback )
 {
-  return mAdaptor->AddIdle(callBack);
+  return mAdaptor->AddIdle( callback );
 }
 
 Dali::Adaptor& Application::GetAdaptor()