Merge "Added APIs for codec in video-player" into devel/master

diff --git a/dali/devel-api/adaptor-framework/imf-manager.cpp b/dali/devel-api/adaptor-framework/imf-manager.cpp
index 58d0e44..acd9b9c 100644 (file)
--- a/dali/devel-api/adaptor-framework/imf-manager.cpp
+++ b/dali/devel-api/adaptor-framework/imf-manager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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.
@@ -33,6 +33,11 @@ ImfManager::~ImfManager()
 {
 }
 
+void ImfManager::Finalize()
+{
+  Internal::Adaptor::ImfManager::GetImplementation(*this).Finalize();
+}
+
 ImfManager ImfManager::Get()
 {
   return Internal::Adaptor::ImfManager::Get();

diff --git a/dali/devel-api/adaptor-framework/imf-manager.h b/dali/devel-api/adaptor-framework/imf-manager.h
index 93ece49..aa28da9 100644 (file)
--- a/dali/devel-api/adaptor-framework/imf-manager.h
+++ b/dali/devel-api/adaptor-framework/imf-manager.h
@@ -2,7 +2,7 @@
 #define __DALI_IMF_MANAGER_H__
 
 /*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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.
@@ -172,6 +172,13 @@ public:
 public:
 
   /**
+   * @brief Finalize the IMF.
+   *
+   * It means that the context will be deleted.
+   */
+  void Finalize();
+
+  /**
    * @brief Retrieve a handle to the instance of ImfManager.
    * @return A handle to the ImfManager.
    */

diff --git a/dali/internal/input/common/imf-manager-impl.cpp b/dali/internal/input/common/imf-manager-impl.cpp
index 58138ad..41cd44c 100644 (file)
--- a/dali/internal/input/common/imf-manager-impl.cpp
+++ b/dali/internal/input/common/imf-manager-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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.
@@ -50,6 +50,9 @@ Dali::ImfManager ImfManager::Get()
 ImfManager::~ImfManager()
 {}
 
+void ImfManager::Finalize()
+{}
+
 void ImfManager::NotifyCursorPosition()
 {}
 
@@ -166,4 +169,4 @@ std::string ImfManager::GetInputPanelLocale()
 
 }
 }
-}
\ No newline at end of file
+}

diff --git a/dali/internal/input/common/imf-manager-impl.h b/dali/internal/input/common/imf-manager-impl.h
old mode 100644 (file)
new mode 100755 (executable)
index fca45c8..1c73810
--- a/dali/internal/input/common/imf-manager-impl.h
+++ b/dali/internal/input/common/imf-manager-impl.h
@@ -55,7 +55,6 @@ public:
   using ImfKeyboardResizedSignalType = Dali::ImfManager::KeyboardResizedSignalType;
 
 public:
-
   /**
    * Check whether the ImfManager is available.
    * @return true if available, false otherwise
@@ -83,6 +82,11 @@ public:
   virtual void DisconnectCallbacks();
 
   /**
+   * @copydoc Dali::ImfManager::Finalize()
+   */
+  virtual void Finalize();
+
+  /**
    * @copydoc Dali::ImfManager::Activate()
    */
   virtual void Activate();
@@ -316,4 +320,4 @@ public:
 
 } // namespace Dali
 
-#endif // DALI_INTERNAL_INPUT_COMMON_IMF_MANAGER_IMPL_H
+#endif // __DALI_INTERNAL_IMF_MANAGER_H

