From: Lukasz Foniok Date: Wed, 13 May 2015 14:44:05 +0000 (+0200) Subject: [InputDevice] Adding synchronous call for registering and unregistering keys X-Git-Tag: submit/tizen/20150702.103311^2~1^2~51 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d686cf9d0b505edbaa05b1039f14f201d1fd4a9a;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git [InputDevice] Adding synchronous call for registering and unregistering keys [Verification] result = tizen.inputdevice.registerKey( "XF86AudioRaiseVolume" // if volume-up key is given, ); result = tizen.inputdevice.unregisterKey( "XF86AudioRaiseVolume" // if volume-up key is given, ); Change-Id: Ia11afc4b0b94e467d7e8bdc956b0df713ed67ae5 Signed-off-by: Lukasz Foniok --- diff --git a/src/inputdevice/inputdevice_api.js b/src/inputdevice/inputdevice_api.js index ba75bbdc..4e194571 100644 --- a/src/inputdevice/inputdevice_api.js +++ b/src/inputdevice/inputdevice_api.js @@ -96,9 +96,7 @@ InputDeviceManager.prototype.registerKey = function(keyName) { {name: 'keyName', type: types.STRING} ]); - var ret = native.callSync('InputDeviceManager_registerKey', { - keyName: args.keyName - }); + var ret = native.sendRuntimeSyncMessage('tizen://api/inputdevice/registerKey',args.keyName); if (native.isFailure(ret)) { throw native.getErrorObject(ret); @@ -114,10 +112,8 @@ InputDeviceManager.prototype.unregisterKey = function(keyName) { var args = validator.validateArgs(arguments, [ {name: 'keyName', type: types.STRING} ]); - - var ret = native.callSync('InputDeviceManager_unregisterKey', { - keyName: args.keyName - }); + + var ret = native.sendRuntimeSyncMessage('tizen://api/inputdevice/unregisterKey',args.keyName); if (native.isFailure(ret)) { throw native.getErrorObject(ret); diff --git a/src/inputdevice/inputdevice_instance.cc b/src/inputdevice/inputdevice_instance.cc index 1d14422f..5d48e2c5 100644 --- a/src/inputdevice/inputdevice_instance.cc +++ b/src/inputdevice/inputdevice_instance.cc @@ -34,8 +34,6 @@ InputDeviceInstance::InputDeviceInstance() { RegisterSyncHandler(c, std::bind(&InputDeviceInstance::x, this, _1, _2)); REGISTER_SYNC("TVInputDeviceManager_getSupportedKeys", getSupportedKeys); REGISTER_SYNC("TVInputDeviceManager_getKey", getKey); - REGISTER_SYNC("TVInputDeviceManager_registerKey", registerKey); - REGISTER_SYNC("TVInputDeviceManager_unregisterKey", unregisterKey); #undef REGISTER_SYNC } @@ -77,21 +75,5 @@ void InputDeviceInstance::getKey(const picojson::value& args, ReportSuccess(inputDeviceKeyToJson(keyPtr), out); } -void InputDeviceInstance::registerKey(const picojson::value& args, - picojson::object& out) { - LOGD("Enter"); - std::string keyName = args.get("keyName").get(); - InputDeviceManager::getInstance().registerKey(keyName); - ReportSuccess(out); -} - -void InputDeviceInstance::unregisterKey(const picojson::value& args, - picojson::object& out) { - LOGD("Enter"); - std::string keyName = args.get("keyName").get(); - InputDeviceManager::getInstance().unregisterKey(keyName); - ReportSuccess(out); -} - } // namespace inputdevice } // namespace extension diff --git a/src/inputdevice/inputdevice_instance.h b/src/inputdevice/inputdevice_instance.h index d8f12b43..7f976cdd 100644 --- a/src/inputdevice/inputdevice_instance.h +++ b/src/inputdevice/inputdevice_instance.h @@ -34,8 +34,6 @@ class InputDeviceInstance : public common::ParsedInstance { picojson::value inputDeviceKeyToJson(const InputDeviceKeyPtr keyPtr); void getSupportedKeys(const picojson::value& args, picojson::object& out); void getKey(const picojson::value& args, picojson::object& out); - void registerKey(const picojson::value& args, picojson::object& out); - void unregisterKey(const picojson::value& args, picojson::object& out); }; } // namespace inputdevice diff --git a/src/inputdevice/inputdevice_manager.cc b/src/inputdevice/inputdevice_manager.cc index 74b18a0d..82dc0a5f 100755 --- a/src/inputdevice/inputdevice_manager.cc +++ b/src/inputdevice/inputdevice_manager.cc @@ -75,12 +75,6 @@ InputDeviceKeyPtr InputDeviceManager::getKey( return NULL; } } -void InputDeviceManager::registerKey(std::string const& keyName) const { - LOGD("Enter"); -} -void InputDeviceManager::unregisterKey(std::string const& keyName) const { - LOGD("Enter"); -} std::vector InputDeviceManager::getSupportedKeys() const { LOGD("Enter"); diff --git a/src/inputdevice/inputdevice_manager.h b/src/inputdevice/inputdevice_manager.h index 05dd76a8..f089ed12 100755 --- a/src/inputdevice/inputdevice_manager.h +++ b/src/inputdevice/inputdevice_manager.h @@ -29,10 +29,6 @@ class InputDeviceManager { public: InputDeviceKeyPtr getKey(std::string const& keyName) const; - void registerKey(std::string const& keyName) const; - - void unregisterKey(std::string const& keyName) const; - std::vector getSupportedKeys() const; static InputDeviceManager& getInstance();