[dali_1.4.6] Merge branch 'devel/master'

Change-Id: Icea78cdcff0a4ec751ef5d7b3c5a00328494050e

diff --git a/dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.cpp b/dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.cpp
index 0ed2068..3ffd722 100644 (file)
--- a/dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.cpp
+++ b/dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.cpp
@@ -17,6 +17,7 @@
 
 // CLASS HEADER
 #include <dali/internal/adaptor/tizen-wayland/tizen-wearable/watch-application-impl.h>
+#include <dali/internal/system/common/environment-variables.h>
 
 namespace Dali
 {
@@ -27,6 +28,18 @@ namespace Internal
 namespace Adaptor
 {
 
+namespace
+{
+
+unsigned int GetEnvWatchRenderRefreshRate()
+{
+  const char* envVariable = std::getenv( DALI_WATCH_REFRESH_RATE );
+
+  return envVariable ? std::atoi( envVariable ) : 2u; // Default 30 fps
+}
+
+} // unnamed namespace
+
 WatchApplicationPtr WatchApplication::New(
   int* argc,
   char **argv[],
@@ -51,7 +64,7 @@ void WatchApplication::OnInit()
 {
   Application::OnInit();
 
-  Dali::Adaptor::Get().SetRenderRefreshRate( 2 ); // make 30 fps for watch applications
+  Dali::Adaptor::Get().SetRenderRefreshRate( GetEnvWatchRenderRefreshRate() );
 
   mState = INITIALIZED;
 }

diff --git a/dali/internal/system/common/environment-variables.h b/dali/internal/system/common/environment-variables.h
index cddaaa3..029b984 100644 (file)
--- a/dali/internal/system/common/environment-variables.h
+++ b/dali/internal/system/common/environment-variables.h
@@ -100,6 +100,8 @@ namespace Adaptor
 
 #define DALI_REFRESH_RATE "DALI_REFRESH_RATE"
 
+#define DALI_WATCH_REFRESH_RATE "DALI_WATCH_REFRESH_RATE"
+
 #define DALI_ENV_MULTI_SAMPLING_LEVEL "DALI_MULTI_SAMPLING_LEVEL"
 
 #define DALI_ENV_MAX_TEXTURE_SIZE "DALI_MAX_TEXTURE_SIZE"

diff --git a/dali/public-api/dali-adaptor-version.cpp b/dali/public-api/dali-adaptor-version.cpp
index 2edc4a0..addaf93 100644 (file)
--- a/dali/public-api/dali-adaptor-version.cpp
+++ b/dali/public-api/dali-adaptor-version.cpp
@@ -28,7 +28,7 @@ namespace Dali
 
 const unsigned int ADAPTOR_MAJOR_VERSION = 1;
 const unsigned int ADAPTOR_MINOR_VERSION = 4;
-const unsigned int ADAPTOR_MICRO_VERSION = 5;
+const unsigned int ADAPTOR_MICRO_VERSION = 6;
 const char * const ADAPTOR_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index 3d29c45..95b8bb6 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -19,7 +19,7 @@
 
 Name:       dali-adaptor
 Summary:    The DALi Tizen Adaptor
-Version:    1.4.5
+Version:    1.4.6
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT