From 645ce278f098a1e2600a83588807955d16bef70e Mon Sep 17 00:00:00 2001 From: Szymon Jastrzebski Date: Tue, 19 Sep 2017 10:18:10 +0200 Subject: [PATCH] [MediaControler] Adding missing enum mapping Native API uses MC_SERVER_STATE_NONE, which must be mapped to 'INACTIVE' Web API enum. The 'NONE' state is the default state for native MC server. [Verification] Code compiles, MC TCT passed 100%. Change-Id: Ida2acbad265dfa7b9a91d79e64e90bccb6632e56 Signed-off-by: Szymon Jastrzebski --- src/mediacontroller/mediacontroller_api.js | 3 +++ src/mediacontroller/mediacontroller_types.cc | 1 + 2 files changed, 4 insertions(+) diff --git a/src/mediacontroller/mediacontroller_api.js b/src/mediacontroller/mediacontroller_api.js index 48524644..66312d01 100755 --- a/src/mediacontroller/mediacontroller_api.js +++ b/src/mediacontroller/mediacontroller_api.js @@ -577,6 +577,9 @@ MediaControllerClient.prototype.getLatestServerInfo = function() { var serverInfo = native_.getResultObject(result); if (serverInfo) { + if ('NONE' === serverInfo.state) { + serverInfo.state = 'ACTIVE'; + } serverInfo = new MediaControllerServerInfo(serverInfo); } return serverInfo; diff --git a/src/mediacontroller/mediacontroller_types.cc b/src/mediacontroller/mediacontroller_types.cc index 375689dc..f4269764 100644 --- a/src/mediacontroller/mediacontroller_types.cc +++ b/src/mediacontroller/mediacontroller_types.cc @@ -37,6 +37,7 @@ const std::string Types::kMediaControllerMetadataAttribute const PlatformEnumMap Types::platform_enum_map_ = { {kMediaControllerServerState, { + {"NONE", MC_SERVER_STATE_NONE}, {"ACTIVE", MC_SERVER_STATE_ACTIVATE}, {"INACTIVE", MC_SERVER_STATE_DEACTIVATE}}}, {kMediaControllerPlaybackState, { -- 2.34.1