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

Change-Id: I85c499d0fa41538257d76377c9e691cd506c586b

diff --git a/dali-csharp-binder/src/dali_wrap.cpp b/dali-csharp-binder/src/dali_wrap.cpp
index 2ffbb44..85a37e3 100755 (executable)
--- a/dali-csharp-binder/src/dali_wrap.cpp
+++ b/dali-csharp-binder/src/dali_wrap.cpp
@@ -478,6 +478,9 @@ void SWIG_CSharpException(int code, const char *msg) {
 
 #include <dali/integration-api/debug.h>
 
+#include <dali-toolkit/devel-api/controls/video-view/video-view-devel.h>
+
+
 // add here SWIG version check
 
 #if defined(_MSC_VER)         // Microsoft Visual C++ 6.0
@@ -86658,6 +86661,42 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VideoView_FinishedSignal(void * jarg1)
   return jresult;
 }
 
+SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_VideoView_GetNativePlayerHandle( void * jarg1 )
+{
+  Dali::Toolkit::VideoView *arg1 = (Dali::Toolkit::VideoView *)jarg1;
+  if( arg1 == nullptr )
+  {
+    DALI_LOG_ERROR("VideoView is nullptr!");
+    return nullptr;
+  }
+  void * ret = nullptr;
+  {
+    try{
+
+      Dali::Any result = Toolkit::DevelVideoView::GetMediaPlayer( *arg1 );
+      ret = Dali::AnyCast< void * >( result );
+
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return 0;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return 0;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return 0;
+      };
+    }
+  }
+  return ret;
+}
+
 
 SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Popup_Property_TITLE_get() {
   int jresult ;

diff --git a/dali-csharp-binder/src/window.cpp b/dali-csharp-binder/src/window.cpp
index 05929b1..fc66a31 100755 (executable)
--- a/dali-csharp-binder/src/window.cpp
+++ b/dali-csharp-binder/src/window.cpp
@@ -820,6 +820,47 @@ SWIGEXPORT int SWIGSTDCALL CSharp_Dali_Window_GetCurrentOrientation(void * jarg1
   return jresult;
 }
 
+SWIGEXPORT void SWIGSTDCALL CSharp_Dali_Window_SetAvailableOrientations(void * jarg1, int* jarg2, int jarg3) {
+  Dali::Window* window = (Dali::Window*)jarg1;
+  if (!window) {
+    SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Attempt to dereference null Dali::Window", 0);
+    return;
+  }
+  int *arg2 = (int *) 0 ;
+  int count = jarg3;
+
+  arg2 = jarg2;
+  Dali::Vector< Dali::Window::WindowOrientation> orientations;
+  orientations.Resize( count );
+  for( int i = 0; i<count; ++i)
+  {
+    orientations[i] = static_cast< Dali::Window::WindowOrientation >(arg2[i]);
+  }
+  {
+    try {
+      Dali::DevelWindow::SetAvailableOrientations(*window, orientations);
+    } catch (std::out_of_range& e) {
+      {
+        SWIG_CSharpException(SWIG_IndexError, const_cast<char*>(e.what())); return;
+      };
+    } catch (std::exception& e) {
+      {
+        SWIG_CSharpException(SWIG_RuntimeError, const_cast<char*>(e.what())); return;
+      };
+    } catch (Dali::DaliException e) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, e.condition); return;
+      };
+    } catch (...) {
+      {
+        SWIG_CSharpException(SWIG_UnknownError, "unknown error"); return;
+      };
+    }
+  }
+
+}
+
+
 SWIGEXPORT void * SWIGSTDCALL CSharp_Dali_Window_GetNativeHandle(void * jarg1) {
   void * jresult ;
   Dali::Window *arg1 = (Dali::Window *) 0 ;

diff --git a/packaging/dali-csharp-binder.spec b/packaging/dali-csharp-binder.spec
index 7dca5ff..d528791 100755 (executable)
--- a/packaging/dali-csharp-binder.spec
+++ b/packaging/dali-csharp-binder.spec
@@ -21,7 +21,7 @@
 
 Name: dali-csharp-binder
 Summary: The DALI Csharp Binder
-Version: 1.4.57
+Version: 1.5.0
 Release: 1
 Group: uifw/graphic
 License: Apache-2.0 and BSD-3-Clause and MIT