projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "[3.0] Add SurfaceSizeChanged before ReplaceSurface" into tizen_3.0
[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
index
c0cd9f2
..
db48c41
100644
(file)
--- a/
adaptors/common/application-impl.cpp
+++ b/
adaptors/common/application-impl.cpp
@@
-28,6
+28,11
@@
#include <singleton-service-impl.h>
#include <lifecycle-controller-impl.h>
#include <singleton-service-impl.h>
#include <lifecycle-controller-impl.h>
+// CONDITIONAL INCLUDES
+#ifdef DALI_ELDBUS_AVAILABLE
+#include <Eldbus.h>
+#endif // DALI_ELDBUS_AVAILABLE
+
namespace Dali
{
namespace Dali
{
@@
-47,6
+52,13
@@
namespace Internal
namespace Adaptor
{
namespace Adaptor
{
+#if defined(DEBUG_ENABLED)
+namespace
+{
+Integration::Log::Filter* gDBusLogging = Integration::Log::Filter::New( Debug::NoLogging, false, "LOG_ADAPTOR_EVENTS_DBUS" );
+} // anonymous namespace
+#endif
+
ApplicationPtr Application::New(
int* argc,
char **argv[],
ApplicationPtr Application::New(
int* argc,
char **argv[],
@@
-94,6
+106,7
@@
Application::Application( int* argc, char** argv[], const std::string& styleshee
mCommandLineOptions = new CommandLineOptions(argc, argv);
mFramework = new Framework( *this, argc, argv, applicationType );
mCommandLineOptions = new CommandLineOptions(argc, argv);
mFramework = new Framework( *this, argc, argv, applicationType );
+ mUseRemoteSurface = (applicationType == Framework::WATCH);
}
Application::~Application()
}
Application::~Application()
@@
-103,6
+116,13
@@
Application::~Application()
delete mFramework;
delete mCommandLineOptions;
delete mAdaptor;
delete mFramework;
delete mCommandLineOptions;
delete mAdaptor;
+
+#ifdef DALI_ELDBUS_AVAILABLE
+ // Shutdown ELDBus.
+ DALI_LOG_INFO( gDBusLogging, Debug::General, "Shutting down DBus\n" );
+ eldbus_shutdown();
+#endif
+
mWindow.Reset();
}
mWindow.Reset();
}
@@
-135,6
+155,8
@@
void Application::CreateAdaptor()
mAdaptor = Dali::Internal::Adaptor::Adaptor::New( mWindow, mContextLossConfiguration, &mEnvironmentOptions );
mAdaptor->ResizedSignal().Connect( mSlotDelegate, &Application::OnResize );
mAdaptor = Dali::Internal::Adaptor::Adaptor::New( mWindow, mContextLossConfiguration, &mEnvironmentOptions );
mAdaptor->ResizedSignal().Connect( mSlotDelegate, &Application::OnResize );
+
+ Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).SetUseRemoteSurface( mUseRemoteSurface );
}
void Application::MainLoop(Dali::Configuration::ContextLoss configuration)
}
void Application::MainLoop(Dali::Configuration::ContextLoss configuration)
@@
-170,9
+192,15
@@
void Application::OnInit()
mFramework->AddAbortCallback( MakeCallback( this, &Application::QuitFromMainLoop ) );
CreateWindow();
mFramework->AddAbortCallback( MakeCallback( this, &Application::QuitFromMainLoop ) );
CreateWindow();
- CreateAdaptor();
- // Run the adaptor
+#ifdef DALI_ELDBUS_AVAILABLE
+ // Initialize ElDBus.
+ DALI_LOG_INFO( gDBusLogging, Debug::General, "Starting DBus Initialization\n" );
+ eldbus_init();
+#endif
+
+ // Start the adaptor
+ CreateAdaptor();
mAdaptor->Start();
// Check if user requires no vsyncing and set on X11 Adaptor
mAdaptor->Start();
// Check if user requires no vsyncing and set on X11 Adaptor