X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fvideo-view%2Fvideo-view.cpp;h=97e95873190123f4c4ebf93c709b32886ee9ad56;hb=8a647e87a01c5c78451653c1264a9eea81ac9b20;hp=7a0aa1dd7ce78b4b7d4187b21f8e7cd566af9df1;hpb=f4f74e774495b9c798c86e5697fe84db6decc327;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/public-api/controls/video-view/video-view.cpp b/dali-toolkit/public-api/controls/video-view/video-view.cpp
index 7a0aa1d..97e9587 100644
--- a/dali-toolkit/public-api/controls/video-view/video-view.cpp
+++ b/dali-toolkit/public-api/controls/video-view/video-view.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -19,6 +19,7 @@
 #include <dali-toolkit/public-api/controls/video-view/video-view.h>
 
 // EXTERNAL INCLUDES
+#include <dali/devel-api/adaptor-framework/video-sync-mode.h>
 #include <dali/public-api/object/property-map.h>
 
 // INTERNAL INCLUDES
@@ -26,89 +27,95 @@
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 VideoView::VideoView()
 {
 }
 
-VideoView::VideoView( const VideoView& videoView )
-: Control( videoView )
+VideoView::VideoView(const VideoView& videoView) = default;
+
+VideoView::VideoView(VideoView&& rhs) = default;
+
+VideoView& VideoView::operator=(const VideoView& videoView) = default;
+
+VideoView& VideoView::operator=(VideoView&& rhs) = default;
+
+VideoView::~VideoView()
 {
 }
 
-VideoView& VideoView::operator=( const VideoView& videoView )
+VideoView VideoView::New()
 {
-  if( &videoView != this )
-  {
-    Control::operator=( videoView );
-  }
-
-  return *this;
+  return Internal::VideoView::New(Dali::VideoSyncMode::DISABLED);
 }
 
-VideoView::~VideoView()
+VideoView VideoView::New(const std::string& url)
 {
+  VideoView videoView = Internal::VideoView::New(Dali::VideoSyncMode::DISABLED);
+  Dali::Toolkit::GetImpl(videoView).SetUrl(url);
+  return videoView;
 }
 
-VideoView VideoView::New()
+VideoView VideoView::New(bool swCodec)
 {
-  return Internal::VideoView::New();
+  VideoView videoView = Internal::VideoView::New(Dali::VideoSyncMode::DISABLED);
+  Dali::Toolkit::GetImpl(videoView).SetSWCodec(swCodec);
+  return videoView;
 }
 
-VideoView VideoView::New( const std::string& url )
+VideoView VideoView::New(const std::string& url, bool swCodec)
 {
-  VideoView videoView = Internal::VideoView::New();
-  Dali::Toolkit::GetImpl( videoView ).SetUrl( url );
+  VideoView videoView = Internal::VideoView::New(Dali::VideoSyncMode::DISABLED);
+  Dali::Toolkit::GetImpl(videoView).SetUrl(url);
+  Dali::Toolkit::GetImpl(videoView).SetSWCodec(swCodec);
   return videoView;
 }
 
-VideoView VideoView::DownCast( BaseHandle handle )
+VideoView VideoView::DownCast(BaseHandle handle)
 {
-  return Control::DownCast< VideoView, Internal::VideoView >( handle );
+  return Control::DownCast<VideoView, Internal::VideoView>(handle);
 }
 
 void VideoView::Play()
 {
-  Dali::Toolkit::GetImpl( *this ).Play();
+  Dali::Toolkit::GetImpl(*this).Play();
 }
 
 void VideoView::Pause()
 {
-  Dali::Toolkit::GetImpl( *this ).Pause();
+  Dali::Toolkit::GetImpl(*this).Pause();
 }
 
 void VideoView::Stop()
 {
-  Dali::Toolkit::GetImpl( *this ).Stop();
+  Dali::Toolkit::GetImpl(*this).Stop();
 }
 
-void VideoView::Forward( int millisecond )
+void VideoView::Forward(int millisecond)
 {
-  Dali::Toolkit::GetImpl( *this ).Forward( millisecond );
+  Dali::Toolkit::GetImpl(*this).Forward(millisecond);
 }
 
-void VideoView::Backward( int millisecond )
+void VideoView::Backward(int millisecond)
 {
-  Dali::Toolkit::GetImpl( *this ).Backward( millisecond );
+  Dali::Toolkit::GetImpl(*this).Backward(millisecond);
 }
 
 VideoView::VideoViewSignalType& VideoView::FinishedSignal()
 {
-  return Dali::Toolkit::GetImpl( *this ).FinishedSignal();
+  return Dali::Toolkit::GetImpl(*this).FinishedSignal();
 }
 
-VideoView::VideoView( Internal::VideoView& implementation )
-: Control( implementation )
+VideoView::VideoView(Internal::VideoView& implementation)
+: Control(implementation)
 {
 }
 
-VideoView::VideoView( Dali::Internal::CustomActor* internal )
-: Control( internal )
+VideoView::VideoView(Dali::Internal::CustomActor* internal)
+: Control(internal)
 {
-  VerifyCustomActorPointer< Internal::VideoView >( internal );
+  VerifyCustomActorPointer<Internal::VideoView>(internal);
 }
 
 } // namespace Toolkit