diff --git a/dali/internal/input/tizen-wayland/imf-manager-impl-ecore-wl.cpp b/dali/internal/input/tizen-wayland/imf-manager-impl-ecore-wl.cpp
index f8a8d49..7ddd5ed 100644 (file)
--- a/dali/internal/input/tizen-wayland/imf-manager-impl-ecore-wl.cpp
+++ b/dali/internal/input/tizen-wayland/imf-manager-impl-ecore-wl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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.
@@ -290,7 +290,6 @@ Dali::ImfManager ImfManagerEcoreWl::Get()
     else if ( Adaptor::IsAvailable() )
     {
       // Create instance and register singleton only if the adaptor is available
-
       Adaptor& adaptorImpl( Adaptor::GetImplementation( Adaptor::Get() ) );
       Any nativeWindow = adaptorImpl.GetNativeWindowHandle();
 
@@ -331,10 +330,15 @@ ImfManagerEcoreWl::ImfManagerEcoreWl( Ecore_Wl_Window *ecoreWlwin )
 
 ImfManagerEcoreWl::~ImfManagerEcoreWl()
 {
-  DisconnectCallbacks();
+  Finalize();
+  ecore_imf_shutdown();
+}
 
+void ImfManagerEcoreWl::Finalize()
+{
+  DALI_LOG_INFO( gLogFilter, Debug::General, "ImfManager::Finalize\n" );
+  DisconnectCallbacks();
   DeleteContext();
-  ecore_imf_shutdown();
 }
 
 void ImfManagerEcoreWl::CreateContext( Ecore_Wl_Window *ecoreWlwin )
@@ -922,4 +926,4 @@ std::string ImfManagerEcoreWl::GetInputPanelLocale()
 
 } // Dali
 
-#pragma GCC diagnostic pop
\ No newline at end of file
+#pragma GCC diagnostic pop

diff --git a/dali/internal/input/tizen-wayland/imf-manager-impl-ecore-wl.h b/dali/internal/input/tizen-wayland/imf-manager-impl-ecore-wl.h
index 406fe97..2e5c516 100644 (file)
--- a/dali/internal/input/tizen-wayland/imf-manager-impl-ecore-wl.h
+++ b/dali/internal/input/tizen-wayland/imf-manager-impl-ecore-wl.h
@@ -72,6 +72,11 @@ public:
   void DisconnectCallbacks() override;
 
   /**
+   * @copydoc Dali::ImfManager::Finalize()
+   */
+  void Finalize() override;
+
+  /**
    * @copydoc Dali::ImfManager::Activate()
    */
   void Activate() override;

diff --git a/dali/internal/input/tizen-wayland/key-grab-ecore-wl.cpp b/dali/internal/input/tizen-wayland/key-grab-ecore-wl.cpp
index 520782d..842210e 100644 (file)
--- a/dali/internal/input/tizen-wayland/key-grab-ecore-wl.cpp
+++ b/dali/internal/input/tizen-wayland/key-grab-ecore-wl.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <dali/internal/input/tizen/key-grab.h>
+#include <dali/public-api/adaptor-framework/key-grab.h>
 
 // EXTERNAL INCLUDES
 #include <Ecore_Wayland.h>

diff --git a/dali/internal/input/ubuntu-x11/imf-manager-impl-x.cpp b/dali/internal/input/ubuntu-x11/imf-manager-impl-x.cpp
index 5f1338b..ee39014 100644 (file)
--- a/dali/internal/input/ubuntu-x11/imf-manager-impl-x.cpp
+++ b/dali/internal/input/ubuntu-x11/imf-manager-impl-x.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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.
@@ -195,12 +195,18 @@ ImfManagerX::ImfManagerX( Ecore_X_Window ecoreXwin )
 ImfManagerX::~ImfManagerX()
 {
   VirtualKeyboard::DisconnectCallbacks( mIMFContext );
-  DisconnectCallbacks();
+  Finalize();
+  ecore_imf_shutdown();
+}
 
+void ImfManagerX::Finalize()
+{
+  DALI_LOG_INFO( gLogFilter, Debug::General, "ImfManager::Finalize\n" );
+  DisconnectCallbacks();
   DeleteContext();
-  ecore_imf_shutdown();
 }
 
