From: Michal Michalski <m.michalski2@partner.samsung.com>
Date: Wed, 30 Oct 2019 16:56:00 +0000 (+0100)
Subject: [mediacontroller] Register Custom Events methods.
X-Git-Tag: submit/tizen_5.5/20191105.125113~6^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8aebbed0ff33e9fda69959078974609ad662cabe;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

[mediacontroller] Register Custom Events methods.

Due to the conflict with recent refactoring efforts,
all MediaControllerInstance methods related to the
custom server events feature have not been registered
and thus inaccessible from JS API.

Recently TCT tests for this feature have been added,
uncovering this issue. This commit fixes the problem.

http://suprem.sec.samsung.net/jira/browse/TWDAPI-209

[Verification]

tct-mediacontroller-tizen-tests 100% pass rate
including custom events test cases.

Change-Id: I0a15848e1299ad8a07f6ff4e96d4062a69351026
Signed-off-by: Michal Michalski <m.michalski2@partner.samsung.com>
---

diff --git a/src/mediacontroller/mediacontroller_api.js b/src/mediacontroller/mediacontroller_api.js
index 426f2f52..2f53dd21 100755
--- a/src/mediacontroller/mediacontroller_api.js
+++ b/src/mediacontroller/mediacontroller_api.js
@@ -2834,7 +2834,7 @@ var setDisplayRotationAbility = function(displayRotationAbility, support) {
 };
 
 MediaControllerServer.prototype.getAllClientsInfo = function() {
-    var nativeResult = native_.callSync('MediaControllerServer_getAllClientsInfo');
+    var nativeResult = native_.callSync('MediaControllerServerGetAllClientsInfo');
     if (native_.isFailure(nativeResult)) {
         throw native_.getErrorObject(nativeResult);
     }
@@ -2886,7 +2886,7 @@ MediaControllerClientInfo.prototype.sendEvent = function(event, data, callback)
         replyListener: EventReplyListenerManager.name
     };
 
-    var result = native_.callSync('MediaControllerClientInfo_sendEvent', nativeData);
+    var result = native_.callSync('MediaControllerClientInfoSendEvent', nativeData);
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
     }
@@ -2914,7 +2914,7 @@ var EventReceivedCallback = function(msg, listener) {
     };
 
     var nativeResult = native_.callSync(
-        'MediaControllerClient_sendEventReply',
+        'MediaControllerClientSendEventReply',
         nativeData
     );
     if (native_.isFailure(nativeResult)) {
@@ -2927,7 +2927,7 @@ MediaControllerClient.prototype.setCustomEventListener = function(listener) {
         { name: 'listener', type: types_.FUNCTION }
     ]);
 
-    var result = native_.callSync('MediaControllerClient_setCustomEventListener', {
+    var result = native_.callSync('MediaControllerClientSetCustomEventListener', {
         listenerId: '_MediaControllerClientEventsListener'
     });
 
@@ -2941,7 +2941,7 @@ MediaControllerClient.prototype.setCustomEventListener = function(listener) {
 };
 
 MediaControllerClient.prototype.unsetCustomEventListener = function() {
-    var result = native_.callSync('MediaControllerClient_unsetCustomEventListener', {
+    var result = native_.callSync('MediaControllerClientUnsetCustomEventListener', {
         listenerId: '_MediaControllerClientEventsListener'
     });
     if (native_.isFailure(result)) {
diff --git a/src/mediacontroller/mediacontroller_instance.cc b/src/mediacontroller/mediacontroller_instance.cc
index b3d2e429..3aed68c1 100644
--- a/src/mediacontroller/mediacontroller_instance.cc
+++ b/src/mediacontroller/mediacontroller_instance.cc
@@ -76,6 +76,10 @@ MediaControllerInstance::MediaControllerInstance() {
   REGISTER_METHOD(MediaControllerServerSetDisplayModeAbility);
   REGISTER_METHOD(MediaControllerServerSetDisplayRotationAbility);
   REGISTER_METHOD(MediaControllerServerSetSimpleAbility);
+  REGISTER_METHOD(MediaControllerServerGetAllClientsInfo);
+
+  // client info
+  REGISTER_METHOD(MediaControllerClientInfoSendEvent);
 
   // client
   REGISTER_METHOD(MediaControllerManagerGetClient);
@@ -87,6 +91,9 @@ MediaControllerInstance::MediaControllerInstance() {
   REGISTER_METHOD(MediaControllerClientGetDisplayRotationAbility);
   REGISTER_METHOD(MediaControllerClientGetSimpleAbility);
   REGISTER_METHOD(MediaControllerClientFindSubscribedServers);
+  REGISTER_METHOD(MediaControllerClientSendEventReply);
+  REGISTER_METHOD(MediaControllerClientSetCustomEventListener);
+  REGISTER_METHOD(MediaControllerClientUnsetCustomEventListener);
 
   // server_info
   REGISTER_METHOD(MediaControllerServerInfoSendPlaybackState);