Removed redundant RunTest methods from all examples

[platform/core/uifw/dali-demo.git] / examples / video-view / video-view-example.cpp

diff --git a/examples/video-view/video-view-example.cpp b/examples/video-view/video-view-example.cpp
index c20b8f8..09f909d 100644 (file)
--- a/examples/video-view/video-view-example.cpp
+++ b/examples/video-view/video-view-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 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.
@@ -17,6 +17,7 @@
 
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -47,7 +48,8 @@ class VideoViewController: public ConnectionTracker
       mIsPlay( false ),
       mIsStop( false ),
       mIsFullScreen( false ),
-      mScale( 1.f )
+      mScale( 1.f ),
+      mPinchStartScale( 1.0f )
   {
     // Connect to the Application's Init signal
     mApplication.InitSignal().Connect( this, &VideoViewController::Create );
@@ -141,28 +143,28 @@ class VideoViewController: public ConnectionTracker
     mMenu.Add( mForwardButton );
 
     mPauseButton.SetVisible( false );
-    mPauseButton.SetDisabled( true );
+    mPauseButton.SetProperty( Button::Property::DISABLED, true );
     mPlayButton.SetVisible( true );
-    mPlayButton.SetDisabled( false );
+    mPlayButton.SetProperty( Button::Property::DISABLED, false );
     mStopButton.SetVisible( true );
-    mStopButton.SetDisabled( false );
+    mStopButton.SetProperty( Button::Property::DISABLED, false );
     mResetButton.SetVisible( false );
-    mResetButton.SetDisabled( true );
+    mResetButton.SetProperty( Button::Property::DISABLED, true );
 
-    mPlayButton.SetUnselectedImage( PLAY_IMAGE );
-    mPlayButton.SetSelectedImage( PLAY_IMAGE );
-    mPauseButton.SetUnselectedImage( PAUSE_IMAGE );
-    mPauseButton.SetSelectedImage( PAUSE_IMAGE );
+    mPlayButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, PLAY_IMAGE );
+    mPlayButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, PLAY_IMAGE );
+    mPauseButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, PAUSE_IMAGE );
+    mPauseButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, PAUSE_IMAGE );
 
-    mStopButton.SetUnselectedImage( STOP_IMAGE );
-    mStopButton.SetSelectedImage( STOP_IMAGE );
-    mResetButton.SetUnselectedImage( RESET_IMAGE );
-    mResetButton.SetSelectedImage( RESET_IMAGE );
+    mStopButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, STOP_IMAGE );
+    mStopButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, STOP_IMAGE );
+    mResetButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, RESET_IMAGE );
+    mResetButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, RESET_IMAGE );
 
-    mBackwardButton.SetUnselectedImage( BACKWARD_IMAGE );
-    mBackwardButton.SetSelectedImage( BACKWARD_IMAGE );
-    mForwardButton.SetUnselectedImage( FORWARD_IMAGE );
-    mForwardButton.SetSelectedImage( FORWARD_IMAGE );
+    mBackwardButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, BACKWARD_IMAGE );
+    mBackwardButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, BACKWARD_IMAGE );
+    mForwardButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, FORWARD_IMAGE );
+    mForwardButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, FORWARD_IMAGE );
 
     mPanGestureDetector = PanGestureDetector::New();
     mPanGestureDetector.Attach( mVideoView );
@@ -182,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 )
@@ -196,9 +197,9 @@ class VideoViewController: public ConnectionTracker
        if( mIsPlay )
       {
         mPauseButton.SetVisible( false );
-        mPauseButton.SetDisabled( true );
+        mPauseButton.SetProperty( Button::Property::DISABLED, true );
         mPlayButton.SetVisible( true );
-        mPlayButton.SetDisabled( false );
+        mPlayButton.SetProperty( Button::Property::DISABLED, false );
 
         mIsPlay = false;
         mVideoView.Pause();
@@ -212,9 +213,9 @@ class VideoViewController: public ConnectionTracker
       }
 
       mPauseButton.SetVisible( true );
-      mPauseButton.SetDisabled( false );
+      mPauseButton.SetProperty( Button::Property::DISABLED, false );
       mPlayButton.SetVisible( false );
-      mPlayButton.SetDisabled( true );
+      mPlayButton.SetProperty( Button::Property::DISABLED, true );
 
       mIsPlay = true;
       mVideoView.Play();
@@ -224,13 +225,13 @@ class VideoViewController: public ConnectionTracker
       if( mIsStop )
       {
         mPauseButton.SetVisible( true );
-        mPauseButton.SetDisabled( false );
+        mPauseButton.SetProperty( Button::Property::DISABLED, false );
         mPlayButton.SetVisible( false );
-        mPlayButton.SetDisabled( true );
+        mPlayButton.SetProperty( Button::Property::DISABLED, true );
         mResetButton.SetVisible( false );
-        mResetButton.SetDisabled( true );
+        mResetButton.SetProperty( Button::Property::DISABLED, true );
         mStopButton.SetVisible( true );
-        mStopButton.SetDisabled( false );
+        mStopButton.SetProperty( Button::Property::DISABLED, false );
 
         mIsStop = false;
         mIsPlay = true;
@@ -241,13 +242,13 @@ class VideoViewController: public ConnectionTracker
     else if( mStopButton.GetId() == button.GetId())
     {
       mPauseButton.SetVisible( false );
-      mPauseButton.SetDisabled( true );
+      mPauseButton.SetProperty( Button::Property::DISABLED, true );
       mPlayButton.SetVisible( true );
-      mPlayButton.SetDisabled( false );
+      mPlayButton.SetProperty( Button::Property::DISABLED, false );
       mResetButton.SetVisible( true );
-      mResetButton.SetDisabled( false );
+      mPlayButton.SetProperty( Button::Property::DISABLED, false );
       mStopButton.SetVisible( false );
-      mStopButton.SetDisabled( true );
+      mStopButton.SetProperty( Button::Property::DISABLED, true );
 
       mIsStop = true;
       mVideoView.Stop();
@@ -264,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 )
@@ -360,20 +352,10 @@ private:
   Property::Map mNativeImageTarget;
 };
 
-void RunTest( Application& application )
-{
-  VideoViewController test( application );
-
-  application.MainLoop();
-}
-
-// Entry point for Linux & Tizen applications
-//
 int DALI_EXPORT_API main( int argc, char **argv )
 {
   Application application = Application::New( &argc, &argv, DEMO_THEME_PATH );
-
-  RunTest( application );
-
+  VideoViewController test( application );
+  application.MainLoop();
   return 0;
 }