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

Change-Id: Id8e40438fc8525e74243c31b9467bf52886cdf0d

[dali_1.2.37] Merge branch 'devel/master'
Change-Id: Id8e40438fc8525e74243c31b9467bf52886cdf0d
Adeel Kazmi
2 parents a7a16401 c0e4586a
Showing 3 changed files with 8 additions and 16 deletions
examples/blocks/blocks-example.cpp
examples/video-view/video-view-example.cpp
packaging/com.samsung.dali-demo.spec
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,8 @@
 #include <dali-toolkit/dali-toolkit.h>
 #include "shared/view.h"
+#include <dali/devel-api/object/handle-devel.h>
+
 using namespace Dali;
 using namespace Dali::Toolkit;
 using namespace DemoHelper;
@@ -742,7 +744,7 @@ private:
   void OnHitPaddle(PropertyNotification& source)
   {
     Actor delegate = Actor::DownCast(source.GetTarget());
-    Vector3 collisionVector = delegate.GetProperty<Vector3>(source.GetTargetProperty());
+    Vector3 collisionVector = DevelHandle::GetCurrentProperty< Vector3 >( delegate, source.GetTargetProperty() );
     Vector3 ballRelativePosition(mBall.GetCurrentPosition() - mPaddle.GetCurrentPosition());
     ballRelativePosition.Normalize();
@@ -777,7 +779,7 @@ private:
   void OnHitBrick(PropertyNotification& source)
   {
     Actor brick = Actor::DownCast(source.GetTarget());
-    Vector3 collisionVector = brick.GetProperty<Vector3>(source.GetTargetProperty());
+    Vector3 collisionVector = DevelHandle::GetCurrentProperty< Vector3 >( brick, source.GetTargetProperty() );
     const float normalVelocity = fabsf(mBallVelocity.Dot(collisionVector));
     mBallVelocity += collisionVector * normalVelocity * 2.0f;
@@ -184,10 +184,9 @@ class VideoViewController: public ConnectionTracker
     Stage::GetCurrent().KeyEventSignal().Connect( this, &VideoViewController::OnKeyEvent );
-    mWindowSurfaceTarget.Insert( "RENDERING_TARGET", "windowSurfaceTarget" );
-    mNativeImageTarget.Insert( "RENDERING_TARGET", "nativeImageTarget" );
+    mWindowSurfaceTarget.Insert( "renderingTarget", "windowSurfaceTarget" );
+    mNativeImageTarget.Insert( "renderingTarget", "nativeImageTarget" );
-    mVideoView.FinishedSignal().Connect( this, &VideoViewController::OnFinished );
   }
   bool OnButtonClicked( Button button )
@@ -266,15 +265,6 @@ class VideoViewController: public ConnectionTracker
     return true;
   }
-  void OnFinished( VideoView& view )
-  {
-    if( !mIsFullScreen )
-    {
-      mRotationAnimation.Play();
-      mIsStop = true;
-    }
-  }
-
   void OnPan( Actor actor, const PanGesture& gesture )
   {
     if( !mIsFullScreen && gesture.state == Gesture::Continuing )
@@ -2,7 +2,7 @@
 Name:       com.samsung.dali-demo
 Summary:    The OpenGLES Canvas Core Demo
-Version:    1.2.36
+Version:    1.2.37
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0