+
 void ImfManagerX::CreateContext( Ecore_X_Window ecoreXwin )
 {
   DALI_LOG_INFO( gLogFilter, Debug::General, "ImfManager::CreateContext\n" );

diff --git a/dali/internal/input/ubuntu-x11/imf-manager-impl-x.h b/dali/internal/input/ubuntu-x11/imf-manager-impl-x.h
index e8e9a22..c223e79 100644 (file)
--- a/dali/internal/input/ubuntu-x11/imf-manager-impl-x.h
+++ b/dali/internal/input/ubuntu-x11/imf-manager-impl-x.h
@@ -76,6 +76,11 @@ public:
   void DisconnectCallbacks() override;
 
   /**
+   * @copydoc Dali::ImfManager::Finalize()
+   */
+  void Finalize() override;
+
+  /**
    * @copydoc Dali::ImfManager::Activate()
    */
   void Activate() override;

diff --git a/dali/internal/system/common/widget-controller.h b/dali/internal/system/common/widget-controller.h
index dcde7cc..508463a 100644 (file)
--- a/dali/internal/system/common/widget-controller.h
+++ b/dali/internal/system/common/widget-controller.h
@@ -22,7 +22,7 @@
 #include <dali/public-api/signals/connection-tracker.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/system/common/widget-impl.h>
+#include <dali/public-api/adaptor-framework/widget-impl.h>
 
 namespace Dali
 {

diff --git a/dali/internal/system/file.list b/dali/internal/system/file.list
index 190512f..e83da20 100644 (file)
--- a/dali/internal/system/file.list
+++ b/dali/internal/system/file.list
@@ -26,7 +26,6 @@ adaptor_system_common_src_files=\
     ${adaptor_system_dir}/common/trigger-event.cpp \
     ${adaptor_system_dir}/common/trigger-event-factory.cpp \
     ${adaptor_system_dir}/common/update-status-logger.cpp \
-    ${adaptor_system_dir}/common/widget-impl.cpp \
     ${adaptor_system_dir}/common/widget-application-impl.cpp \
     ${adaptor_system_dir}/common/logging.cpp \
     ${adaptor_system_dir}/common/callback-manager-ecore.cpp \

diff --git a/dali/internal/system/tizen/widget-application-impl-tizen.cpp b/dali/internal/system/tizen/widget-application-impl-tizen.cpp
index 598083a..9464f42 100644 (file)
--- a/dali/internal/system/tizen/widget-application-impl-tizen.cpp
+++ b/dali/internal/system/tizen/widget-application-impl-tizen.cpp
@@ -20,7 +20,7 @@
 
 // INTERNAL INCLUDE
 #include <dali/public-api/adaptor-framework/widget.h>
-#include <dali/internal/system/common/widget-impl.h>
+#include <dali/public-api/adaptor-framework/widget-impl.h>
 #include <dali/internal/system/tizen/widget-controller-tizen.h>
 
 #ifdef WIDGET_SUPPOERTED

diff --git a/dali/internal/system/tizen/widget-controller-tizen.h b/dali/internal/system/tizen/widget-controller-tizen.h
index be60dc3..b692a9f 100644 (file)
--- a/dali/internal/system/tizen/widget-controller-tizen.h
+++ b/dali/internal/system/tizen/widget-controller-tizen.h
@@ -25,7 +25,7 @@
 #ifdef WIDGET_SUPPOERTED
 #include <widget_base.h>
 #endif
-#include <dali/internal/system/common/widget-impl.h>
+#include <dali/public-api/adaptor-framework/widget-impl.h>
 #include <dali/internal/system/common/widget-controller.h>
 
 namespace Dali

diff --git a/dali/internal/input/tizen/key-grab.h b/dali/public-api/adaptor-framework/key-grab.h
similarity index 100%
rename from dali/internal/input/tizen/key-grab.h
rename to dali/public-api/adaptor-framework/key-grab.h

diff --git a/dali/internal/system/common/widget-impl.cpp b/dali/public-api/adaptor-framework/widget-impl.cpp
similarity index 100%
rename from dali/internal/system/common/widget-impl.cpp
rename to dali/public-api/adaptor-framework/widget-impl.cpp

diff --git a/dali/internal/system/common/widget-impl.h b/dali/public-api/adaptor-framework/widget-impl.h
similarity index 100%
rename from dali/internal/system/common/widget-impl.h
rename to dali/public-api/adaptor-framework/widget-impl.h

diff --git a/dali/public-api/adaptor-framework/widget.cpp b/dali/public-api/adaptor-framework/widget.cpp
index d3c8426..bc8d070 100644 (file)
--- a/dali/public-api/adaptor-framework/widget.cpp
+++ b/dali/public-api/adaptor-framework/widget.cpp
@@ -19,7 +19,7 @@
 #include <dali/public-api/adaptor-framework/widget.h>
 
 // INTERNAL INCLUDES
-#include <dali/internal/system/common/widget-impl.h>
+#include <dali/public-api/adaptor-framework/widget-impl.h>
 
 namespace Dali
 {

diff --git a/dali/public-api/dali-adaptor-version.cpp b/dali/public-api/dali-adaptor-version.cpp
index a4946a4..d961b8b 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 = 3;
-const unsigned int ADAPTOR_MICRO_VERSION = 9;
+const unsigned int ADAPTOR_MICRO_VERSION = 10;
 const char * const ADAPTOR_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/dali/public-api/dali.h b/dali/public-api/dali.h
index 24d9a13..c7ba45e 100644 (file)
--- a/dali/public-api/dali.h
+++ b/dali/public-api/dali.h
@@ -25,10 +25,12 @@
 #include <dali/public-api/adaptor-framework/device-status.h>
 #include <dali/public-api/adaptor-framework/input-method.h>
 #include <dali/public-api/adaptor-framework/key.h>
+#include <dali/public-api/adaptor-framework/key-grab.h>
 #include <dali/public-api/adaptor-framework/timer.h>
 #include <dali/public-api/adaptor-framework/tts-player.h>
 #include <dali/public-api/adaptor-framework/native-image-source.h>
 #include <dali/public-api/adaptor-framework/widget-application.h>
+#include <dali/public-api/adaptor-framework/widget-impl.h>
 #include <dali/public-api/adaptor-framework/widget.h>
 #include <dali/public-api/dali-adaptor-version.h>
 

diff --git a/dali/public-api/file.list b/dali/public-api/file.list
index 2d69439..ae75497 100644 (file)
--- a/dali/public-api/file.list
+++ b/dali/public-api/file.list
@@ -7,6 +7,7 @@ adaptor_public_api_src_files = \
   $(adaptor_public_api_dir)/adaptor-framework/native-image-source.cpp \
   $(adaptor_public_api_dir)/adaptor-framework/widget.cpp \
   $(adaptor_public_api_dir)/adaptor-framework/widget-application.cpp \
+  $(adaptor_public_api_dir)/adaptor-framework/widget-impl.cpp \
   $(adaptor_public_api_dir)/dali-adaptor-version.cpp
 
 
@@ -20,17 +21,19 @@ public_api_adaptor_framework_header_files = \
   $(adaptor_public_api_dir)/adaptor-framework/device-status.h \
   $(adaptor_public_api_dir)/adaptor-framework/input-method.h \
   $(adaptor_public_api_dir)/adaptor-framework/key.h \
+  $(adaptor_public_api_dir)/adaptor-framework/key-grab.h \
   $(adaptor_public_api_dir)/adaptor-framework/style-change.h \
   $(adaptor_public_api_dir)/adaptor-framework/timer.h \
   $(adaptor_public_api_dir)/adaptor-framework/tts-player.h \
   $(adaptor_public_api_dir)/adaptor-framework/native-image-source.h \
   $(adaptor_public_api_dir)/adaptor-framework/window.h \
   $(adaptor_public_api_dir)/adaptor-framework/widget.h \
-  $(adaptor_public_api_dir)/adaptor-framework/widget-application.h
+  $(adaptor_public_api_dir)/adaptor-framework/widget-application.h \
+  $(adaptor_public_api_dir)/adaptor-framework/widget-impl.h
 
 adaptor_dali_header_file = \
   $(adaptor_public_api_dir)/dali.h
-  
+
 # wearable and watch extra public headers
 adaptor_dali_wearable_header_file = \
   $(adaptor_public_api_dir)/watch/dali-wearable.h
@@ -41,4 +44,4 @@ public_dali_watch_header_files = \
 
 public_dali_capture_header_files = \
   $(adaptor_public_api_dir)/capture/capture.h
-  
+

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index c94f3f9..a4ae273 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.3.9
+Version:    1.3.10
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT