From: Lukasz Bardeli <l.bardeli@samsung.com>
Date: Wed, 27 May 2015 11:01:39 +0000 (+0200)
Subject: [MediaKey] Fix setMediaKeyEventListener method
X-Git-Tag: submit/tizen_tv/20150603.064601^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=031cb4abcd1f0ee4842f7a3fe14d699b868f22af;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

[MediaKey] Fix setMediaKeyEventListener method

[Verification]
Below TCT should pass:
MediaKeyEventCallback_onpressed
MediaKeyEventCallback_onreleased

Change-Id: I2dddb90737550e4981fc343934d315dcce3820c6
Signed-off-by: Lukasz Bardeli <l.bardeli@samsung.com>
---

diff --git a/src/mediakey/mediakey_api.js b/src/mediakey/mediakey_api.js
index 3edb947c..d04e382b 100755
--- a/src/mediakey/mediakey_api.js
+++ b/src/mediakey/mediakey_api.js
@@ -45,10 +45,10 @@ MediaKeyManager.prototype.setMediaKeyEventListener = function(callback) {
     native.removeListener(ON_RELEASED_MEDIA_KEY_EVENT_CALLBACK);
 
     native.addListener(ON_PRESSED_MEDIA_KEY_EVENT_CALLBACK, function(msg) {
-        native.callIfPossible(args.callback.onpressed, native.getResultObject(msg.type));
+        native.callIfPossible(args.callback.onpressed, msg.type);
     });
     native.addListener(ON_RELEASED_MEDIA_KEY_EVENT_CALLBACK, function(msg) {
-        native.callIfPossible(args.callback.onpressed, native.getResultObject(msg.type));
+        native.callIfPossible(args.callback.onreleased, msg.type);
     });
 
 };
diff --git a/src/mediakey/mediakey_instance.cc b/src/mediakey/mediakey_instance.cc
index ef67f4cb..68bc0c0f 100755
--- a/src/mediakey/mediakey_instance.cc
+++ b/src/mediakey/mediakey_instance.cc
@@ -48,6 +48,7 @@ MediaKeyInstance::MediaKeyInstance() {
 
 MediaKeyInstance::~MediaKeyInstance() {
   LoggerD("Entered");
+  MediaKeyManager::GetInstance().UnregisterMediaKeyEventListener();
 }
 
 void MediaKeyInstance::SetMediaKeyEventListener(const picojson::value& args,
@@ -96,7 +97,7 @@ void MediaKeyInstance::PostEvent(const std::string& eventCallback,
     picojson::value event = picojson::value(picojson::object());
     picojson::object& obj = event.get<picojson::object>();
     obj["listenerId"] = picojson::value(eventCallback);
-    obj["type"] = picojson::value(k->second);
+    obj["type"] = picojson::value((k->second).c_str());
     PostMessage(event.serialize().c_str());
   }
   else {