From 1865e04474d3a0a8988442efb8edfef9541dfd0b Mon Sep 17 00:00:00 2001 From: Joogab Yun Date: Fri, 27 Dec 2019 18:54:53 +0900 Subject: [PATCH] Revert "(ATSPI) Add ATSPI for Say(), Pause(), Resume(), SetForcefully(), GetStatus()" This reverts commit a11aeccc61fb39ce24b3dae7cc09f9bf8f1ae5c7. --- dali-csharp-binder/file.list | 3 +- dali-csharp-binder/src/atspi.cpp | 125 --------------------------------------- 2 files changed, 1 insertion(+), 127 deletions(-) delete mode 100755 dali-csharp-binder/src/atspi.cpp diff --git a/dali-csharp-binder/file.list b/dali-csharp-binder/file.list index 87995ed..1068aaf 100755 --- a/dali-csharp-binder/file.list +++ b/dali-csharp-binder/file.list @@ -38,8 +38,7 @@ dali_csharp_binder_tizen_src_files = \ ${dali_csharp_binder_dir}/src/widget_view_manager.cpp \ ${dali_csharp_binder_dir}/src/font-client.cpp \ ${dali_csharp_binder_dir}/src/transition-effects.cpp \ - ${dali_csharp_binder_dir}/src/actor-devel.cpp \ - ${dali_csharp_binder_dir}/src/atspi.cpp + ${dali_csharp_binder_dir}/src/actor-devel.cpp # module: csharp-binder, backend: tizen-wearable dali_csharp_binder_tizen_wearable_src_files = \ diff --git a/dali-csharp-binder/src/atspi.cpp b/dali-csharp-binder/src/atspi.cpp deleted file mode 100755 index a30b47e..0000000 --- a/dali-csharp-binder/src/atspi.cpp +++ /dev/null @@ -1,125 +0,0 @@ -/** Copyright (c) 2019 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. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -*/ - -#ifndef CSHARP_ATSPI -#define CSHARP_ATSPI -#endif - -#include "common.h" -#include -#include - -#ifdef __cplusplus -extern "C" { -#endif - -SWIGEXPORT int SWIGSTDCALL csharp_dali_accessibility_GetStatus(void *jarg1) -{ - Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *)jarg1; - if (!arg1) - { - SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::Control is null", 0); - return -1; - } - return Dali::AtspiAccessibility::GetStatus(); -} - -using callbackFuncType = void(*)(int); -callbackFuncType callBack; -void sayTestCallback(std::string result) -{ - DALI_LOG_ERROR("sayTestCallback() result=%s ", result.c_str()); - - if(callBack) - { - if(result == "ReadingCancelled") - { - callBack(1); - } - else if(result == "ReadingStopped") - { - callBack(2); - } - else if(result == "ReadingSkipped") - { - callBack(3); - } - else - { - callBack(-1); - } - } -} - -SWIGEXPORT void SWIGSTDCALL csharp_dali_accessibility_say(void *jarg1, char* jarg2, bool jarg3, void *jarg4) -{ - Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *)jarg1; - std::string arg2(jarg2); - bool arg3 = jarg3; - callBack = (callbackFuncType)jarg4; - - if (!arg1) - { - SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::Control is null", 0); - return; - } - - Dali::AtspiAccessibility::Say(arg2, jarg3, sayTestCallback); - - DALI_LOG_ERROR("csharp_dali_accessibility_say() arg3=%d", arg3); -} - -SWIGEXPORT void SWIGSTDCALL csharp_dali_accessibility_pause_resume(void *jarg1, bool jarg2) -{ - Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *)jarg1; - bool arg2 = jarg2; - - if (!arg1) - { - SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::Control is null", 0); - return; - } - - if(arg2 == true) - { - Dali::AtspiAccessibility::Pause(); - } - else - { - Dali::AtspiAccessibility::Resume(); - } - - DALI_LOG_ERROR("csharp_dali_accessibility_pause_resume() arg2=%d", arg2); -} - -SWIGEXPORT void SWIGSTDCALL csharp_dali_accessibility_Enable(void *jarg1, bool jarg2) -{ - Dali::Toolkit::Control *arg1 = (Dali::Toolkit::Control *)jarg1; - - if (!arg1) - { - SWIG_CSharpSetPendingExceptionArgument(SWIG_CSharpArgumentNullException, "Dali::Toolkit::Control is null", 0); - return; - } - - Dali::AtspiAccessibility::SetForcefully(jarg2); - - DALI_LOG_ERROR("csharp_dali_accessibility_Enable() jarg2=%d \n", jarg2); -} - -#ifdef __cplusplus -} -#endif \ No newline at end of file -- 2.7.4