[common] Simplify instance methods registration. 95/214995/16
authorMichal Michalski <m.michalski2@partner.samsung.com>
Mon, 30 Sep 2019 15:48:27 +0000 (17:48 +0200)
committerMichal Michalski <m.michalski2@partner.samsung.com>
Mon, 28 Oct 2019 09:26:04 +0000 (10:26 +0100)
Macros REGISTER_(A)SYNC have been replaced with new macro
REGISTER_METHOD, which takes only the method name.
The string parameter is now created from the method name.

[Verification] + tct-mediacontroller-tizen-tests 100% pass rate.
+ tct-account-tizen-tests 100% pass rate.
+ tct-alarm-tizen-tests 100% pass rate.
+ tct-application-tizen-tests 100% pass rate (requires screen always on).
+ tct-archive-tizen-tests 100% pass rate.
+ tct-badge-tizen-tests 100% pass rate.
+ tct-bluetooth-tizen-tests 100% pass rate.
+ tct-bookmark-tizen-tests 100% pass rate.
+ tct-calendar-tizen-tests 100% pass rate.
+ tct-callhistory-tizen-tests 100% pass rate.
+ tct-contact-tizen-tests 100% pass rate.
+ tct-content-tizen-tests 100% pass rate.

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

35 files changed:
src/account/account_api.js
src/account/account_instance.cc
src/alarm/alarm_api.js
src/alarm/alarm_instance.cc
src/alarm/alarm_instance.h
src/application/application_api.js
src/application/application_instance.cc
src/application/application_instance.h
src/archive/archive_api.js
src/archive/archive_instance.cc
src/archive/archive_instance.h
src/badge/badge_api.js
src/badge/badge_instance.cc
src/bluetooth/bluetooth_api.js
src/bluetooth/bluetooth_instance.cc
src/bluetooth/bluetooth_instance.h
src/bookmark/bookmark_api.js
src/bookmark/bookmark_instance.cc
src/calendar/calendar_instance.cc
src/calendar/js/calendar.js
src/calendar/js/calendar_manager.js
src/callhistory/callhistory_api.js
src/callhistory/callhistory_instance.cc
src/callhistory/callhistory_instance.h
src/contact/contact_instance.cc
src/contact/js/address_book.js
src/contact/js/contact.js
src/contact/js/contact_manager.js
src/contact/js/person.js
src/content/content_instance.cc
src/content/js/datatypes.js
src/content/js/manager.js
src/content/js/playlist.js
src/mediacontroller/mediacontroller_api.js
src/mediacontroller/mediacontroller_instance.cc

index db4eb6f..4001460 100755 (executable)
@@ -109,7 +109,7 @@ Account.prototype.setExtendedData = function() {
         );
     }
 
-    var result = native_.callSync('Account_setExtendedData', {
+    var result = native_.callSync('AccountSetExtendedData', {
         accountId: this.id,
         key: args.key,
         value: args.value
@@ -143,7 +143,7 @@ Account.prototype.getExtendedData = function() {
         }
 
         var result = native_.call(
-            'Account_getExtendedData',
+            'AccountGetExtendedData',
             { accountId: this.id },
             function(result) {
                 if (native_.isFailure(result)) {
@@ -175,7 +175,7 @@ Account.prototype.getExtendedData = function() {
             );
         }
 
-        var result = native_.callSync('Account_getExtendedDataSync', {
+        var result = native_.callSync('AccountGetExtendedDataSync', {
             accountId: this.id,
             key: args.key
         });
@@ -200,7 +200,7 @@ AccountManager.prototype.add = function() {
         { name: 'account', type: types_.PLATFORM_OBJECT, values: Account }
     ]);
 
-    var result = native_.callSync('AccountManager_add', {
+    var result = native_.callSync('AccountManagerAdd', {
         userName: args.account.userName,
         iconUri: args.account.iconUri,
         applicationId: args.account.provider.applicationId
@@ -218,7 +218,7 @@ AccountManager.prototype.remove = function() {
         { name: 'accountId', type: types_.UNSIGNED_LONG }
     ]);
 
-    var result = native_.callSync('AccountManager_remove', { accountId: args.accountId });
+    var result = native_.callSync('AccountManagerRemove', { accountId: args.accountId });
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -230,7 +230,7 @@ AccountManager.prototype.update = function() {
         { name: 'account', type: types_.PLATFORM_OBJECT, values: Account }
     ]);
 
-    var result = native_.callSync('AccountManager_update', {
+    var result = native_.callSync('AccountManagerUpdate', {
         accountId: args.account.id,
         userName: args.account.userName,
         iconUri: args.account.iconUri
@@ -246,7 +246,7 @@ AccountManager.prototype.getAccount = function() {
         { name: 'accountId', type: types_.UNSIGNED_LONG }
     ]);
 
-    var result = native_.callSync('AccountManager_getAccount', {
+    var result = native_.callSync('AccountManagerGetAccount', {
         accountId: args.accountId
     });
 
@@ -276,7 +276,7 @@ AccountManager.prototype.getAccounts = function() {
     ]);
 
     var result = native_.call(
-        'AccountManager_getAccounts',
+        'AccountManagerGetAccounts',
         {
             applicationId: args.applicationId
         },
@@ -306,7 +306,7 @@ AccountManager.prototype.getProvider = function() {
         { name: 'applicationId', type: types_.STRING }
     ]);
 
-    var result = native_.callSync('AccountManager_getProvider', {
+    var result = native_.callSync('AccountManagerGetProvider', {
         applicationId: args.applicationId
     });
 
@@ -336,7 +336,7 @@ AccountManager.prototype.getProviders = function() {
     ]);
 
     var result = native_.call(
-        'AccountManager_getProviders',
+        'AccountManagerGetProviders',
         {
             capability: args.capability
         },
@@ -406,7 +406,7 @@ AccountListeners.prototype.addListener = function(callback) {
     var id = ++this.nextID;
 
     if (T_.isEmptyObject(this.instances)) {
-        var result = native_.callSync('AccountManager_addAccountListener');
+        var result = native_.callSync('AccountManagerAddAccountListener');
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
         }
@@ -423,7 +423,7 @@ AccountListeners.prototype.removeListener = function(accountListenerId) {
     if (T_.isEmptyObject(this.instances)) {
         native_.removeListener(ACCOUNT_LISTENER, this.appCallback);
 
-        var result = native_.callSync('AccountManager_removeAccountListener');
+        var result = native_.callSync('AccountManagerRemoveAccountListener');
 
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
index 7d75444..287aa64 100644 (file)
@@ -55,22 +55,28 @@ AccountInstance::AccountInstance() {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_ASYNC(c, x) RegisterSyncHandler(c, std::bind(&AccountInstance::x, this, _1, _2));
-  REGISTER_ASYNC("AccountManager_getAccounts", AccountManagerGetAccounts);
-  REGISTER_ASYNC("AccountManager_getProviders", AccountManagerGetProviders);
-  REGISTER_ASYNC("Account_getExtendedData", AccountGetExtendedData);
-#undef REGISTER_ASYNC
-#define REGISTER_SYNC(c, x) RegisterSyncHandler(c, std::bind(&AccountInstance::x, this, _1, _2));
-  REGISTER_SYNC("AccountManager_removeAccountListener", AccountManagerRemoveAccountListener);
-  REGISTER_SYNC("AccountManager_update", AccountManagerUpdate);
-  REGISTER_SYNC("AccountManager_remove", AccountManagerRemove);
-  REGISTER_SYNC("AccountManager_getAccount", AccountManagerGetAccount);
-  REGISTER_SYNC("AccountManager_getProvider", AccountManagerGetProvider);
-  REGISTER_SYNC("AccountManager_addAccountListener", AccountManagerAddAccountListener);
-  REGISTER_SYNC("AccountManager_add", AccountManagerAdd);
-  REGISTER_SYNC("Account_setExtendedData", AccountSetExtendedData);
-  REGISTER_SYNC("Account_getExtendedDataSync", AccountGetExtendedDataSync);
-#undef REGISTER_SYNC
+
+
+#define REGISTER_METHOD(M) \
+    RegisterSyncHandler(#M, std::bind(&AccountInstance::M, this, _1, _2))
+
+  REGISTER_METHOD(AccountManagerGetAccounts);
+  REGISTER_METHOD(AccountManagerGetProviders);
+  REGISTER_METHOD(AccountGetExtendedData);
+
+
+  REGISTER_METHOD(AccountManagerRemoveAccountListener);
+  REGISTER_METHOD(AccountManagerUpdate);
+  REGISTER_METHOD(AccountManagerRemove);
+  REGISTER_METHOD(AccountManagerGetAccount);
+  REGISTER_METHOD(AccountManagerGetProvider);
+  REGISTER_METHOD(AccountManagerAddAccountListener);
+  REGISTER_METHOD(AccountManagerAdd);
+  REGISTER_METHOD(AccountSetExtendedData);
+  REGISTER_METHOD(AccountGetExtendedDataSync);
+
+#undef REGISTER_METHOD
+
 }
 
 AccountInstance::~AccountInstance() {
index 2079e16..b19875c 100755 (executable)
@@ -123,7 +123,7 @@ AlarmManager.prototype.add = function() {
     callArgs.seconds = Converter.toString(seconds);
     callArgs.isPeriodSet = !T.isNullOrUndefined(args.alarm.period);
 
-    var result = native.callSync('AlarmManager_add', callArgs);
+    var result = native.callSync('AlarmManagerAdd', callArgs);
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
     } else {
@@ -166,7 +166,7 @@ AlarmManager.prototype.addAlarmNotification = function() {
     //add marker for UserNotification implementation
     callArgs.newImpl = callArgs.notification instanceof tizen.UserNotification;
 
-    var result = native.callSync('AlarmManager_addAlarmNotification', callArgs);
+    var result = native.callSync('AlarmManagerAddAlarmNotification', callArgs);
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
     } else {
@@ -184,7 +184,7 @@ AlarmManager.prototype.remove = function() {
         }
     ]);
 
-    var result = native.callSync('AlarmManager_remove', { id: Number(args.id) });
+    var result = native.callSync('AlarmManagerRemove', { id: Number(args.id) });
 
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
@@ -192,7 +192,7 @@ AlarmManager.prototype.remove = function() {
 };
 
 AlarmManager.prototype.removeAll = function() {
-    var result = native.callSync('AlarmManager_removeAll', {});
+    var result = native.callSync('AlarmManagerRemoveAll', {});
 
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
@@ -207,7 +207,7 @@ AlarmManager.prototype.get = function() {
         }
     ]);
 
-    var result = native.callSync('AlarmManager_get', { id: Number(args.id) });
+    var result = native.callSync('AlarmManagerGet', { id: Number(args.id) });
 
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
@@ -284,7 +284,7 @@ AlarmManager.prototype.getAlarmNotification = function() {
         }
     ]);
 
-    var result = native.callSync('AlarmManager_getAlarmNotification', {
+    var result = native.callSync('AlarmManagerGetAlarmNotification', {
         id: Number(args.id)
     });
 
@@ -299,7 +299,7 @@ AlarmManager.prototype.getAlarmNotification = function() {
 };
 
 AlarmManager.prototype.getAll = function() {
-    var result = native.callSync('AlarmManager_getAll', {});
+    var result = native.callSync('AlarmManagerGetAll', {});
 
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
@@ -394,7 +394,7 @@ tizen.AlarmRelative.prototype = new Alarm();
 tizen.AlarmRelative.prototype.constructor = tizen.AlarmRelative;
 
 tizen.AlarmRelative.prototype.getRemainingSeconds = function() {
-    var result = native.callSync('AlarmRelative_getRemainingSeconds', {
+    var result = native.callSync('AlarmManagerGetRemainingSeconds', {
         id: Number(this.id)
     });
 
@@ -516,7 +516,7 @@ tizen.AlarmAbsolute.prototype = new Alarm();
 tizen.AlarmAbsolute.prototype.constructor = tizen.AlarmAbsolute;
 
 tizen.AlarmAbsolute.prototype.getNextScheduledDate = function() {
-    var result = native.callSync('AlarmAbsolute_getNextScheduledDate', {
+    var result = native.callSync('AlarmManagerGetNextScheduledDate', {
         id: Number(this.id)
     });
 
index ad0f4af..e9c52f0 100644 (file)
@@ -28,31 +28,82 @@ AlarmInstance::AlarmInstance() {
   ScopeLogger();
   using namespace std::placeholders;
 
-  RegisterSyncHandler("AlarmManager_add", std::bind(&AlarmManager::Add, &manager_, _1, _2));
-  RegisterSyncHandler("AlarmManager_remove", std::bind(&AlarmManager::Remove, &manager_, _1, _2));
-  RegisterSyncHandler("AlarmManager_removeAll",
-                      std::bind(&AlarmManager::RemoveAll, &manager_, _1, _2));
-  RegisterSyncHandler("AlarmManager_get", std::bind(&AlarmManager::Get, &manager_, _1, _2));
-  RegisterSyncHandler("AlarmManager_getAll", std::bind(&AlarmManager::GetAll, &manager_, _1, _2));
+#define REGISTER_METHOD(M) \
+    RegisterSyncHandler(#M, std::bind(&AlarmInstance::M, this, _1, _2))
+
+  REGISTER_METHOD(AlarmManagerAdd);
+  REGISTER_METHOD(AlarmManagerRemove);
+  REGISTER_METHOD(AlarmManagerRemoveAll);
+  REGISTER_METHOD(AlarmManagerGet);
+  REGISTER_METHOD(AlarmManagerGetAll);
+
   // AlarmRelative
-  RegisterSyncHandler("AlarmRelative_getRemainingSeconds",
-                      std::bind(&AlarmManager::GetRemainingSeconds, &manager_, _1, _2));
+  REGISTER_METHOD(AlarmManagerGetRemainingSeconds);
+
   // AlarmAbsolute
-  RegisterSyncHandler("AlarmAbsolute_getNextScheduledDate",
-                      std::bind(&AlarmManager::GetNextScheduledDate, &manager_, _1, _2));
+  REGISTER_METHOD(AlarmManagerGetNextScheduledDate);
 
 // Block of code related to Notification
 #if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE)
-  RegisterSyncHandler("AlarmManager_addAlarmNotification",
-                      std::bind(&AlarmManager::AddAlarmNotification, &manager_, _1, _2));
-  RegisterSyncHandler("AlarmManager_getAlarmNotification",
-                      std::bind(&AlarmManager::GetAlarmNotification, &manager_, _1, _2));
-#endif
+  REGISTER_METHOD(AlarmManagerAddAlarmNotification);
+  REGISTER_METHOD(AlarmManagerGetAlarmNotification);
+#endif // TIZEN_MOBILE or TIZEN_WEARABLE
+
+#undef REGISTER_METHOD
 }
 
 AlarmInstance::~AlarmInstance() {
   ScopeLogger();
 }
 
+
+void AlarmInstance::AlarmManagerAdd(const picojson::value& args, picojson::object& out) {
+    ScopeLogger();
+    manager_.Add(args, out);
+}
+
+void AlarmInstance::AlarmManagerRemove(const picojson::value& args, picojson::object& out) {
+    ScopeLogger();
+    manager_.Remove(args, out);
+}
+
+void AlarmInstance::AlarmManagerRemoveAll(const picojson::value& args, picojson::object& out) {
+    ScopeLogger();
+    manager_.RemoveAll(args, out);
+}
+
+void AlarmInstance::AlarmManagerGet(const picojson::value& args, picojson::object& out) {
+    ScopeLogger();
+    manager_.Get(args, out);
+}
+
+void AlarmInstance::AlarmManagerGetAll(const picojson::value& args, picojson::object& out) {
+    ScopeLogger();
+    manager_.GetAll(args, out);
+}
+
+#if defined(TIZEN_MOBILE) || defined(TIZEN_WEARABLE)
+void AlarmInstance::AlarmManagerAddAlarmNotification(const picojson::value& args, picojson::object& out) {
+    ScopeLogger();
+    manager_.AddAlarmNotification(args, out);
+}
+
+void AlarmInstance::AlarmManagerGetAlarmNotification(const picojson::value& args, picojson::object& out) {
+    ScopeLogger();
+    manager_.GetAlarmNotification(args, out);
+}
+#endif // TIZEN_MOBILE or TIZEN_WEARABLE
+
+void AlarmInstance::AlarmManagerGetRemainingSeconds(const picojson::value& args, picojson::object& out) {
+    ScopeLogger();
+    manager_.GetRemainingSeconds(args, out);
+}
+
+void AlarmInstance::AlarmManagerGetNextScheduledDate(const picojson::value& args, picojson::object& out) {
+    ScopeLogger();
+    manager_.GetNextScheduledDate(args, out);
+}
+
+
 }  // namespace Alarm
 }  // namespace extension
index 8965b2a..318c701 100644 (file)
@@ -29,6 +29,16 @@ class AlarmInstance : public common::ParsedInstance {
   AlarmInstance();
   virtual ~AlarmInstance();
 
+  void AlarmManagerAdd(const picojson::value& args, picojson::object& out);
+  void AlarmManagerRemove(const picojson::value& args, picojson::object& out);
+  void AlarmManagerRemoveAll(const picojson::value& args, picojson::object& out);
+  void AlarmManagerGet(const picojson::value& args, picojson::object& out);
+  void AlarmManagerGetAll(const picojson::value& args, picojson::object& out);
+  void AlarmManagerAddAlarmNotification(const picojson::value& args, picojson::object& out);
+  void AlarmManagerGetAlarmNotification(const picojson::value& args, picojson::object& out);
+  void AlarmManagerGetRemainingSeconds(const picojson::value& args, picojson::object& out);
+  void AlarmManagerGetNextScheduledDate(const picojson::value& args, picojson::object& out);
+
  private:
   AlarmManager manager_;
 };
index aba6351..ca525a5 100755 (executable)
@@ -115,7 +115,7 @@ function _createApplicationInformationArray(object) {
 var ApplicationManager = function() {};
 
 ApplicationManager.prototype.getCurrentApplication = function() {
-    var result = native.callSync('ApplicationManager_getCurrentApplication', {});
+    var result = native.callSync('ApplicationManagerGetCurrentApplication', {});
 
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
@@ -153,7 +153,7 @@ ApplicationManager.prototype.kill = function() {
     };
 
     var result = native.call(
-        'ApplicationManager_kill',
+        'ApplicationManagerKill',
         { contextId: args.contextId },
         callback
     );
@@ -191,8 +191,7 @@ ApplicationManager.prototype.launch = function() {
         }
     };
 
-    var result = native.call('ApplicationManager_launch', { id: args.id }, callback);
-
+    var result = native.call('ApplicationManagerLaunch', { id: args.id }, callback);
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
     }
@@ -265,7 +264,7 @@ ApplicationManager.prototype.launchAppControl = function() {
         native.addListener(replyCallbackId, registeredReplyCallback);
     }
 
-    var result = native.call('ApplicationManager_launchAppControl', callArgs, callback);
+    var result = native.call('ApplicationManagerLaunchAppControl', callArgs, callback);
 
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
@@ -304,7 +303,7 @@ ApplicationManager.prototype.findAppControl = function() {
     };
 
     var callArgs = { appControl: args.appControl };
-    var result = native.call('ApplicationManager_findAppControl', callArgs, callback);
+    var result = native.call('ApplicationManagerFindAppControl', callArgs, callback);
 
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
@@ -338,7 +337,7 @@ ApplicationManager.prototype.getAppsContext = function() {
         }
     };
 
-    var result = native.call('ApplicationManager_getAppsContext', {}, callback);
+    var result = native.call('ApplicationManagerGetAppsContext', {}, callback);
 
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
@@ -361,7 +360,7 @@ ApplicationManager.prototype.getAppContext = function() {
         callArgs.contextId = args.contextId;
     }
 
-    var result = native.callSync('ApplicationManager_getAppContext', callArgs);
+    var result = native.callSync('ApplicationManagerGetAppContext', callArgs);
 
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
@@ -396,7 +395,7 @@ ApplicationManager.prototype.getAppsInfo = function() {
         }
     };
 
-    var result = native.call('ApplicationManager_getAppsInfo', {}, callback);
+    var result = native.call('ApplicationManagerGetAppsInfo', {}, callback);
 
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
@@ -419,7 +418,7 @@ ApplicationManager.prototype.getAppInfo = function() {
         callArgs.id = args.id;
     }
 
-    var result = native.callSync('ApplicationManager_getAppInfo', callArgs);
+    var result = native.callSync('ApplicationManagerGetAppInfo', callArgs);
 
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
@@ -444,7 +443,7 @@ ApplicationManager.prototype.getAppCerts = function() {
         callArgs.id = args.id;
     }
 
-    var result = native.callSync('ApplicationManager_getAppCerts', callArgs);
+    var result = native.callSync('ApplicationManagerGetAppCerts', callArgs);
 
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
@@ -474,7 +473,7 @@ ApplicationManager.prototype.getAppSharedURI = function() {
         callArgs.id = args.id;
     }
 
-    var result = native.callSync('ApplicationManager_getAppSharedURI', callArgs);
+    var result = native.callSync('ApplicationManagerGetAppSharedURI', callArgs);
 
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
@@ -499,7 +498,7 @@ ApplicationManager.prototype.getAppMetaData = function() {
         callArgs.id = args.id;
     }
 
-    var result = native.callSync('ApplicationManager_getAppMetaData', callArgs);
+    var result = native.callSync('ApplicationManagerGetAppMetaData', callArgs);
 
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
@@ -563,7 +562,7 @@ ApplicationManager.prototype.getBatteryUsageInfo = function() {
     };
 
     var result = native.call(
-        'ApplicationManager_getBatteryUsageInfo',
+        'ApplicationManagerGetBatteryUsageInfo',
         callArgs,
         callback
     );
@@ -671,7 +670,7 @@ ApplicationManager.prototype.getAppsUsageInfo = function() {
         }
     };
 
-    var result = native.call('ApplicationManager_getAppsUsageInfo', callArgs, callback);
+    var result = native.call('ApplicationManagerGetAppsUsageInfo', callArgs, callback);
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
     }
@@ -718,7 +717,7 @@ ListenerManager.prototype.addListener = function(callback) {
     var id = this.nextId;
     if (!this.nativeSet) {
         this.native.addListener(this.listenerName, this.onListenerCalled.bind(this));
-        var result = this.native.callSync('ApplicationManager_addAppInfoEventListener');
+        var result = this.native.callSync('ApplicationManagerAddAppInfoEventListener');
         if (this.native.isFailure(result)) {
             throw this.native.getErrorObject(result);
         }
@@ -742,7 +741,7 @@ ListenerManager.prototype.removeListener = function(watchId) {
     }
 
     if (this.nativeSet && T.isEmptyObject(this.listeners)) {
-        this.native.callSync('ApplicationManager_removeAppInfoEventListener');
+        this.native.callSync('ApplicationManagerRemoveAppInfoEventListener');
         this.native.removeListener(this.listenerName);
         this.nativeSet = false;
     }
@@ -812,7 +811,7 @@ StatusListenerManager.prototype.onListenerCalled = function(msg) {
 StatusListenerManager.prototype.addListener = function(callback, appId) {
     if (!this.nativeSet) {
         var result = this.native.callSync(
-            'ApplicationManager_addAppStatusChangeListener'
+            'ApplicationManagerAddStatusListener'
         );
         if (this.native.isFailure(result)) {
             throw this.native.getErrorObject(result);
@@ -844,7 +843,7 @@ StatusListenerManager.prototype.removeListener = function(watchId) {
 
         if (this.nativeSet) {
             var result = this.native.callSync(
-                'ApplicationManager_removeStatusChangeListener'
+                'ApplicationManagerRemoveStatusListener'
             );
             if (this.native.isFailure(result)) {
                 throw this.native.getErrorObject(result);
@@ -926,7 +925,7 @@ Application.prototype.hide = function() {
 };
 
 Application.prototype.getRequestedAppControl = function() {
-    var result = native.callSync('Application_getRequestedAppControl', {});
+    var result = native.callSync('ApplicationGetRequestedAppControl', {});
 
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
@@ -1012,7 +1011,7 @@ Application.prototype.addEventListener = function(event, callback) {
             }
         });
 
-        var result = native.callSync('Application_addEventListener', data);
+        var result = native.callSync('ApplicationAddEventListener', data);
         if (native.isFailure(result)) {
             throw native.getErrorObject(result);
         }
@@ -1052,7 +1051,7 @@ Application.prototype.removeEventListener = function(watchId) {
 
     if (!Object.keys(event_listeners_[eventName]).length) {
         native.removeListener(eventName);
-        var result = native.callSync('Application_removeEventListener', {
+        var result = native.callSync('ApplicationRemoveEventListener', {
             name: eventName
         });
         if (native.isFailure(result)) {
@@ -1074,7 +1073,7 @@ Application.prototype.broadcastEvent = function(event, data) {
         data: args.data
     };
 
-    var result = native.callSync('Application_broadcastEvent', nativeData);
+    var result = native.callSync('ApplicationBroadcastEvent', nativeData);
 
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
@@ -1094,7 +1093,7 @@ Application.prototype.broadcastTrustedEvent = function(event, data) {
         data: args.data
     };
 
-    var result = native.callSync('Application_broadcastTrustedEvent', nativeData);
+    var result = native.callSync('ApplicationBroadcastTrustedEvent', nativeData);
 
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
@@ -1109,7 +1108,7 @@ function ApplicationInformation(data) {
     function sizeGetter() {
         if (undefined === size) {
             var callArgs = { packageId: this.packageId }; // jshint ignore:line
-            var result = native.callSync('ApplicationInformation_getSize', callArgs);
+            var result = native.callSync('ApplicationInformationGetSize', callArgs);
 
             if (native.isFailure(result)) {
                 throw native.getErrorObject(result);
@@ -1386,7 +1385,7 @@ RequestedApplicationControl.prototype.replyResult = function() {
         callArgs.data = [];
     }
 
-    var result = native.callSync('RequestedApplicationControl_replyResult', callArgs);
+    var result = native.callSync('RequestedApplicationControlReplyResult', callArgs);
 
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
@@ -1394,7 +1393,7 @@ RequestedApplicationControl.prototype.replyResult = function() {
 };
 
 RequestedApplicationControl.prototype.replyFailure = function() {
-    var result = native.callSync('RequestedApplicationControl_replyFailure', {});
+    var result = native.callSync('RequestedApplicationControlReplyFailure', {});
 
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
index b0a0ea2..6d1f793 100644 (file)
@@ -51,67 +51,66 @@ ApplicationInstance::ApplicationInstance() : manager_(*this) {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_SYNC(c, x) \
-  RegisterSyncHandler(c, std::bind(&ApplicationInstance::x, this, _1, _2));
+#define REGISTER_METHOD(M) \
+    RegisterSyncHandler(#M, std::bind(&ApplicationInstance::M, this, _1, _2))
+
   // ApplicationManager
-  REGISTER_SYNC("ApplicationManager_getCurrentApplication", GetCurrentApplication);
-  REGISTER_SYNC("ApplicationManager_getAppContext", GetAppContext);
-  REGISTER_SYNC("ApplicationManager_getAppInfo", GetAppInfo);
-  REGISTER_SYNC("ApplicationManager_getAppCerts", GetAppCerts);
-  REGISTER_SYNC("ApplicationManager_getAppSharedURI", GetAppSharedURI);
-  REGISTER_SYNC("ApplicationManager_getAppMetaData", GetAppMetaData);
-  REGISTER_SYNC("ApplicationManager_addAppInfoEventListener", AddAppInfoEventListener);
-  REGISTER_SYNC("ApplicationManager_removeAppInfoEventListener", RemoveAppInfoEventListener);
-  REGISTER_SYNC("ApplicationManager_addAppStatusChangeListener", AddStatusListener);
-  REGISTER_SYNC("ApplicationManager_removeStatusChangeListener", RemoveStatusListener);
+  REGISTER_METHOD(ApplicationManagerGetCurrentApplication);
+  REGISTER_METHOD(ApplicationManagerGetAppContext);
+  REGISTER_METHOD(ApplicationManagerGetAppInfo);
+  REGISTER_METHOD(ApplicationManagerGetAppCerts);
+  REGISTER_METHOD(ApplicationManagerGetAppSharedURI);
+  REGISTER_METHOD(ApplicationManagerGetAppMetaData);
+  REGISTER_METHOD(ApplicationManagerAddAppInfoEventListener);
+  REGISTER_METHOD(ApplicationManagerRemoveAppInfoEventListener);
+  REGISTER_METHOD(ApplicationManagerAddStatusListener);
+  REGISTER_METHOD(ApplicationManagerRemoveStatusListener);
 
   // Application
-  REGISTER_SYNC("Application_getRequestedAppControl", GetRequestedAppControl);
-  REGISTER_SYNC("Application_broadcastEvent", BroadcastEvent);
-  REGISTER_SYNC("Application_broadcastTrustedEvent", BroadcastTrustedEvent);
-  REGISTER_SYNC("Application_addEventListener", AddEventListener);
-  REGISTER_SYNC("Application_removeEventListener", RemoveEventListener);
+  REGISTER_METHOD(ApplicationGetRequestedAppControl);
+  REGISTER_METHOD(ApplicationBroadcastEvent);
+  REGISTER_METHOD(ApplicationBroadcastTrustedEvent);
+  REGISTER_METHOD(ApplicationAddEventListener);
+  REGISTER_METHOD(ApplicationRemoveEventListener);
 
   // RequestedApplicationControl
-  REGISTER_SYNC("RequestedApplicationControl_replyResult", ReplyResult);
-  REGISTER_SYNC("RequestedApplicationControl_replyFailure", ReplyFailure);
+  REGISTER_METHOD(RequestedApplicationControlReplyResult);
+  REGISTER_METHOD(RequestedApplicationControlReplyFailure);
 
   // ApplicationInformation
-  REGISTER_SYNC("ApplicationInformation_getSize", GetSize);
-#undef REGISTER_SYNC
+  REGISTER_METHOD(ApplicationInformationGetSize);
 
-#define REGISTER_ASYNC(c, x) \
-  RegisterSyncHandler(c, std::bind(&ApplicationInstance::x, this, _1, _2));
   // ApplicationManager
-  REGISTER_ASYNC("ApplicationManager_kill", Kill);
-  REGISTER_ASYNC("ApplicationManager_launch", Launch);
-  REGISTER_ASYNC("ApplicationManager_launchAppControl", LaunchAppControl);
-  REGISTER_ASYNC("ApplicationManager_findAppControl", FindAppControl);
-  REGISTER_ASYNC("ApplicationManager_getAppsContext", GetAppsContext);
-  REGISTER_ASYNC("ApplicationManager_getAppsInfo", GetAppsInfo);
-  REGISTER_ASYNC("ApplicationManager_getAppsUsageInfo", GetAppsUsageInfo);
-  REGISTER_ASYNC("ApplicationManager_getBatteryUsageInfo", GetBatteryUsageInfo);
-#undef REGISTER_ASYNC
+  REGISTER_METHOD(ApplicationManagerKill);
+  REGISTER_METHOD(ApplicationManagerLaunch);
+  REGISTER_METHOD(ApplicationManagerLaunchAppControl);
+  REGISTER_METHOD(ApplicationManagerFindAppControl);
+  REGISTER_METHOD(ApplicationManagerGetAppsContext);
+  REGISTER_METHOD(ApplicationManagerGetAppsInfo);
+  REGISTER_METHOD(ApplicationManagerGetAppsUsageInfo);
+  REGISTER_METHOD(ApplicationManagerGetBatteryUsageInfo);
+
+#undef REGISTER_METHOD
 }
 
 ApplicationInstance::~ApplicationInstance() {
   ScopeLogger();
 }
 
-void ApplicationInstance::GetCurrentApplication(const picojson::value& args,
+void ApplicationInstance::ApplicationManagerGetCurrentApplication(const picojson::value& args,
                                                 picojson::object& out) {
   ScopeLogger();
 
   manager_.GetCurrentApplication(app_id_, &out);
 }
 
-void ApplicationInstance::GetAppContext(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerGetAppContext(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
 
   manager_.GetAppContext(args, &out);
 }
 
-void ApplicationInstance::GetAppInfo(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerGetAppInfo(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
 
   std::string app_id = app_id_;
@@ -123,7 +122,7 @@ void ApplicationInstance::GetAppInfo(const picojson::value& args, picojson::obje
   manager_.GetAppInfo(app_id, &out);
 }
 
-void ApplicationInstance::GetAppCerts(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerGetAppCerts(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegeAppManagerCertificate, &out);
@@ -137,7 +136,7 @@ void ApplicationInstance::GetAppCerts(const picojson::value& args, picojson::obj
   manager_.GetAppCerts(app_id, &out);
 }
 
-void ApplicationInstance::GetAppSharedURI(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerGetAppSharedURI(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
 
   std::string app_id = app_id_;
@@ -149,7 +148,7 @@ void ApplicationInstance::GetAppSharedURI(const picojson::value& args, picojson:
   manager_.GetAppSharedUri(app_id, &out);
 }
 
-void ApplicationInstance::GetAppMetaData(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerGetAppMetaData(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegeApplicationInfo, &out);
@@ -163,21 +162,21 @@ void ApplicationInstance::GetAppMetaData(const picojson::value& args, picojson::
   manager_.GetAppMetaData(app_id, &out);
 }
 
-void ApplicationInstance::GetBatteryUsageInfo(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerGetBatteryUsageInfo(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeAppHistoryRead, &out);
 
   manager_.GetBatteryUsageInfo(args, &out);
 }
 
-void ApplicationInstance::GetAppsUsageInfo(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerGetAppsUsageInfo(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeAppHistoryRead, &out);
 
   manager_.GetAppsUsageInfo(args, &out);
 }
 
-void ApplicationInstance::AddAppInfoEventListener(const picojson::value& args,
+void ApplicationInstance::ApplicationManagerAddAppInfoEventListener(const picojson::value& args,
                                                   picojson::object& out) {
   ScopeLogger();
   LoggerW(
@@ -188,7 +187,7 @@ void ApplicationInstance::AddAppInfoEventListener(const picojson::value& args,
   manager_.StartAppInfoEventListener(&out);
 }
 
-void ApplicationInstance::RemoveAppInfoEventListener(const picojson::value& args,
+void ApplicationInstance::ApplicationManagerRemoveAppInfoEventListener(const picojson::value& args,
                                                      picojson::object& out) {
   ScopeLogger();
   LoggerW(
@@ -200,26 +199,26 @@ void ApplicationInstance::RemoveAppInfoEventListener(const picojson::value& args
   ReportSuccess(out);
 }
 
-void ApplicationInstance::GetRequestedAppControl(const picojson::value& args,
+void ApplicationInstance::ApplicationGetRequestedAppControl(const picojson::value& args,
                                                  picojson::object& out) {
   ScopeLogger();
 
   current_application_.GetRequestedAppControl(args, &out);
 }
 
-void ApplicationInstance::ReplyResult(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::RequestedApplicationControlReplyResult(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
 
   current_application_.app_control().ReplyResult(args, &out);
 }
 
-void ApplicationInstance::ReplyFailure(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::RequestedApplicationControlReplyFailure(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
 
   current_application_.app_control().ReplyFailure(&out);
 }
 
-void ApplicationInstance::GetSize(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationInformationGetSize(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegeApplicationInfo, &out);
@@ -227,7 +226,7 @@ void ApplicationInstance::GetSize(const picojson::value& args, picojson::object&
   manager_.GetApplicationInformationSize(args, &out);
 }
 
-void ApplicationInstance::Kill(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerKill(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegeAppManagerKill, &out);
@@ -235,7 +234,7 @@ void ApplicationInstance::Kill(const picojson::value& args, picojson::object& ou
   manager_.Kill(args);
 }
 
-void ApplicationInstance::Launch(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerLaunch(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegeApplicationLaunch, &out);
@@ -243,7 +242,7 @@ void ApplicationInstance::Launch(const picojson::value& args, picojson::object&
   manager_.Launch(args);
 }
 
-void ApplicationInstance::LaunchAppControl(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerLaunchAppControl(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegeApplicationLaunch, &out);
@@ -251,38 +250,38 @@ void ApplicationInstance::LaunchAppControl(const picojson::value& args, picojson
   manager_.LaunchAppControl(args);
 }
 
-void ApplicationInstance::FindAppControl(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerFindAppControl(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
 
   manager_.FindAppControl(args);
 }
 
-void ApplicationInstance::GetAppsContext(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerGetAppsContext(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
 
   manager_.GetAppsContext(args);
 }
 
-void ApplicationInstance::GetAppsInfo(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerGetAppsInfo(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
 
   manager_.GetAppsInfo(args);
 }
 
-void ApplicationInstance::BroadcastEvent(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationBroadcastEvent(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
 
   manager_.BroadcastEventHelper(args, out, false);
 }
 
-void ApplicationInstance::BroadcastTrustedEvent(const picojson::value& args,
+void ApplicationInstance::ApplicationBroadcastTrustedEvent(const picojson::value& args,
                                                 picojson::object& out) {
   ScopeLogger();
 
   manager_.BroadcastEventHelper(args, out, true);
 }
 
-void ApplicationInstance::AddEventListener(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationAddEventListener(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
 
   const std::string& event_name = args.get("name").get<std::string>();
@@ -305,7 +304,7 @@ void ApplicationInstance::AddEventListener(const picojson::value& args, picojson
   }
 }
 
-void ApplicationInstance::RemoveEventListener(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationRemoveEventListener(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
 
   const std::string& event_name = args.get("name").get<std::string>();
@@ -315,7 +314,7 @@ void ApplicationInstance::RemoveEventListener(const picojson::value& args, picoj
   manager_.StopEventListener(event_name);
 }
 
-void ApplicationInstance::AddStatusListener(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerAddStatusListener(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
 
   JsonCallback cb = [this](picojson::value* event) -> void {
@@ -330,7 +329,7 @@ void ApplicationInstance::AddStatusListener(const picojson::value& args, picojso
   }
 }
 
-void ApplicationInstance::RemoveStatusListener(const picojson::value& args, picojson::object& out) {
+void ApplicationInstance::ApplicationManagerRemoveStatusListener(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
 
   PlatformResult result = manager_.StopStatusChangeListener();
index 8cafed2..852aa75 100644 (file)
@@ -33,32 +33,35 @@ class ApplicationInstance : public common::ParsedInstance {
   virtual ~ApplicationInstance();
 
  private:
-  void GetCurrentApplication(const picojson::value& args, picojson::object& out);
-  void GetAppContext(const picojson::value& args, picojson::object& out);
-  void GetAppInfo(const picojson::value& args, picojson::object& out);
-  void GetAppCerts(const picojson::value& args, picojson::object& out);
-  void GetAppSharedURI(const picojson::value& args, picojson::object& out);
-  void GetAppMetaData(const picojson::value& args, picojson::object& out);
-  void GetBatteryUsageInfo(const picojson::value& args, picojson::object& out);
-  void GetAppsUsageInfo(const picojson::value& args, picojson::object& out);
-  void AddAppInfoEventListener(const picojson::value& args, picojson::object& out);
-  void RemoveAppInfoEventListener(const picojson::value& args, picojson::object& out);
-  void GetRequestedAppControl(const picojson::value& args, picojson::object& out);
-  void ReplyResult(const picojson::value& args, picojson::object& out);
-  void ReplyFailure(const picojson::value& args, picojson::object& out);
-  void GetSize(const picojson::value& args, picojson::object& out);
-  void Kill(const picojson::value& args, picojson::object& out);
-  void Launch(const picojson::value& args, picojson::object& out);
-  void LaunchAppControl(const picojson::value& args, picojson::object& out);
-  void FindAppControl(const picojson::value& args, picojson::object& out);
-  void GetAppsContext(const picojson::value& args, picojson::object& out);
-  void GetAppsInfo(const picojson::value& args, picojson::object& out);
-  void BroadcastEvent(const picojson::value& args, picojson::object& out);
-  void BroadcastTrustedEvent(const picojson::value& args, picojson::object& out);
-  void AddEventListener(const picojson::value& args, picojson::object& out);
-  void RemoveEventListener(const picojson::value& args, picojson::object& out);
-  void AddStatusListener(const picojson::value& args, picojson::object& out);
-  void RemoveStatusListener(const picojson::value& args, picojson::object& out);
+  void ApplicationManagerAddAppInfoEventListener(const picojson::value& args, picojson::object& out);
+  void ApplicationManagerAddStatusListener(const picojson::value& args, picojson::object& out);
+  void ApplicationManagerFindAppControl(const picojson::value& args, picojson::object& out);
+  void ApplicationManagerGetAppCerts(const picojson::value& args, picojson::object& out);
+  void ApplicationManagerGetAppContext(const picojson::value& args, picojson::object& out);
+  void ApplicationManagerGetAppInfo(const picojson::value& args, picojson::object& out);
+  void ApplicationManagerGetAppMetaData(const picojson::value& args, picojson::object& out);
+  void ApplicationManagerGetAppSharedURI(const picojson::value& args, picojson::object& out);
+  void ApplicationManagerGetAppsContext(const picojson::value& args, picojson::object& out);
+  void ApplicationManagerGetAppsInfo(const picojson::value& args, picojson::object& out);
+  void ApplicationManagerGetAppsUsageInfo(const picojson::value& args, picojson::object& out);
+  void ApplicationManagerGetBatteryUsageInfo(const picojson::value& args, picojson::object& out);
+  void ApplicationManagerGetCurrentApplication(const picojson::value& args, picojson::object& out);
+  void ApplicationManagerKill(const picojson::value& args, picojson::object& out);
+  void ApplicationManagerLaunch(const picojson::value& args, picojson::object& out);
+  void ApplicationManagerLaunchAppControl(const picojson::value& args, picojson::object& out);
+  void ApplicationManagerRemoveAppInfoEventListener(const picojson::value& args, picojson::object& out);
+  void ApplicationManagerRemoveStatusListener(const picojson::value& args, picojson::object& out);
+
+  void ApplicationAddEventListener(const picojson::value& args, picojson::object& out);
+  void ApplicationBroadcastEvent(const picojson::value& args, picojson::object& out);
+  void ApplicationBroadcastTrustedEvent(const picojson::value& args, picojson::object& out);
+  void ApplicationGetRequestedAppControl(const picojson::value& args, picojson::object& out);
+  void ApplicationRemoveEventListener(const picojson::value& args, picojson::object& out);
+
+  void RequestedApplicationControlReplyFailure(const picojson::value& args, picojson::object& out);
+  void RequestedApplicationControlReplyResult(const picojson::value& args, picojson::object& out);
+
+  void ApplicationInformationGetSize(const picojson::value& args, picojson::object& out);
 
   ApplicationManager manager_;
   Application current_application_;
index 88099e4..9690bbb 100755 (executable)
@@ -34,7 +34,7 @@ function _initializeCache() {
     if (CommonFS.isCacheReady) {
         return;
     }
-    var result = native_.callSync('Archive_fetchStorages', {});
+    var result = native_.callSync('ArchiveFetchStorages', {});
 
     if (native_.isFailure(result)) {
         privUtils_.log(
@@ -304,7 +304,7 @@ function ArchiveFileEntry(data, priv) {
             onprogressCallbacks[opId] = args.onprogress;
         }
 
-        var result = native_.call('ArchiveFileEntry_extract', callArgs, callback);
+        var result = native_.call('ArchiveFileEntryExtract', callArgs, callback);
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
         }
@@ -421,7 +421,7 @@ function ArchiveFile(data) {
             onprogressCallbacks[opId] = args.onprogress;
         }
 
-        var result = native_.call('ArchiveFile_add', callArgs, callback);
+        var result = native_.call('ArchiveFileAdd', callArgs, callback);
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
         }
@@ -491,7 +491,7 @@ function ArchiveFile(data) {
             onprogressCallbacks[opId] = args.onprogress;
         }
 
-        var result = native_.call('ArchiveFile_extractAll', callArgs, callback);
+        var result = native_.call('ArchiveFileExtractAll', callArgs, callback);
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
         }
@@ -529,7 +529,7 @@ function ArchiveFile(data) {
             }
         };
 
-        var result = native_.call('ArchiveFile_getEntries', callArgs, callback);
+        var result = native_.call('ArchiveFileGetEntries', callArgs, callback);
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
         }
@@ -567,7 +567,7 @@ function ArchiveFile(data) {
             }
         };
 
-        var result = native_.call('ArchiveFile_getEntryByName', callArgs, callback);
+        var result = native_.call('ArchiveFileGetEntryByName', callArgs, callback);
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
         }
@@ -582,7 +582,7 @@ function ArchiveFile(data) {
         var handle = priv.handle;
         if (priv.handle) {
             delete priv.handle;
-            var result = native_.callSync('ArchiveFile_close', { handle: handle });
+            var result = native_.callSync('ArchiveFileClose', { handle: handle });
 
             if (native_.isFailure(result)) {
                 throw native_.getErrorObject(result);
@@ -638,7 +638,7 @@ ArchiveManager.prototype.open = function() {
         }
     };
 
-    var result = native_.call('ArchiveManager_open', callArgs, callback);
+    var result = native_.call('ArchiveManagerOpen', callArgs, callback);
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
     }
@@ -652,7 +652,7 @@ ArchiveManager.prototype.open = function() {
 ArchiveManager.prototype.abort = function() {
     var args = validator_.validateArgs(arguments, [{ name: 'opId', type: types_.LONG }]);
 
-    var result = native_.callSync('ArchiveManager_abort', { opId: args.opId });
+    var result = native_.callSync('ArchiveManagerAbort', { opId: args.opId });
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
index cf7f9c8..e804747 100644 (file)
@@ -58,24 +58,30 @@ ArchiveInstance::ArchiveInstance() {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_SYNC(c, x) RegisterSyncHandler(c, std::bind(&ArchiveInstance::x, this, _1, _2));
-#define REGISTER_ASYNC(c, x) RegisterSyncHandler(c, std::bind(&ArchiveInstance::x, this, _1, _2));
 
-  REGISTER_ASYNC("ArchiveManager_open", Open);
-  REGISTER_SYNC("ArchiveManager_abort", Abort);
 
-  REGISTER_ASYNC("ArchiveFile_add", Add);
-  REGISTER_ASYNC("ArchiveFile_extractAll", ExtractAll);
-  REGISTER_ASYNC("ArchiveFile_getEntries", GetEntries);
-  REGISTER_ASYNC("ArchiveFile_getEntryByName", GetEntryByName);
-  REGISTER_SYNC("ArchiveFile_close", Close);
 
-  REGISTER_ASYNC("ArchiveFileEntry_extract", Extract);
 
-  REGISTER_SYNC("Archive_fetchStorages", FetchStorages);
+#define REGISTER_METHOD(M) \
+    RegisterSyncHandler(#M, std::bind(&ArchiveInstance::M, this, _1, _2))
+
+  REGISTER_METHOD(ArchiveManagerOpen);
+  REGISTER_METHOD(ArchiveManagerAbort);
+
+  REGISTER_METHOD(ArchiveFileAdd);
+  REGISTER_METHOD(ArchiveFileExtractAll);
+  REGISTER_METHOD(ArchiveFileGetEntries);
+  REGISTER_METHOD(ArchiveFileGetEntryByName);
+  REGISTER_METHOD(ArchiveFileClose);
+
+  REGISTER_METHOD(ArchiveFileEntryExtract);
+
+  REGISTER_METHOD(ArchiveFetchStorages);
+
+#undef REGISTER_METHOD
+
+
 
-#undef REGISTER_ASYNC
-#undef REGISTER_SYNC
 }
 
 ArchiveInstance::~ArchiveInstance() {
@@ -97,7 +103,7 @@ void ArchiveInstance::PostError(const PlatformResult& e, double callback_id) {
   Instance::PostMessage(this, val.serialize().c_str());
 }
 
-void ArchiveInstance::Open(const picojson::value& args, picojson::object& out) {
+void ArchiveInstance::ArchiveManagerOpen(const picojson::value& args, picojson::object& out) {
   ScopeLogger("%s", args.serialize().c_str());
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out);
@@ -230,7 +236,7 @@ void ArchiveInstance::Open(const picojson::value& args, picojson::object& out) {
   }
 }
 
-void ArchiveInstance::Abort(const picojson::value& args, picojson::object& out) {
+void ArchiveInstance::ArchiveManagerAbort(const picojson::value& args, picojson::object& out) {
   ScopeLogger("%s", args.serialize().c_str());
 
   picojson::object data = args.get<picojson::object>();
@@ -257,7 +263,7 @@ unsigned int ConvertStringToCompressionLevel(const std::string& level) {
   }
 }
 
-void ArchiveInstance::Add(const picojson::value& args, picojson::object& out) {
+void ArchiveInstance::ArchiveFileAdd(const picojson::value& args, picojson::object& out) {
   ScopeLogger("%s", args.serialize().c_str());
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out);
@@ -345,7 +351,7 @@ void ArchiveInstance::Add(const picojson::value& args, picojson::object& out) {
   }
 }
 
-void ArchiveInstance::ExtractAll(const picojson::value& args, picojson::object& out) {
+void ArchiveInstance::ArchiveFileExtractAll(const picojson::value& args, picojson::object& out) {
   ScopeLogger("%s", args.serialize().c_str());
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out);
@@ -408,7 +414,7 @@ void ArchiveInstance::ExtractAll(const picojson::value& args, picojson::object&
   }
 }
 
-void ArchiveInstance::GetEntries(const picojson::value& args, picojson::object& out) {
+void ArchiveInstance::ArchiveFileGetEntries(const picojson::value& args, picojson::object& out) {
   ScopeLogger("%s", args.serialize().c_str());
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemRead, &out);
@@ -452,7 +458,7 @@ void ArchiveInstance::GetEntries(const picojson::value& args, picojson::object&
   }
 }
 
-void ArchiveInstance::GetEntryByName(const picojson::value& args, picojson::object& out) {
+void ArchiveInstance::ArchiveFileGetEntryByName(const picojson::value& args, picojson::object& out) {
   ScopeLogger("%s", args.serialize().c_str());
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemRead, &out);
@@ -498,7 +504,7 @@ void ArchiveInstance::GetEntryByName(const picojson::value& args, picojson::obje
   }
 }
 
-void ArchiveInstance::Close(const picojson::value& args, picojson::object& out) {
+void ArchiveInstance::ArchiveFileClose(const picojson::value& args, picojson::object& out) {
   ScopeLogger("%s", args.serialize().c_str());
 
   picojson::object data = args.get<picojson::object>();
@@ -519,7 +525,7 @@ void ArchiveInstance::Close(const picojson::value& args, picojson::object& out)
   ReportSuccess(out);
 }
 
-void ArchiveInstance::Extract(const picojson::value& args, picojson::object& out) {
+void ArchiveInstance::ArchiveFileEntryExtract(const picojson::value& args, picojson::object& out) {
   ScopeLogger("%s", args.serialize().c_str());
 
   CHECK_PRIVILEGE_ACCESS(kPrivilegeFilesystemWrite, &out);
@@ -600,7 +606,7 @@ void ArchiveInstance::Extract(const picojson::value& args, picojson::object& out
   }
 }
 
-void ArchiveInstance::FetchStorages(const picojson::value& args, picojson::object& out) {
+void ArchiveInstance::ArchiveFetchStorages(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
 
   picojson::array storages;
index c9e418b..8ce1f5e 100644 (file)
@@ -33,22 +33,18 @@ class ArchiveInstance : public common::ParsedInstance {
   ArchiveInstance(ArchiveInstance const&);
   void operator=(ArchiveInstance const&);
 
-  /* ArchiveManager methods */
-  void Open(const picojson::value& args, picojson::object& out);
-  void Abort(const picojson::value& args, picojson::object& out);
-
-  /* ArchiveFile methods */
-  void Add(const picojson::value& args, picojson::object& out);
-  void ExtractAll(const picojson::value& args, picojson::object& out);
-  void GetEntries(const picojson::value& args, picojson::object& out);
-  void GetEntryByName(const picojson::value& args, picojson::object& out);
-  void Close(const picojson::value& args, picojson::object& out);
-
-  /* ArchiveFileEntry methods */
-  void Extract(const picojson::value& args, picojson::object& out);
-
-  /* Filesystem related method */
-  void FetchStorages(const picojson::value& args, picojson::object& out);
+  void ArchiveManagerOpen(const picojson::value& args, picojson::object& out);
+  void ArchiveManagerAbort(const picojson::value& args, picojson::object& out);
+
+  void ArchiveFileAdd(const picojson::value& args, picojson::object& out);
+  void ArchiveFileExtractAll(const picojson::value& args, picojson::object& out);
+  void ArchiveFileGetEntries(const picojson::value& args, picojson::object& out);
+  void ArchiveFileGetEntryByName(const picojson::value& args, picojson::object& out);
+  void ArchiveFileClose(const picojson::value& args, picojson::object& out);
+
+  void ArchiveFileEntryExtract(const picojson::value& args, picojson::object& out);
+
+  void ArchiveFetchStorages(const picojson::value& args, picojson::object& out);
 
   void PostError(const common::PlatformException& e, double callback_id);
   void PostError(const common::PlatformResult& e, double callback_id);
index f26311c..736f1f9 100755 (executable)
@@ -68,7 +68,7 @@ BadgeManager.prototype.setBadgeCount = function() {
         );
     }
 
-    var ret = native_.callSync('BadgeManager_setBadgeCount', {
+    var ret = native_.callSync('BadgeManagerSetBadgeCount', {
         appId: args.appId,
         count: args.count
     });
@@ -87,7 +87,7 @@ BadgeManager.prototype.getBadgeCount = function() {
         { name: 'appId', type: types_.STRING }
     ]);
 
-    var ret = native_.callSync('BadgeManager_getBadgeCount', {
+    var ret = native_.callSync('BadgeManagerGetBadgeCount', {
         appId: args.appId
     });
 
@@ -118,7 +118,7 @@ BadgeManager.prototype.addChangeListener = function() {
         }
     ]);
 
-    var result = native_.callSync('BadgeManager_addChangeListener', args);
+    var result = native_.callSync('BadgeManagerAddChangeListener', args);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -160,7 +160,7 @@ BadgeManager.prototype.removeChangeListener = function() {
         _badgeListenerRegistered = false;
     }
 
-    var result = native_.callSync('BadgeManager_removeChangeListener', args);
+    var result = native_.callSync('BadgeManagerRemoveChangeListener', args);
     if (native_.isFailure(result)) throw native_.getErrorObject(result);
 };
 
index b0ee45b..728a08b 100644 (file)
@@ -36,12 +36,18 @@ BadgeInstance::BadgeInstance() : manager_(*this) {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_SYNC(c, x) RegisterSyncHandler(c, std::bind(&BadgeInstance::x, this, _1, _2));
-  REGISTER_SYNC("BadgeManager_setBadgeCount", BadgeManagerSetBadgeCount);
-  REGISTER_SYNC("BadgeManager_addChangeListener", BadgeManagerAddChangeListener);
-  REGISTER_SYNC("BadgeManager_removeChangeListener", BadgeManagerRemoveChangeListener);
-  REGISTER_SYNC("BadgeManager_getBadgeCount", BadgeManagerGetBadgeCount);
-#undef REGISTER_SYNC
+
+
+#define REGISTER_METHOD(M) \
+    RegisterSyncHandler(#M, std::bind(&BadgeInstance::M, this, _1, _2))
+
+  REGISTER_METHOD(BadgeManagerSetBadgeCount);
+  REGISTER_METHOD(BadgeManagerAddChangeListener);
+  REGISTER_METHOD(BadgeManagerRemoveChangeListener);
+  REGISTER_METHOD(BadgeManagerGetBadgeCount);
+
+#undef REGISTER_METHOD
+
 }
 
 BadgeInstance::~BadgeInstance() {
index d641509..905fa1c 100755 (executable)
@@ -546,7 +546,7 @@ BluetoothSocket.prototype.writeData = function() {
         data: args.data
     };
 
-    var result = native.callSync('BluetoothSocket_writeData', callArgs);
+    var result = native.callSync('BluetoothSocketWriteData', callArgs);
 
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
@@ -562,7 +562,7 @@ BluetoothSocket.prototype.readData = function() {
         id: this._id
     };
 
-    var result = native.callSync('BluetoothSocket_readData', callArgs);
+    var result = native.callSync('BluetoothSocketReadData', callArgs);
 
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
@@ -579,7 +579,7 @@ BluetoothSocket.prototype.close = function() {
             id: this._id
         };
 
-        var result = native.callSync('BluetoothSocket_close', callArgs);
+        var result = native.callSync('BluetoothSocketClose', callArgs);
 
         if (native.isFailure(result)) {
             throw native.getErrorObject(result);
@@ -687,7 +687,7 @@ BluetoothLEDevice.prototype.connect = function() {
     };
     // Errors are handled by error callback
     var result = native.call(
-        'BluetoothLEDevice_connect',
+        'BluetoothLEDeviceConnect',
         { address: this.address },
         callback
     );
@@ -721,7 +721,7 @@ BluetoothLEDevice.prototype.disconnect = function() {
     };
 
     var result = native.call(
-        'BluetoothLEDevice_disconnect',
+        'BluetoothLEDeviceDisconnect',
         { address: this.address },
         callback
     );
@@ -744,7 +744,7 @@ BluetoothLEDevice.prototype.getService = function() {
         address: this.address
     };
 
-    var result = native.callSync('BluetoothLEDevice_getService', callArgs);
+    var result = native.callSync('BluetoothLEDeviceGetService', callArgs);
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
     } else {
@@ -759,7 +759,7 @@ BluetoothLEDevice.prototype.getServiceAllUuids = function() {
         address: this.address
     };
 
-    var result = native.callSync('BluetoothLEDevice_getServiceAllUuids', callArgs);
+    var result = native.callSync('BluetoothLEDeviceGetServiceAllUuids', callArgs);
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
     } else {
@@ -813,7 +813,7 @@ var BluetoothDevice = function(data) {
         callArgs.address = self.address;
         callArgs.field = field;
 
-        var result = native.callSync('BluetoothDevice_getBoolValue', callArgs);
+        var result = native.callSync('BluetoothDeviceGetBoolValue', callArgs);
 
         if (native.isFailure(result)) {
             return false;
@@ -905,7 +905,7 @@ BluetoothDevice.prototype.connectToServiceByUUID = function() {
     };
 
     var result = native.call(
-        'BluetoothDevice_connectToServiceByUUID',
+        'BluetoothDeviceConnectToServiceByUUID',
         callArgs,
         callback
     );
@@ -955,7 +955,7 @@ var BluetoothServiceHandler = function(data) {
             uuid: this.uuid
         };
 
-        var result = native.callSync('BluetoothAdapter_isServiceConnected', {
+        var result = native.callSync('BluetoothAdapterIsServiceConnected', {
             uuid: this.uuid
         });
 
@@ -1009,7 +1009,7 @@ BluetoothServiceHandler.prototype.unregister = function() {
         }
     };
 
-    var result = native.call('BluetoothServiceHandler_unregister', callArgs, callback);
+    var result = native.call('BluetoothServiceHandlerUnregister', callArgs, callback);
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
     }
@@ -1104,7 +1104,7 @@ BluetoothHealthApplication.prototype.unregister = function() {
         }
     };
 
-    var result = native.call('BluetoothHealthApplication_unregister', callArgs, callback);
+    var result = native.call('BluetoothHealthApplicationUnregister', callArgs, callback);
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
     }
@@ -1180,7 +1180,7 @@ BluetoothHealthProfileHandler.prototype.registerSinkApplication = function() {
     };
 
     var result = native.call(
-        'BluetoothHealthProfileHandler_registerSinkApp',
+        'BluetoothHealthProfileHandlerRegisterSinkApp',
         callArgs,
         callback
     );
@@ -1233,7 +1233,7 @@ BluetoothHealthProfileHandler.prototype.connectToSource = function() {
     };
 
     var result = native.call(
-        'BluetoothHealthProfileHandler_connectToSource',
+        'BluetoothHealthProfileHandlerConnectToSource',
         callArgs,
         callback
     );
@@ -1272,7 +1272,7 @@ BluetoothHealthChannel.prototype.close = function() {
             address: this.peer.address
         };
 
-        var result = native.callSync('BluetoothHealthChannel_close', callArgs);
+        var result = native.callSync('BluetoothHealthChannelClose', callArgs);
 
         if (native.isFailure(result)) {
             throw native.getErrorObject(result);
@@ -1299,7 +1299,7 @@ BluetoothHealthChannel.prototype.sendData = function() {
         data: args.data
     };
 
-    var result = native.callSync('BluetoothHealthChannel_sendData', callArgs);
+    var result = native.callSync('BluetoothHealthChannelSendData', callArgs);
 
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
@@ -1517,7 +1517,7 @@ BluetoothLEAdapter.prototype.startScan = function() {
         }
     ]);
 
-    var result = native.callSync('BluetoothLEAdapter_startScan', {});
+    var result = native.callSync('BluetoothLEAdapterStartScan', {});
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
     }
@@ -1530,7 +1530,7 @@ BluetoothLEAdapter.prototype.stopScan = function() {
 
     _bleScanListener.removeListener();
 
-    var result = native.callSync('BluetoothLEAdapter_stopScan', {});
+    var result = native.callSync('BluetoothLEAdapterStopScan', {});
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
     }
@@ -1594,7 +1594,7 @@ BluetoothLEAdapter.prototype.startAdvertise = function() {
         connectable: T.isNullOrUndefined(args.connectable) ? true : args.connectable
     };
 
-    var result = native.callSync('BluetoothLEAdapter_startAdvertise', callArgs);
+    var result = native.callSync('BluetoothLEAdapterStartAdvertise', callArgs);
 
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
@@ -1606,7 +1606,7 @@ BluetoothLEAdapter.prototype.startAdvertise = function() {
 BluetoothLEAdapter.prototype.stopAdvertise = function() {
     privUtils_.log('Entered BluetoothLEAdapter.stopAdvertise()');
 
-    var result = native.callSync('BluetoothLEAdapter_stopAdvertise', {});
+    var result = native.callSync('BluetoothLEAdapterStopAdvertise', {});
 
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
@@ -1621,7 +1621,7 @@ var BluetoothGATTService = function(data, address) {
     var address_ = address || data.address;
     function servicesGetter() {
         var services = [];
-        var result = native.callSync('BluetoothGATTService_getServices', {
+        var result = native.callSync('BluetoothGATTServiceGetServices', {
             handle: handle_,
             address: address_
         });
@@ -1635,7 +1635,7 @@ var BluetoothGATTService = function(data, address) {
     }
     function characteristicsGetter() {
         var characteristics = [];
-        var result = native.callSync('BluetoothGATTService_getCharacteristics', {
+        var result = native.callSync('BluetoothGATTServiceGetCharacteristics', {
             handle: handle_,
             uuid: uuid_,
             address: address_
@@ -1789,7 +1789,7 @@ var BluetoothGATTCharacteristic = function(data, address) {
 
         var callArgs = { handle: handle_, address: address_ };
 
-        var result = native.call('BluetoothGATT_readValue', callArgs, callback);
+        var result = native.call('BluetoothGATTServiceReadValue', callArgs, callback);
 
         if (native.isFailure(result)) {
             throw native.getErrorObject(result);
@@ -1832,7 +1832,7 @@ var BluetoothGATTCharacteristic = function(data, address) {
             address: address_
         };
 
-        var result = native.call('BluetoothGATT_writeValue', callArgs, callback);
+        var result = native.call('BluetoothGATTServiceWriteValue', callArgs, callback);
 
         if (native.isFailure(result)) {
             throw native.getErrorObject(result);
@@ -1989,8 +1989,8 @@ var _bluetoothGATTCharacteristicListener = _multipleListenerBuilder(
     function(listener, event) {
         listener(event);
     },
-    'BluetoothGATTCharacteristic_addValueChangeListener',
-    'BluetoothGATTCharacteristic_removeValueChangeListener',
+    'BluetoothGATTServiceAddValueChangeListener',
+    'BluetoothGATTServiceRemoveValueChangeListener',
     true
 );
 
@@ -1999,8 +1999,8 @@ var _bleConnectChangeListener = _multipleListenerBuilder(
     function(listener, event) {
         listener(event);
     },
-    'BluetoothLEDevice_addConnectStateChangeListener',
-    'BluetoothLEDevice_removeConnectStateChangeListener'
+    'BluetoothLEDeviceAddConnectStateChangeListener',
+    'BluetoothLEDeviceRemoveConnectStateChangeListener'
 );
 
 //class BluetoothGATTDescriptor ///////////////////////////
@@ -2035,7 +2035,7 @@ var BluetoothGATTDescriptor = function(data, address) {
 
         var callArgs = { handle: handle_, address: address_ };
 
-        var result = native.call('BluetoothGATT_readValue', callArgs, callback);
+        var result = native.call('BluetoothGATTServiceReadValue', callArgs, callback);
 
         if (native.isFailure(result)) {
             throw native.getErrorObject(result);
@@ -2078,7 +2078,7 @@ var BluetoothGATTDescriptor = function(data, address) {
             address: address_
         };
 
-        var result = native.call('BluetoothGATT_writeValue', callArgs, callback);
+        var result = native.call('BluetoothGATTServiceWriteValue', callArgs, callback);
 
         if (native.isFailure(result)) {
             throw native.getErrorObject(result);
@@ -2089,7 +2089,7 @@ var BluetoothGATTDescriptor = function(data, address) {
 // class BluetoothAdapter ///////////////////////////
 var BluetoothAdapter = function() {
     function nameGetter() {
-        var result = native.callSync('BluetoothAdapter_getName', {});
+        var result = native.callSync('BluetoothAdapterGetName', {});
 
         if (native.isFailure(result)) {
             return '';
@@ -2099,7 +2099,7 @@ var BluetoothAdapter = function() {
     }
 
     function addressGetter() {
-        var result = native.callSync('BluetoothAdapter_getAddress', {});
+        var result = native.callSync('BluetoothAdapterGetAddress', {});
 
         if (native.isFailure(result)) {
             return '';
@@ -2109,7 +2109,7 @@ var BluetoothAdapter = function() {
     }
 
     function poweredGetter() {
-        var result = native.callSync('BluetoothAdapter_getPowered', {});
+        var result = native.callSync('BluetoothAdapterGetPowered', {});
 
         if (native.isFailure(result)) {
             return false;
@@ -2119,7 +2119,7 @@ var BluetoothAdapter = function() {
     }
 
     function visibleGetter() {
-        var result = native.callSync('BluetoothAdapter_getVisible', {});
+        var result = native.callSync('BluetoothAdapterGetVisible', {});
 
         if (native.isFailure(result)) {
             return false;
@@ -2185,7 +2185,7 @@ BluetoothAdapter.prototype.setName = function() {
         }
     };
 
-    var result = native.call('BluetoothAdapter_setName', callArgs, callback);
+    var result = native.call('BluetoothAdapterSetName', callArgs, callback);
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
     }
@@ -2229,7 +2229,7 @@ BluetoothAdapter.prototype.setPowered = function() {
         }
     };
 
-    var result = native.call('BluetoothAdapter_setPowered', callArgs, callback);
+    var result = native.call('BluetoothAdapterSetPowered', callArgs, callback);
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
     }
@@ -2289,7 +2289,7 @@ BluetoothAdapter.prototype.setVisible = function() {
         }
     };
 
-    var result = native.call('BluetoothAdapter_setVisible', callArgs, callback);
+    var result = native.call('BluetoothAdapterSetVisible', callArgs, callback);
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
     }
@@ -2437,7 +2437,7 @@ BluetoothAdapter.prototype.discoverDevices = function() {
         _BluetoothDiscoverDevicesErrorCallback
     );
 
-    var result = native.callSync('BluetoothAdapter_discoverDevices', {});
+    var result = native.callSync('BluetoothAdapterDiscoverDevices', {});
 
     if (native.isFailure(result)) {
         native.removeListener(
@@ -2477,7 +2477,7 @@ BluetoothAdapter.prototype.stopDiscovery = function() {
         }
     };
 
-    var result = native.call('BluetoothAdapter_stopDiscovery', {}, callback);
+    var result = native.call('BluetoothAdapterStopDiscovery', {}, callback);
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
     }
@@ -2511,7 +2511,7 @@ BluetoothAdapter.prototype.getKnownDevices = function() {
         }
     };
 
-    var result = native.call('BluetoothAdapter_getKnownDevices', {}, callback);
+    var result = native.call('BluetoothAdapterGetKnownDevices', {}, callback);
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
     }
@@ -2545,7 +2545,7 @@ BluetoothAdapter.prototype.getDevice = function() {
     };
 
     var result = native.call(
-        'BluetoothAdapter_getDevice',
+        'BluetoothAdapterGetDevice',
         { address: args.address },
         callback
     );
@@ -2587,7 +2587,7 @@ BluetoothAdapter.prototype.createBonding = function() {
         }
     };
 
-    var result = native.call('BluetoothAdapter_createBonding', callArgs, callback);
+    var result = native.call('BluetoothAdapterCreateBonding', callArgs, callback);
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
     }
@@ -2626,7 +2626,7 @@ BluetoothAdapter.prototype.destroyBonding = function() {
         }
     };
 
-    var result = native.call('BluetoothAdapter_destroyBonding', callArgs, callback);
+    var result = native.call('BluetoothAdapterDestroyBonding', callArgs, callback);
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
     }
@@ -2671,7 +2671,7 @@ BluetoothAdapter.prototype.registerRFCOMMServiceByUUID = function() {
     };
 
     var result = native.call(
-        'BluetoothAdapter_registerRFCOMMServiceByUUID',
+        'BluetoothAdapterRegisterRFCOMMServiceByUUID',
         callArgs,
         callback
     );
@@ -2693,7 +2693,7 @@ BluetoothAdapter.prototype.getBluetoothProfileHandler = function() {
 
     var callArgs = { profileType: args.profileType };
 
-    var result = native.callSync('BluetoothAdapter_getBluetoothProfileHandler', callArgs);
+    var result = native.callSync('BluetoothAdapterGetBluetoothProfileHandler', callArgs);
 
     if (native.isFailure(result)) {
         throw native.getErrorObject(result);
index a3dd135..2af4a37 100644 (file)
@@ -41,128 +41,63 @@ BluetoothInstance::BluetoothInstance()
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_ASYNC(c, func) RegisterSyncHandler(c, func);
-#define REGISTER_SYNC(c, func) RegisterSyncHandler(c, func);
-
-  // BluetoothAdapter
-  REGISTER_ASYNC("BluetoothAdapter_setName",
-                 std::bind(&BluetoothAdapter::SetName, &bluetooth_adapter_, _1, _2));
-  REGISTER_ASYNC("BluetoothAdapter_setPowered",
-                 std::bind(&BluetoothAdapter::SetPowered, &bluetooth_adapter_, _1, _2));
-  REGISTER_ASYNC("BluetoothAdapter_setVisible",
-                 std::bind(&BluetoothAdapter::SetVisible, &bluetooth_adapter_, _1, _2));
-  REGISTER_SYNC("BluetoothAdapter_discoverDevices",
-                std::bind(&BluetoothAdapter::DiscoverDevices, &bluetooth_adapter_, _1, _2));
-  REGISTER_ASYNC("BluetoothAdapter_stopDiscovery",
-                 std::bind(&BluetoothAdapter::StopDiscovery, &bluetooth_adapter_, _1, _2));
-  REGISTER_ASYNC("BluetoothAdapter_getKnownDevices",
-                 std::bind(&BluetoothAdapter::GetKnownDevices, &bluetooth_adapter_, _1, _2));
-  REGISTER_ASYNC("BluetoothAdapter_getDevice",
-                 std::bind(&BluetoothAdapter::GetDevice, &bluetooth_adapter_, _1, _2));
-  REGISTER_ASYNC("BluetoothAdapter_createBonding",
-                 std::bind(&BluetoothAdapter::CreateBonding, &bluetooth_adapter_, _1, _2));
-  REGISTER_ASYNC("BluetoothAdapter_destroyBonding",
-                 std::bind(&BluetoothAdapter::DestroyBonding, &bluetooth_adapter_, _1, _2));
-  REGISTER_ASYNC(
-      "BluetoothAdapter_registerRFCOMMServiceByUUID",
-      std::bind(&BluetoothAdapter::RegisterRFCOMMServiceByUUID, &bluetooth_adapter_, _1, _2));
-  REGISTER_SYNC(
-      "BluetoothAdapter_getBluetoothProfileHandler",
-      std::bind(&BluetoothAdapter::GetBluetoothProfileHandler, &bluetooth_adapter_, _1, _2));
-  REGISTER_SYNC("BluetoothAdapter_getName",
-                std::bind(&BluetoothAdapter::GetName, &bluetooth_adapter_, _1, _2));
-  REGISTER_SYNC("BluetoothAdapter_getAddress",
-                std::bind(&BluetoothAdapter::GetAddress, &bluetooth_adapter_, _1, _2));
-  REGISTER_SYNC("BluetoothAdapter_getPowered",
-                std::bind(&BluetoothAdapter::GetPowered, &bluetooth_adapter_, _1, _2));
-  REGISTER_SYNC("BluetoothAdapter_getVisible",
-                std::bind(&BluetoothAdapter::GetVisible, &bluetooth_adapter_, _1, _2));
-  REGISTER_SYNC("BluetoothAdapter_isServiceConnected",
-                std::bind(&BluetoothAdapter::IsServiceConnected, &bluetooth_adapter_, _1, _2));
-
-  // BluetoothDevice
-  REGISTER_ASYNC("BluetoothDevice_connectToServiceByUUID",
-                 std::bind(&BluetoothDevice::ConnectToServiceByUUID, &bluetooth_device_, _1, _2));
-  REGISTER_SYNC("BluetoothDevice_getBoolValue",
-                std::bind(&BluetoothDevice::GetBoolValue, &bluetooth_device_, _1, _2));
-
-  // BluetoothHealthApplication
-  REGISTER_ASYNC(
-      "BluetoothHealthApplication_unregister",
-      std::bind(&BluetoothHealthApplication::Unregister, &bluetooth_health_application_, _1, _2));
-
-  // BluetoothHealthChannel
-  REGISTER_SYNC("BluetoothHealthChannel_close",
-                std::bind(&BluetoothHealthChannel::Close, &bluetooth_health_channel_, _1, _2));
-  REGISTER_SYNC("BluetoothHealthChannel_sendData",
-                std::bind(&BluetoothHealthChannel::SendData, &bluetooth_health_channel_, _1, _2));
-
-  // BluetoothHealthProfileHandler
-  REGISTER_ASYNC("BluetoothHealthProfileHandler_registerSinkApp",
-                 std::bind(&BluetoothHealthProfileHandler::RegisterSinkApp,
-                           &bluetooth_health_profile_handler_, _1, _2));
-  REGISTER_ASYNC("BluetoothHealthProfileHandler_connectToSource",
-                 std::bind(&BluetoothHealthProfileHandler::ConnectToSource,
-                           &bluetooth_health_profile_handler_, _1, _2));
-
-  // BluetoothServiceHandler
-  REGISTER_ASYNC(
-      "BluetoothServiceHandler_unregister",
-      std::bind(&BluetoothServiceHandler::Unregister, &bluetooth_service_handler_, _1, _2));
-
-  // BluetoothSocket
-  REGISTER_SYNC("BluetoothSocket_writeData",
-                std::bind(&BluetoothSocket::WriteData, &bluetooth_socket_, _1, _2));
-  REGISTER_SYNC("BluetoothSocket_readData",
-                std::bind(&BluetoothSocket::ReadData, &bluetooth_socket_, _1, _2));
-  REGISTER_SYNC("BluetoothSocket_close",
-                std::bind(&BluetoothSocket::Close, &bluetooth_socket_, _1, _2));
-
-  // BluetoothLEAdapter
-  REGISTER_SYNC("BluetoothLEAdapter_startScan",
-                std::bind(&BluetoothLEAdapter::StartScan, &bluetooth_le_adapter_, _1, _2));
-  REGISTER_SYNC("BluetoothLEAdapter_stopScan",
-                std::bind(&BluetoothLEAdapter::StopScan, &bluetooth_le_adapter_, _1, _2));
-  REGISTER_SYNC("BluetoothLEAdapter_startAdvertise",
-                std::bind(&BluetoothLEAdapter::StartAdvertise, &bluetooth_le_adapter_, _1, _2));
-  REGISTER_SYNC("BluetoothLEAdapter_stopAdvertise",
-                std::bind(&BluetoothLEAdapter::StopAdvertise, &bluetooth_le_adapter_, _1, _2));
-
-  // BluetoothLEDevice
-  REGISTER_ASYNC("BluetoothLEDevice_connect",
-                 std::bind(&BluetoothLEDevice::Connect, &bluetooth_le_device_, _1, _2));
-  REGISTER_ASYNC("BluetoothLEDevice_disconnect",
-                 std::bind(&BluetoothLEDevice::Disconnect, &bluetooth_le_device_, _1, _2));
-  REGISTER_SYNC("BluetoothLEDevice_getService",
-                std::bind(&BluetoothLEDevice::GetService, &bluetooth_le_device_, _1, _2));
-  REGISTER_SYNC(
-      "BluetoothLEDevice_addConnectStateChangeListener",
-      std::bind(&BluetoothLEDevice::AddConnectStateChangeListener, &bluetooth_le_device_, _1, _2));
-  REGISTER_SYNC("BluetoothLEDevice_removeConnectStateChangeListener",
-                std::bind(&BluetoothLEDevice::RemoveConnectStateChangeListener,
-                          &bluetooth_le_device_, _1, _2));
-  REGISTER_SYNC("BluetoothLEDevice_getServiceAllUuids",
-                std::bind(&BluetoothLEDevice::GetServiceAllUuids, &bluetooth_le_device_, _1, _2));
-
-  // BluetoothGATTService
-  REGISTER_SYNC("BluetoothGATTService_getServices",
-                std::bind(&BluetoothGATTService::GetServices, &bluetooth_gatt_service_, _1, _2));
-  REGISTER_SYNC(
-      "BluetoothGATTService_getCharacteristics",
-      std::bind(&BluetoothGATTService::GetCharacteristics, &bluetooth_gatt_service_, _1, _2));
-  REGISTER_SYNC("BluetoothGATT_readValue",
-                std::bind(&BluetoothGATTService::ReadValue, &bluetooth_gatt_service_, _1, _2));
-  REGISTER_SYNC("BluetoothGATT_writeValue",
-                std::bind(&BluetoothGATTService::WriteValue, &bluetooth_gatt_service_, _1, _2));
-  REGISTER_SYNC(
-      "BluetoothGATTCharacteristic_addValueChangeListener",
-      std::bind(&BluetoothGATTService::AddValueChangeListener, &bluetooth_gatt_service_, _1, _2));
-  REGISTER_SYNC("BluetoothGATTCharacteristic_removeValueChangeListener",
-                std::bind(&BluetoothGATTService::RemoveValueChangeListener,
-                          &bluetooth_gatt_service_, _1, _2));
-
-#undef REGISTER_ASYNC
-#undef REGISTER_SYNC
+#define REGISTER_METHOD(M) \
+    RegisterSyncHandler(#M, std::bind(&BluetoothInstance::M, this, _1, _2))
+
+  REGISTER_METHOD(BluetoothAdapterSetName);
+  REGISTER_METHOD(BluetoothAdapterSetPowered);
+  REGISTER_METHOD(BluetoothAdapterSetVisible);
+  REGISTER_METHOD(BluetoothAdapterDiscoverDevices);
+  REGISTER_METHOD(BluetoothAdapterStopDiscovery);
+  REGISTER_METHOD(BluetoothAdapterGetKnownDevices);
+  REGISTER_METHOD(BluetoothAdapterGetDevice);
+  REGISTER_METHOD(BluetoothAdapterCreateBonding);
+  REGISTER_METHOD(BluetoothAdapterDestroyBonding);
+  REGISTER_METHOD(BluetoothAdapterRegisterRFCOMMServiceByUUID);
+  REGISTER_METHOD(BluetoothAdapterGetBluetoothProfileHandler);
+  REGISTER_METHOD(BluetoothAdapterGetName);
+  REGISTER_METHOD(BluetoothAdapterGetAddress);
+  REGISTER_METHOD(BluetoothAdapterGetPowered);
+  REGISTER_METHOD(BluetoothAdapterGetVisible);
+  REGISTER_METHOD(BluetoothAdapterIsServiceConnected);
+
+  REGISTER_METHOD(BluetoothDeviceConnectToServiceByUUID);
+  REGISTER_METHOD(BluetoothDeviceGetBoolValue);
+
+  REGISTER_METHOD(BluetoothHealthApplicationUnregister);
+
+  REGISTER_METHOD(BluetoothHealthChannelClose);
+  REGISTER_METHOD(BluetoothHealthChannelSendData);
+
+  REGISTER_METHOD(BluetoothHealthProfileHandlerRegisterSinkApp);
+  REGISTER_METHOD(BluetoothHealthProfileHandlerConnectToSource);
+
+  REGISTER_METHOD(BluetoothServiceHandlerUnregister);
+
+  REGISTER_METHOD(BluetoothSocketWriteData);
+  REGISTER_METHOD(BluetoothSocketReadData);
+  REGISTER_METHOD(BluetoothSocketClose);
+
+  REGISTER_METHOD(BluetoothLEAdapterStartScan);
+  REGISTER_METHOD(BluetoothLEAdapterStopScan);
+  REGISTER_METHOD(BluetoothLEAdapterStartAdvertise);
+  REGISTER_METHOD(BluetoothLEAdapterStopAdvertise);
+
+  REGISTER_METHOD(BluetoothLEDeviceConnect);
+  REGISTER_METHOD(BluetoothLEDeviceDisconnect);
+  REGISTER_METHOD(BluetoothLEDeviceGetService);
+  REGISTER_METHOD(BluetoothLEDeviceAddConnectStateChangeListener);
+  REGISTER_METHOD(BluetoothLEDeviceRemoveConnectStateChangeListener);
+  REGISTER_METHOD(BluetoothLEDeviceGetServiceAllUuids);
+
+  REGISTER_METHOD(BluetoothGATTServiceGetServices);
+  REGISTER_METHOD(BluetoothGATTServiceGetCharacteristics);
+  REGISTER_METHOD(BluetoothGATTServiceReadValue);
+  REGISTER_METHOD(BluetoothGATTServiceWriteValue);
+  REGISTER_METHOD(BluetoothGATTServiceAddValueChangeListener);
+  REGISTER_METHOD(BluetoothGATTServiceRemoveValueChangeListener);
+
+#undef REGISTER_METHOD
 }
 
 BluetoothInstance::~BluetoothInstance() {
@@ -230,5 +165,220 @@ void BluetoothInstance::FireEvent(const std::string& event,
   FireEvent(event, *value.get());
 }
 
+void BluetoothInstance::BluetoothAdapterSetName(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_adapter_.SetName(args, out);
+}
+
+void BluetoothInstance::BluetoothAdapterSetPowered(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_adapter_.SetPowered(args, out);
+}
+
+void BluetoothInstance::BluetoothAdapterSetVisible(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_adapter_.SetVisible(args, out);
+}
+
+void BluetoothInstance::BluetoothAdapterDiscoverDevices(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_adapter_.DiscoverDevices(args, out);
+}
+
+void BluetoothInstance::BluetoothAdapterStopDiscovery(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_adapter_.StopDiscovery(args, out);
+}
+
+void BluetoothInstance::BluetoothAdapterGetKnownDevices(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_adapter_.GetKnownDevices(args, out);
+}
+
+void BluetoothInstance::BluetoothAdapterGetDevice(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_adapter_.GetDevice(args, out);
+}
+
+void BluetoothInstance::BluetoothAdapterCreateBonding(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_adapter_.CreateBonding(args, out);
+}
+
+void BluetoothInstance::BluetoothAdapterDestroyBonding(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_adapter_.DestroyBonding(args, out);
+}
+
+void BluetoothInstance::BluetoothAdapterRegisterRFCOMMServiceByUUID(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_adapter_.RegisterRFCOMMServiceByUUID(args, out);
+}
+
+void BluetoothInstance::BluetoothAdapterGetBluetoothProfileHandler(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_adapter_.GetBluetoothProfileHandler(args, out);
+}
+
+void BluetoothInstance::BluetoothAdapterGetName(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_adapter_.GetName(args, out);
+}
+
+void BluetoothInstance::BluetoothAdapterGetAddress(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_adapter_.GetAddress(args, out);
+}
+
+void BluetoothInstance::BluetoothAdapterGetPowered(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_adapter_.GetPowered(args, out);
+}
+
+void BluetoothInstance::BluetoothAdapterGetVisible(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_adapter_.GetVisible(args, out);
+}
+
+void BluetoothInstance::BluetoothAdapterIsServiceConnected(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_adapter_.IsServiceConnected(args, out);
+}
+
+void BluetoothInstance::BluetoothDeviceConnectToServiceByUUID(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_device_.ConnectToServiceByUUID(args, out);
+}
+
+void BluetoothInstance::BluetoothDeviceGetBoolValue(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_device_.GetBoolValue(args, out);
+}
+
+void BluetoothInstance::BluetoothHealthApplicationUnregister(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_health_application_.Unregister(args, out);
+}
+
+void BluetoothInstance::BluetoothHealthChannelClose(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_health_channel_.Close(args, out);
+}
+
+void BluetoothInstance::BluetoothHealthChannelSendData(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_health_channel_.SendData(args, out);
+}
+
+void BluetoothInstance::BluetoothHealthProfileHandlerRegisterSinkApp(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_health_profile_handler_.RegisterSinkApp(args, out);
+}
+
+void BluetoothInstance::BluetoothHealthProfileHandlerConnectToSource(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_health_profile_handler_.ConnectToSource(args, out);
+}
+
+void BluetoothInstance::BluetoothServiceHandlerUnregister(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_service_handler_.Unregister(args, out);
+}
+
+void BluetoothInstance::BluetoothSocketWriteData(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_socket_.WriteData(args, out);
+}
+
+void BluetoothInstance::BluetoothSocketReadData(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_socket_.ReadData(args, out);
+}
+
+void BluetoothInstance::BluetoothSocketClose(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_socket_.Close(args, out);
+}
+
+void BluetoothInstance::BluetoothLEAdapterStartScan(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_le_adapter_.StartScan(args, out);
+}
+
+void BluetoothInstance::BluetoothLEAdapterStopScan(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_le_adapter_.StopScan(args, out);
+}
+
+void BluetoothInstance::BluetoothLEAdapterStartAdvertise(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_le_adapter_.StartAdvertise(args, out);
+}
+
+void BluetoothInstance::BluetoothLEAdapterStopAdvertise(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_le_adapter_.StopAdvertise(args, out);
+}
+
+void BluetoothInstance::BluetoothLEDeviceConnect(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_le_device_.Connect(args, out);
+}
+
+void BluetoothInstance::BluetoothLEDeviceDisconnect(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_le_device_.Disconnect(args, out);
+}
+
+void BluetoothInstance::BluetoothLEDeviceGetService(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_le_device_.GetService(args, out);
+}
+
+void BluetoothInstance::BluetoothLEDeviceAddConnectStateChangeListener(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_le_device_.AddConnectStateChangeListener(args, out);
+}
+
+void BluetoothInstance::BluetoothLEDeviceRemoveConnectStateChangeListener(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_le_device_.RemoveConnectStateChangeListener(args, out);
+}
+
+void BluetoothInstance::BluetoothLEDeviceGetServiceAllUuids(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_le_device_.GetServiceAllUuids(args, out);
+}
+
+void BluetoothInstance::BluetoothGATTServiceGetServices(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_gatt_service_.GetServices(args, out);
+}
+
+void BluetoothInstance::BluetoothGATTServiceGetCharacteristics(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_gatt_service_.GetCharacteristics(args, out);
+}
+
+void BluetoothInstance::BluetoothGATTServiceReadValue(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_gatt_service_.ReadValue(args, out);
+}
+
+void BluetoothInstance::BluetoothGATTServiceWriteValue(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_gatt_service_.WriteValue(args, out);
+}
+
+void BluetoothInstance::BluetoothGATTServiceAddValueChangeListener(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_gatt_service_.AddValueChangeListener(args, out);
+}
+
+void BluetoothInstance::BluetoothGATTServiceRemoveValueChangeListener(const picojson::value& args, picojson::object& out) {
+  ScopeLogger();
+  bluetooth_gatt_service_.RemoveValueChangeListener(args, out);
+}
+
 }  // namespace bluetooth
 }  // namespace extension
index 6fb0023..b6d207b 100644 (file)
@@ -48,6 +48,55 @@ class BluetoothInstance : public common::ParsedInstance {
   void FireEvent(const std::string& event, const std::shared_ptr<picojson::value>& value);
 
  private:
+  void BluetoothAdapterSetName(const picojson::value& args, picojson::object& out);
+  void BluetoothAdapterSetPowered(const picojson::value& args, picojson::object& out);
+  void BluetoothAdapterSetVisible(const picojson::value& args, picojson::object& out);
+  void BluetoothAdapterDiscoverDevices(const picojson::value& args, picojson::object& out);
+  void BluetoothAdapterStopDiscovery(const picojson::value& args, picojson::object& out);
+  void BluetoothAdapterGetKnownDevices(const picojson::value& args, picojson::object& out);
+  void BluetoothAdapterGetDevice(const picojson::value& args, picojson::object& out);
+  void BluetoothAdapterCreateBonding(const picojson::value& args, picojson::object& out);
+  void BluetoothAdapterDestroyBonding(const picojson::value& args, picojson::object& out);
+  void BluetoothAdapterRegisterRFCOMMServiceByUUID(const picojson::value& args, picojson::object& out);
+  void BluetoothAdapterGetBluetoothProfileHandler(const picojson::value& args, picojson::object& out);
+  void BluetoothAdapterGetName(const picojson::value& args, picojson::object& out);
+  void BluetoothAdapterGetAddress(const picojson::value& args, picojson::object& out);
+  void BluetoothAdapterGetPowered(const picojson::value& args, picojson::object& out);
+  void BluetoothAdapterGetVisible(const picojson::value& args, picojson::object& out);
+  void BluetoothAdapterIsServiceConnected(const picojson::value& args, picojson::object& out);
+
+  void BluetoothDeviceConnectToServiceByUUID(const picojson::value& args, picojson::object& out);
+  void BluetoothDeviceGetBoolValue(const picojson::value& args, picojson::object& out);
+
+  void BluetoothHealthApplicationUnregister(const picojson::value& args, picojson::object& out);
+  void BluetoothHealthChannelClose(const picojson::value& args, picojson::object& out);
+  void BluetoothHealthChannelSendData(const picojson::value& args, picojson::object& out);
+  void BluetoothHealthProfileHandlerRegisterSinkApp(const picojson::value& args, picojson::object& out);
+  void BluetoothHealthProfileHandlerConnectToSource(const picojson::value& args, picojson::object& out);
+
+  void BluetoothServiceHandlerUnregister(const picojson::value& args, picojson::object& out);
+  void BluetoothSocketWriteData(const picojson::value& args, picojson::object& out);
+  void BluetoothSocketReadData(const picojson::value& args, picojson::object& out);
+  void BluetoothSocketClose(const picojson::value& args, picojson::object& out);
+
+  void BluetoothLEAdapterStartScan(const picojson::value& args, picojson::object& out);
+  void BluetoothLEAdapterStopScan(const picojson::value& args, picojson::object& out);
+  void BluetoothLEAdapterStartAdvertise(const picojson::value& args, picojson::object& out);
+  void BluetoothLEAdapterStopAdvertise(const picojson::value& args, picojson::object& out);
+  void BluetoothLEDeviceConnect(const picojson::value& args, picojson::object& out);
+  void BluetoothLEDeviceDisconnect(const picojson::value& args, picojson::object& out);
+  void BluetoothLEDeviceGetService(const picojson::value& args, picojson::object& out);
+  void BluetoothLEDeviceAddConnectStateChangeListener(const picojson::value& args, picojson::object& out);
+  void BluetoothLEDeviceRemoveConnectStateChangeListener(const picojson::value& args, picojson::object& out);
+  void BluetoothLEDeviceGetServiceAllUuids(const picojson::value& args, picojson::object& out);
+
+  void BluetoothGATTServiceGetServices(const picojson::value& args, picojson::object& out);
+  void BluetoothGATTServiceGetCharacteristics(const picojson::value& args, picojson::object& out);
+  void BluetoothGATTServiceReadValue(const picojson::value& args, picojson::object& out);
+  void BluetoothGATTServiceWriteValue(const picojson::value& args, picojson::object& out);
+  void BluetoothGATTServiceAddValueChangeListener(const picojson::value& args, picojson::object& out);
+  void BluetoothGATTServiceRemoveValueChangeListener(const picojson::value& args, picojson::object& out);
+
   BluetoothAdapter bluetooth_adapter_;
   BluetoothDevice bluetooth_device_;
   BluetoothHealthChannel bluetooth_health_channel_;
index cd57f51..8e9513f 100755 (executable)
@@ -109,7 +109,7 @@ BookmarkManager.prototype.remove = function() {
     ]);
 
     if (!arguments.length || args.bookmark === null) {
-        var result = native_.callSync('Bookmark_removeAll');
+        var result = native_.callSync('BookmarkRemoveAll');
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
         }
@@ -121,7 +121,7 @@ BookmarkManager.prototype.remove = function() {
     }
 
     var result = native_.isFailure(
-        native_.callSync('Bookmark_remove', { id: args.bookmark.id })
+        native_.callSync('BookmarkRemove', { id: args.bookmark.id })
     );
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -151,7 +151,7 @@ BookmarkProvider.prototype.addToFolder = function() {
             nullable: false
         }
     ]);
-    var ret = native_.callSync('Bookmark_add', {
+    var ret = native_.callSync('BookmarkAdd', {
         title: args.bookmark.title,
         url: String(args.bookmark.url),
         parentId: args.parentId,
@@ -181,7 +181,7 @@ BookmarkProvider.prototype.getFolder = function() {
     if (arguments.length === 0 || args.id <= 0) return null;
     if (args.id == this.getRootId()) return null;
 
-    var ret = native_.callSync('Bookmark_get', {
+    var ret = native_.callSync('BookmarkGet', {
         id: args.id,
         shouldGetItems: false
     });
@@ -217,7 +217,7 @@ BookmarkProvider.prototype.getFolderItems = function() {
         }
     ]);
 
-    var ret = native_.callSync('Bookmark_get', {
+    var ret = native_.callSync('BookmarkGet', {
         id: Number(args.id),
         shouldGetItems: true
     });
@@ -253,7 +253,7 @@ BookmarkProvider.prototype.getFolderItems = function() {
 };
 
 BookmarkProvider.prototype.getRootId = function() {
-    var ret = native_.callSync('Bookmark_getRootId');
+    var ret = native_.callSync('BookmarkGetRootId');
     if (native_.isFailure(ret)) {
         throw native_.getErrorObject(ret);
     }
index e7e3f2b..306fe98 100644 (file)
@@ -47,13 +47,16 @@ BookmarkInstance::BookmarkInstance() {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_SYNC(c, x) RegisterSyncHandler(c, std::bind(&BookmarkInstance::x, this, _1, _2));
-  REGISTER_SYNC("Bookmark_get", BookmarkGet);
-  REGISTER_SYNC("Bookmark_add", BookmarkAdd);
-  REGISTER_SYNC("Bookmark_remove", BookmarkRemove);
-  REGISTER_SYNC("Bookmark_removeAll", BookmarkRemoveAll);
-  REGISTER_SYNC("Bookmark_getRootId", BookmarkGetRootId);
-#undef REGISTER_SYNC
+#define REGISTER_METHOD(M) \
+    RegisterSyncHandler(#M, std::bind(&BookmarkInstance::M, this, _1, _2))
+
+  REGISTER_METHOD(BookmarkGet);
+  REGISTER_METHOD(BookmarkAdd);
+  REGISTER_METHOD(BookmarkRemove);
+  REGISTER_METHOD(BookmarkRemoveAll);
+  REGISTER_METHOD(BookmarkGetRootId);
+
+#undef REGISTER_METHOD
 
   if (bp_bookmark_adaptor_initialize()) {
     LoggerE("bp_bookmark_adaptor_initialize failed.");
index c1a7e96..3b438e0 100644 (file)
@@ -44,30 +44,28 @@ CalendarInstance::CalendarInstance() : calendar_(*this) {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_SYNC(c, x) RegisterSyncHandler(c, std::bind(&CalendarInstance::x, this, _1, _2));
-
-  // Calendar
-  REGISTER_SYNC("Calendar_get", CalendarGet);
-  REGISTER_SYNC("Calendar_add", CalendarAdd);
-  REGISTER_SYNC("Calendar_update", CalendarUpdate);
-  REGISTER_SYNC("Calendar_remove", CalendarRemove);
-  REGISTER_SYNC("Calendar_addChangeListener", CalendarAddChangeListener);
-  REGISTER_SYNC("Calendar_removeChangeListener", CalendarRemoveChangeListener);
-
-  // Calendar Manager
-  REGISTER_SYNC("CalendarManager_addCalendar", CalendarManagerAddCalendar);
-  REGISTER_SYNC("CalendarManager_getCalendar", CalendarManagerGetCalendar);
-  REGISTER_SYNC("CalendarManager_removeCalendar", CalendarManagerRemoveCalendar);
-#undef REGISTER_SYNC
-
-#define REGISTER_ASYNC(c, x) RegisterSyncHandler(c, std::bind(&CalendarInstance::x, this, _1, _2));
-  REGISTER_ASYNC("Calendar_addBatch", CalendarAddBatch);
-  REGISTER_ASYNC("Calendar_updateBatch", CalendarUpdateBatch);
-  REGISTER_ASYNC("Calendar_removeBatch", CalendarRemoveBatch);
-  REGISTER_ASYNC("Calendar_updateBatch", CalendarUpdateBatch);
-  REGISTER_ASYNC("CalendarManager_getCalendars", CalendarManagerGetCalendars);
-  REGISTER_ASYNC("Calendar_find", CalendarFind);
-#undef REGISTER_ASYNC
+#define REGISTER_METHOD(M) \
+    RegisterSyncHandler(#M, std::bind(&CalendarInstance::M, this, _1, _2))
+
+  REGISTER_METHOD(CalendarGet);
+  REGISTER_METHOD(CalendarAdd);
+  REGISTER_METHOD(CalendarUpdate);
+  REGISTER_METHOD(CalendarRemove);
+  REGISTER_METHOD(CalendarAddChangeListener);
+  REGISTER_METHOD(CalendarRemoveChangeListener);
+
+  REGISTER_METHOD(CalendarManagerAddCalendar);
+  REGISTER_METHOD(CalendarManagerGetCalendar);
+  REGISTER_METHOD(CalendarManagerRemoveCalendar);
+
+  REGISTER_METHOD(CalendarAddBatch);
+  REGISTER_METHOD(CalendarUpdateBatch);
+  REGISTER_METHOD(CalendarRemoveBatch);
+  REGISTER_METHOD(CalendarUpdateBatch);
+  REGISTER_METHOD(CalendarManagerGetCalendars);
+  REGISTER_METHOD(CalendarFind);
+
+#undef REGISTER_METHOD
 }
 
 CalendarInstance::~CalendarInstance() {
index 2d138ba..4c576e1 100755 (executable)
@@ -143,7 +143,7 @@ Calendar.prototype.get = function(id) {
         ]);
     }
 
-    var result = native_.callSync('Calendar_get', {
+    var result = native_.callSync('CalendarGet', {
         calendarId: this.id,
         id: args.id
     });
@@ -188,7 +188,7 @@ Calendar.prototype.add = function() {
     var tmp = _itemConverter.fromTizenObject(args.item);
     tmp.calendarId = this.id;
 
-    var result = native_.callSync('Calendar_add', {
+    var result = native_.callSync('CalendarAdd', {
         item: tmp,
         type: this.type
     });
@@ -278,7 +278,7 @@ Calendar.prototype.addBatch = function() {
     }
 
     var result = native_.call(
-        'Calendar_addBatch',
+        'CalendarAddBatch',
         {
             type: this.type,
             items: tmp
@@ -318,7 +318,7 @@ Calendar.prototype.update = function() {
     var tmp = _itemConverter.fromTizenObject(args.item);
     tmp.calendarId = this.id;
 
-    var result = native_.callSync('Calendar_update', {
+    var result = native_.callSync('CalendarUpdate', {
         item: tmp,
         type: this.type,
         updateAllInstances: args.has.updateAllInstances
@@ -400,7 +400,7 @@ Calendar.prototype.updateBatch = function() {
     }
 
     var result = native_.call(
-        'Calendar_updateBatch',
+        'CalendarUpdateBatch',
         {
             type: this.type,
             items: tmp,
@@ -438,7 +438,7 @@ Calendar.prototype.remove = function(id) {
         ]);
     }
 
-    var result = native_.callSync('Calendar_remove', {
+    var result = native_.callSync('CalendarRemove', {
         type: this.type,
         id: args.id
     });
@@ -478,7 +478,7 @@ Calendar.prototype.removeBatch = function() {
     };
 
     var result = native_.call(
-        'Calendar_removeBatch',
+        'CalendarRemoveBatch',
         {
             type: this.type,
             ids: args.ids
@@ -546,7 +546,7 @@ Calendar.prototype.find = function(successCallback, errorCallback, filter, sortM
         }
     };
     var result = native_.call(
-        'Calendar_find',
+        'CalendarFind',
         {
             calendarId: this.id,
             filter: args.filter,
@@ -665,7 +665,7 @@ Calendar.prototype.addChangeListener = function() {
     var listenerId = 'CalendarChangeCallback_' + this.type;
 
     if (!_nativeListeners.hasOwnProperty(listenerId)) {
-        var result = native_.callSync('Calendar_addChangeListener', {
+        var result = native_.callSync('CalendarAddChangeListener', {
             type: this.type,
             listenerId: listenerId
         });
@@ -725,7 +725,7 @@ var Calendar_removeChangeListener = function() {
         var fail = false;
         for (var listenerId in _nativeListeners) {
             if (_nativeListeners.hasOwnProperty(listenerId)) {
-                result = native_.callSync('Calendar_removeChangeListener', {
+                result = native_.callSync('CalendarRemoveChangeListener', {
                     type: _nativeListeners[listenerId]
                 });
                 if (native_.isFailure(result)) {
index 960a032..89ab831 100755 (executable)
@@ -59,7 +59,7 @@ CalendarManager.prototype.getCalendars = function() {
         }
     };
 
-    var result = native_.call('CalendarManager_getCalendars', callArgs, callback);
+    var result = native_.call('CalendarManagerGetCalendars', callArgs, callback);
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
     }
@@ -126,7 +126,7 @@ var CalendarManagerGetCalendar = function() {
         id: args.id
     };
 
-    var result = native_.callSync('CalendarManager_getCalendar', callArgs);
+    var result = native_.callSync('CalendarManagerGetCalendar', callArgs);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -154,7 +154,7 @@ CalendarManager.prototype.addCalendar = function() {
         type: args.calendar.type
     };
 
-    var result = native_.callSync('CalendarManager_addCalendar', callArgs);
+    var result = native_.callSync('CalendarManagerAddCalendar', callArgs);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -183,7 +183,7 @@ CalendarManager.prototype.removeCalendar = function() {
         id: args.id
     };
 
-    var result = native_.callSync('CalendarManager_removeCalendar', callArgs);
+    var result = native_.callSync('CalendarManagerRemoveCalendar', callArgs);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
index f930b97..10f4356 100755 (executable)
@@ -166,7 +166,7 @@ CallHistory.prototype.find = function() {
     callArgs.limit = args.limit;
     callArgs.offset = args.offset;
 
-    var result = native_.call('CallHistory_find', callArgs, callback);
+    var result = native_.call('CallHistoryFind', callArgs, callback);
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
     }
@@ -184,7 +184,7 @@ CallHistory.prototype.remove = function() {
     var callArgs = {};
     callArgs.uid = args.entry.uid;
 
-    var result = native_.callSync('CallHistory_remove', callArgs);
+    var result = native_.callSync('CallHistoryRemove', callArgs);
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
     }
@@ -225,7 +225,7 @@ CallHistory.prototype.removeBatch = function() {
     var callArgs = {};
     callArgs.uid = uid;
 
-    var result = native_.call('CallHistory_removeBatch', callArgs, callback);
+    var result = native_.call('CallHistoryRemoveBatch', callArgs, callback);
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
     }
@@ -255,7 +255,7 @@ CallHistory.prototype.removeAll = function() {
         }
     };
 
-    var result = native_.call('CallHistory_removeAll', {}, callback);
+    var result = native_.call('CallHistoryRemoveAll', {}, callback);
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
     }
@@ -271,7 +271,7 @@ CallHistory.prototype.addChangeListener = function() {
     ]);
 
     if (T_.isEmptyObject(callHistoryChangeListener.listeners)) {
-        var result = native_.callSync('CallHistory_addChangeListener');
+        var result = native_.callSync('CallHistoryAddChangeListener');
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
         }
@@ -295,7 +295,7 @@ function removeChangeListener() {
     callHistoryChangeListener.removeListener(args.watchId);
 
     if (T_.isEmptyObject(callHistoryChangeListener.listeners)) {
-        var result = native_.callSync('CallHistory_removeChangeListener');
+        var result = native_.callSync('CallHistoryRemoveChangeListener');
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
         }
@@ -324,7 +324,7 @@ function RemoteParty(data) {
 function CallHistoryEntry(data) {
     function directionSetter(val) {
         if (direction === 'MISSEDNEW' && val === 'MISSED') {
-            var result = native_.callSync('CallHistory_setMissedDirection', {
+            var result = native_.callSync('CallHistorySetMissedDirection', {
                 uid: this.uid
             });
             if (native_.isSuccess(result)) {
index bcadb8a..e8ba341 100644 (file)
@@ -37,33 +37,33 @@ CallHistoryInstance::CallHistoryInstance() : history_(*this) {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_SYNC(c, x) \
-  RegisterSyncHandler(c, std::bind(&CallHistoryInstance::x, this, _1, _2));
-  REGISTER_SYNC("CallHistory_remove", Remove);
-  REGISTER_SYNC("CallHistory_addChangeListener", AddChangeListener);
-  REGISTER_SYNC("CallHistory_removeChangeListener", RemoveChangeListener);
-  REGISTER_SYNC("CallHistory_setMissedDirection", SetMissedDirection);
-#undef REGISTER_SYNC
-#define REGISTER_ASYNC(c, x) \
-  RegisterSyncHandler(c, std::bind(&CallHistoryInstance::x, this, _1, _2));
-  REGISTER_ASYNC("CallHistory_find", Find);
-  REGISTER_ASYNC("CallHistory_removeBatch", RemoveBatch);
-  REGISTER_ASYNC("CallHistory_removeAll", RemoveAll);
-#undef REGISTER_ASYNC
+#define REGISTER_METHOD(M) \
+    RegisterSyncHandler(#M, std::bind(&CallHistoryInstance::M, this, _1, _2))
+
+  REGISTER_METHOD(CallHistoryRemove);
+  REGISTER_METHOD(CallHistoryAddChangeListener);
+  REGISTER_METHOD(CallHistoryRemoveChangeListener);
+  REGISTER_METHOD(CallHistorySetMissedDirection);
+
+  REGISTER_METHOD(CallHistoryFind);
+  REGISTER_METHOD(CallHistoryRemoveBatch);
+  REGISTER_METHOD(CallHistoryRemoveAll);
+
+#undef REGISTER_METHOD
 }
 
 CallHistoryInstance::~CallHistoryInstance() {
   ScopeLogger();
 }
 
-void CallHistoryInstance::Find(const picojson::value& args, picojson::object& out) {
+void CallHistoryInstance::CallHistoryFind(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeCallHistoryRead, &out);
   history_.find(args.get<picojson::object>());
   ReportSuccess(out);
 }
 
-void CallHistoryInstance::Remove(const picojson::value& args, picojson::object& out) {
+void CallHistoryInstance::CallHistoryRemove(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeCallHistoryWrite, &out);
   PlatformResult result = history_.remove(args.get<picojson::object>());
@@ -74,7 +74,7 @@ void CallHistoryInstance::Remove(const picojson::value& args, picojson::object&
   }
 }
 
-void CallHistoryInstance::RemoveBatch(const picojson::value& args, picojson::object& out) {
+void CallHistoryInstance::CallHistoryRemoveBatch(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeCallHistoryWrite, &out);
   PlatformResult result = history_.removeBatch(args.get<picojson::object>());
@@ -85,14 +85,14 @@ void CallHistoryInstance::RemoveBatch(const picojson::value& args, picojson::obj
   }
 }
 
-void CallHistoryInstance::RemoveAll(const picojson::value& args, picojson::object& out) {
+void CallHistoryInstance::CallHistoryRemoveAll(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeCallHistoryWrite, &out);
   history_.removeAll(args.get<picojson::object>());
   ReportSuccess(out);
 }
 
-void CallHistoryInstance::AddChangeListener(const picojson::value& args, picojson::object& out) {
+void CallHistoryInstance::CallHistoryAddChangeListener(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeCallHistoryRead, &out);
   PlatformResult result = history_.startCallHistoryChangeListener();
@@ -103,7 +103,7 @@ void CallHistoryInstance::AddChangeListener(const picojson::value& args, picojso
   }
 }
 
-void CallHistoryInstance::RemoveChangeListener(const picojson::value& args, picojson::object& out) {
+void CallHistoryInstance::CallHistoryRemoveChangeListener(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
   CHECK_PRIVILEGE_ACCESS(kPrivilegeCallHistoryRead, &out);
   PlatformResult result = history_.stopCallHistoryChangeListener();
@@ -114,7 +114,7 @@ void CallHistoryInstance::RemoveChangeListener(const picojson::value& args, pico
   }
 }
 
-void CallHistoryInstance::SetMissedDirection(const picojson::value& args, picojson::object& out) {
+void CallHistoryInstance::CallHistorySetMissedDirection(const picojson::value& args, picojson::object& out) {
   ScopeLogger();
 
   if (!args.contains("uid")) {
index 06e93f7..eda114b 100644 (file)
@@ -19,13 +19,13 @@ class CallHistoryInstance : public common::ParsedInstance {
   void CallHistoryChange(picojson::object& data);
 
  private:
-  void Find(const picojson::value& args, picojson::object& out);
-  void Remove(const picojson::value& args, picojson::object& out);
-  void RemoveBatch(const picojson::value& args, picojson::object& out);
-  void RemoveAll(const picojson::value& args, picojson::object& out);
-  void AddChangeListener(const picojson::value& args, picojson::object& out);
-  void RemoveChangeListener(const picojson::value& args, picojson::object& out);
-  void SetMissedDirection(const picojson::value& args, picojson::object& out);
+  void CallHistoryFind(const picojson::value& args, picojson::object& out);
+  void CallHistoryRemove(const picojson::value& args, picojson::object& out);
+  void CallHistoryRemoveBatch(const picojson::value& args, picojson::object& out);
+  void CallHistoryRemoveAll(const picojson::value& args, picojson::object& out);
+  void CallHistoryAddChangeListener(const picojson::value& args, picojson::object& out);
+  void CallHistoryRemoveChangeListener(const picojson::value& args, picojson::object& out);
+  void CallHistorySetMissedDirection(const picojson::value& args, picojson::object& out);
 
   CallHistory history_;
 };
index 939aaf0..3b3b1e6 100644 (file)
@@ -66,50 +66,46 @@ ContactInstance::ContactInstance() : current_state_(0), is_listening_(false) {
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_SYNC(c, x) RegisterSyncHandler(c, std::bind(&ContactInstance::x, this, _1, _2));
-#define REGISTER_ASYNC(c, x) RegisterSyncHandler(c, std::bind(&ContactInstance::x, this, _1, _2));
-
-  // Contact Manager
-  REGISTER_ASYNC("ContactManager_getAddressBooks", ContactManagerGetAddressBooks);
-  REGISTER_SYNC("ContactManager_getAddressBook", ContactManagerGetAddressBook);
-  REGISTER_SYNC("ContactManager_addAddressBook", ContactManagerAddAddressBook);
-  REGISTER_SYNC("ContactManager_removeAddressBook", ContactManagerRemoveAddressBook);
-  REGISTER_SYNC("ContactManager_get", ContactManagerGet);
-  REGISTER_SYNC("ContactManager_update", ContactManagerUpdate);
-  REGISTER_ASYNC("ContactManager_updateBatch", ContactManagerUpdateBatch);
-  REGISTER_SYNC("ContactManager_remove", ContactManagerRemove);
-  REGISTER_ASYNC("ContactManager_removeBatch", ContactManagerRemoveBatch);
-  REGISTER_ASYNC("ContactManager_find", ContactManagerFind);
-  REGISTER_ASYNC("ContactManager_findByUsageCount", ContactManagerFindByUsageCount);
-  REGISTER_SYNC("ContactManager_importFromVCard", ContactManagerImportFromVCard);
-  REGISTER_SYNC("ContactManager_startListening", ContactManagerStartListening);
-  REGISTER_SYNC("ContactManager_stopListening", ContactManagerStopListening);
-
-  // AddressBook
-  REGISTER_ASYNC("AddressBook_addBatch", AddressBookAddBatch);
-  REGISTER_ASYNC("AddressBook_updateBatch", AddressBookUpdateBatch);
-  REGISTER_ASYNC("AddressBook_removeBatch", AddressBookRemoveBatch);
-  REGISTER_SYNC("AddressBook_get", AddressBookGet);
-  REGISTER_SYNC("AddressBook_add", AddressBookAdd);
-  REGISTER_SYNC("AddressBook_update", AddressBookUpdate);
-  REGISTER_SYNC("AddressBook_remove", AddressBookRemove);
-  REGISTER_ASYNC("AddressBook_find", AddressBookFind);
-  REGISTER_SYNC("AddressBook_addGroup", AddressBookAddGroup);
-  REGISTER_SYNC("AddressBook_getGroup", AddressBookGetGroup);
-  REGISTER_SYNC("AddressBook_updateGroup", AddressBookUpdateGroup);
-  REGISTER_SYNC("AddressBook_removeGroup", AddressBookRemoveGroup);
-  REGISTER_SYNC("AddressBook_getGroups", AddressBookGetGroups);
-  REGISTER_SYNC("AddressBook_startListening", AddressBookStartListening);
-  REGISTER_SYNC("AddressBook_stopListening", AddressBookStopListening);
-
-  // Person
-  REGISTER_SYNC("Person_link", PersonLink);
-  REGISTER_SYNC("Person_unlink", PersonUnlink);
-  REGISTER_SYNC("Person_getUsageCount", PersonGetUsageCount);
-  REGISTER_SYNC("Person_resetUsageCount", PersonResetUsageCount);
-
-#undef REGISTER_SYNC
-#undef REGISTER_ASYNC
+#define REGISTER_METHOD(M) \
+    RegisterSyncHandler(#M, std::bind(&ContactInstance::M, this, _1, _2))
+
+  REGISTER_METHOD(ContactManagerGetAddressBooks);
+  REGISTER_METHOD(ContactManagerGetAddressBook);
+  REGISTER_METHOD(ContactManagerAddAddressBook);
+  REGISTER_METHOD(ContactManagerRemoveAddressBook);
+  REGISTER_METHOD(ContactManagerGet);
+  REGISTER_METHOD(ContactManagerUpdate);
+  REGISTER_METHOD(ContactManagerUpdateBatch);
+  REGISTER_METHOD(ContactManagerRemove);
+  REGISTER_METHOD(ContactManagerRemoveBatch);
+  REGISTER_METHOD(ContactManagerFind);
+  REGISTER_METHOD(ContactManagerFindByUsageCount);
+  REGISTER_METHOD(ContactManagerImportFromVCard);
+  REGISTER_METHOD(ContactManagerStartListening);
+  REGISTER_METHOD(ContactManagerStopListening);
+
+  REGISTER_METHOD(AddressBookAddBatch);
+  REGISTER_METHOD(AddressBookUpdateBatch);
+  REGISTER_METHOD(AddressBookRemoveBatch);
+  REGISTER_METHOD(AddressBookGet);
+  REGISTER_METHOD(AddressBookAdd);
+  REGISTER_METHOD(AddressBookUpdate);
+  REGISTER_METHOD(AddressBookRemove);
+  REGISTER_METHOD(AddressBookFind);
+  REGISTER_METHOD(AddressBookAddGroup);
+  REGISTER_METHOD(AddressBookGetGroup);
+  REGISTER_METHOD(AddressBookUpdateGroup);
+  REGISTER_METHOD(AddressBookRemoveGroup);
+  REGISTER_METHOD(AddressBookGetGroups);
+  REGISTER_METHOD(AddressBookStartListening);
+  REGISTER_METHOD(AddressBookStopListening);
+
+  REGISTER_METHOD(PersonLink);
+  REGISTER_METHOD(PersonUnlink);
+  REGISTER_METHOD(PersonGetUsageCount);
+  REGISTER_METHOD(PersonResetUsageCount);
+
+#undef REGISTER_METHOD
 }
 
 ContactInstance::~ContactInstance() {
index e8f45fd..73853d8 100755 (executable)
@@ -214,7 +214,7 @@ AddressBook.prototype.get = function() {
         throw new WebAPIException(WebAPIException.INVALID_VALUES_ERR);
     }
 
-    var result = native_.callSync('AddressBook_get', {
+    var result = native_.callSync('AddressBookGet', {
         id: args.id
     });
 
@@ -236,7 +236,7 @@ AddressBook.prototype.add = function() {
         }
     ]);
 
-    var result = native_.callSync('AddressBook_add', {
+    var result = native_.callSync('AddressBookAdd', {
         addressBookId: this.id,
         contact: _toJsonObject(args.contact)
     });
@@ -316,7 +316,7 @@ AddressBook.prototype.addBatch = function() {
     };
 
     var result = native_.call(
-        'AddressBook_addBatch',
+        'AddressBookAddBatch',
         {
             addressBookId: this.id,
             batchArgs: _toJsonObject(args.contacts)
@@ -344,7 +344,7 @@ AddressBook.prototype.update = function() {
         throw new WebAPIException(WebAPIException.INVALID_VALUES_ERR);
     }
 
-    var result = native_.callSync('AddressBook_update', {
+    var result = native_.callSync('AddressBookUpdate', {
         contact: _toJsonObject(args.contact)
     });
 
@@ -423,7 +423,7 @@ AddressBook.prototype.updateBatch = function() {
     });
 
     var result = native_.call(
-        'AddressBook_updateBatch',
+        'AddressBookUpdateBatch',
         {
             batchArgs: _toJsonObject(args.contacts)
         },
@@ -450,7 +450,7 @@ AddressBook.prototype.remove = function() {
         throw new WebAPIException(WebAPIException.INVALID_VALUES_ERR);
     }
 
-    var result = native_.callSync('AddressBook_remove', {
+    var result = native_.callSync('AddressBookRemove', {
         id: args.id
     });
 
@@ -492,7 +492,7 @@ AddressBook.prototype.removeBatch = function(ids, successCallback, errorCallback
     };
 
     var result = native_.call(
-        'AddressBook_removeBatch',
+        'AddressBookRemoveBatch',
         {
             batchArgs: args.ids
         },
@@ -556,7 +556,7 @@ AddressBook.prototype.find = function(successCallback, errorCallback, filter, so
     };
 
     var result = native_.call(
-        'AddressBook_find',
+        'AddressBookFind',
         {
             addressBookId: this.id,
             filter: utils_.repackFilter(filter),
@@ -589,7 +589,7 @@ AddressBook.prototype.addChangeListener = function() {
 
     // always on first registration checking privileges is done
     if (type_.isEmptyObject(_contactCallbackMap)) {
-        var result = native_.callSync('AddressBook_startListening', {});
+        var result = native_.callSync('AddressBookStartListening', {});
 
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
@@ -652,7 +652,7 @@ var AddressBook_removeChangeListener = function(watchId) {
         native_.removeListener('ContactChangeListener', _contactChangeListener);
         _contactListenerRegistered = false;
 
-        var result = native_.callSync('AddressBook_stopListening', {});
+        var result = native_.callSync('AddressBookStopListening', {});
 
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
@@ -679,7 +679,7 @@ AddressBook.prototype.getGroup = function() {
         throw new WebAPIException(WebAPIException.INVALID_VALUES_ERR);
     }
 
-    var result = native_.callSync('AddressBook_getGroup', {
+    var result = native_.callSync('AddressBookGetGroup', {
         addressBookId: this.id,
         id: args.groupId
     });
@@ -703,7 +703,7 @@ AddressBook.prototype.addGroup = function() {
         }
     ]);
 
-    var result = native_.callSync('AddressBook_addGroup', {
+    var result = native_.callSync('AddressBookAddGroup', {
         addressBookId: this.id,
         group: args.group
     });
@@ -729,7 +729,7 @@ AddressBook.prototype.updateGroup = function() {
         }
     ]);
 
-    var result = native_.callSync('AddressBook_updateGroup', {
+    var result = native_.callSync('AddressBookUpdateGroup', {
         addressBookId: this.id,
         group: args.group
     });
@@ -753,7 +753,7 @@ AddressBook.prototype.removeGroup = function() {
         throw new WebAPIException(WebAPIException.INVALID_VALUES_ERR);
     }
 
-    var result = native_.callSync('AddressBook_removeGroup', {
+    var result = native_.callSync('AddressBookRemoveGroup', {
         addressBookId: this.id,
         id: args.groupId
     });
@@ -763,7 +763,7 @@ AddressBook.prototype.removeGroup = function() {
 };
 
 AddressBook.prototype.getGroups = function() {
-    var result = native_.callSync('AddressBook_getGroups', { addressBook: this });
+    var result = native_.callSync('AddressBookGetGroups', { addressBook: this });
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
     }
index dcdd7de..dc909a9 100755 (executable)
@@ -19,7 +19,7 @@ var Contact = function(data) {
 
     var _forceEditMode = false;
     if (type_.isString(data)) {
-        var result = native_.callSync('ContactManager_importFromVCard', {
+        var result = native_.callSync('ContactManagerImportFromVCard', {
             contact: data
         });
         _checkError(result);
index 78f0a1d..2b3a522 100755 (executable)
@@ -82,7 +82,7 @@ ContactManager.prototype.getAddressBooks = function() {
         }
     };
 
-    var result = native_.call('ContactManager_getAddressBooks', {}, callback);
+    var result = native_.call('ContactManagerGetAddressBooks', {}, callback);
 
     _checkError(result);
 };
@@ -126,7 +126,7 @@ ContactManager.prototype.getAddressBook = function() {
         throw new WebAPIException(WebAPIException.NOT_FOUND_ERR);
     }
 
-    var result = native_.callSync('ContactManager_getAddressBook', {
+    var result = native_.callSync('ContactManagerGetAddressBook', {
         addressBookId: args.addressBookId
     });
 
@@ -156,7 +156,7 @@ ContactManager.prototype.addAddressBook = function() {
         }
     ]);
 
-    var result = native_.callSync('ContactManager_addAddressBook', {
+    var result = native_.callSync('ContactManagerAddAddressBook', {
         addressBook: args.addressBook
     });
 
@@ -203,7 +203,7 @@ ContactManager.prototype.removeAddressBook = function() {
         );
     }
 
-    var result = native_.callSync('ContactManager_removeAddressBook', {
+    var result = native_.callSync('ContactManagerRemoveAddressBook', {
         addressBookId: args.addressBookId
     });
 
@@ -229,7 +229,7 @@ ContactManager.prototype.get = function() {
         throw new WebAPIException(WebAPIException.INVALID_VALUES_ERR);
     }
 
-    var result = native_.callSync('ContactManager_get', {
+    var result = native_.callSync('ContactManagerGet', {
         personId: args.personId
     });
     _checkError(result);
@@ -251,7 +251,7 @@ var ContactManagerUpdate = function() {
             nullable: false
         }
     ]);
-    var result = native_.callSync('ContactManager_update', { person: args.person });
+    var result = native_.callSync('ContactManagerUpdate', { person: args.person });
     _checkError(result);
 
     result = native_.getResultObject(result);
@@ -300,7 +300,7 @@ ContactManager.prototype.updateBatch = function() {
     };
 
     var result = native_.call(
-        'ContactManager_updateBatch',
+        'ContactManagerUpdateBatch',
         {
             addressBook: {},
             batchArgs: _toJsonObject(args.persons)
@@ -328,7 +328,7 @@ ContactManager.prototype.remove = function() {
         throw new WebAPIException(WebAPIException.INVALID_VALUES_ERR);
     }
 
-    var result = native_.callSync('ContactManager_remove', { personId: args.personId });
+    var result = native_.callSync('ContactManagerRemove', { personId: args.personId });
     _checkError(result);
 };
 
@@ -366,7 +366,7 @@ ContactManager.prototype.removeBatch = function() {
     };
 
     var result = native_.call(
-        'ContactManager_removeBatch',
+        'ContactManagerRemoveBatch',
         {
             addressBook: {},
             batchArgs: _toJsonObject(args.personIds)
@@ -436,7 +436,7 @@ ContactManager.prototype.find = function() {
         }
     };
 
-    var result = native_.call('ContactManager_find', data, callback);
+    var result = native_.call('ContactManagerFind', data, callback);
 
     _checkError(result);
 };
@@ -508,7 +508,7 @@ ContactManager.prototype.findByUsageCount = function() {
         }
     };
 
-    var result = native_.call('ContactManager_findByUsageCount', data, callback);
+    var result = native_.call('ContactManagerFindByUsageCount', data, callback);
 
     _checkError(result);
 };
@@ -526,7 +526,7 @@ ContactManager.prototype.addChangeListener = function() {
     ]);
 
     if (type_.isEmptyObject(_personCallbackMap)) {
-        var result = native_.callSync('ContactManager_startListening', {});
+        var result = native_.callSync('ContactManagerStartListening', {});
 
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
@@ -586,7 +586,7 @@ var ContactManager_removeChangeListener = function() {
         native_.removeListener('ContactPersonChangeListener', _personChangeListener);
         _personListenerRegistered = false;
 
-        var result = native_.callSync('ContactManager_stopListening', {});
+        var result = native_.callSync('ContactManagerStopListening', {});
 
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
index edcf84b..e3f86e7 100755 (executable)
@@ -154,7 +154,7 @@ Person.prototype.link = function() {
         throw new WebAPIException(WebAPIException.INVALID_VALUES_ERR);
     }
 
-    var result = native_.callSync('Person_link', {
+    var result = native_.callSync('PersonLink', {
         personId: this.id,
         id: args.personId
     });
@@ -183,7 +183,7 @@ Person.prototype.unlink = function(contactId) {
         throw new WebAPIException(WebAPIException.INVALID_VALUES_ERR);
     }
 
-    var result = native_.callSync('Person_unlink', {
+    var result = native_.callSync('PersonUnlink', {
         personId: this.id,
         id: args.contactId
     });
@@ -212,7 +212,7 @@ Person.prototype.getUsageCount = function() {
 
     var usage_type = args.usage_type === undefined ? null : args.usage_type;
 
-    var result = native_.callSync('Person_getUsageCount', {
+    var result = native_.callSync('PersonGetUsageCount', {
         personId: this.id,
         usage_type: usage_type
     });
@@ -238,7 +238,7 @@ Person.prototype.resetUsageCount = function() {
 
     var usage_type = args.usage_type === undefined ? null : args.usage_type;
 
-    var result = native_.callSync('Person_resetUsageCount', {
+    var result = native_.callSync('PersonResetUsageCount', {
         personId: this.id,
         usage_type: usage_type
     });
index bc75361..884ecfd 100644 (file)
@@ -56,38 +56,40 @@ ContentInstance::ContentInstance()
   using std::placeholders::_1;
   using std::placeholders::_2;
 
-#define REGISTER_SYNC(c, x) RegisterSyncHandler(c, std::bind(&ContentInstance::x, this, _1, _2));
-
-  REGISTER_SYNC("ContentManager_find", ContentManagerFind);
-  REGISTER_SYNC("ContentManager_update", ContentManagerUpdate);
-  REGISTER_SYNC("ContentManager_scanFile", ContentManagerScanfile);
-  REGISTER_SYNC("ContentManager_scanDirectory", ContentManagerScanDirectory);
-  REGISTER_SYNC("ContentManager_cancelScanDirectory", ContentManagerCancelScanDirectory);
-  REGISTER_SYNC("ContentManager_addChangeListener", ContentManagerAddChangeListener);
-  REGISTER_SYNC("ContentManager_removeChangeListener", ContentManagerRemoveChangeListener);
-  REGISTER_SYNC("ContentManager_unsetChangeListener", ContentManagerUnsetchangelistener);
-  REGISTER_SYNC("ContentManager_setChangeListener", ContentManagerSetchangelistener);
-  REGISTER_SYNC("ContentManager_getDirectories", ContentManagerGetdirectories);
-  REGISTER_SYNC("ContentManager_updateBatch", ContentManagerUpdatebatch);
-  REGISTER_SYNC("ContentManager_removePlaylist", ContentManagerRemoveplaylist);
-  REGISTER_SYNC("ContentManager_createPlaylist", ContentManagerCreateplaylist);
-  REGISTER_SYNC("ContentManager_getPlaylists", ContentManagerGetplaylists);
-  REGISTER_SYNC("ContentPlaylist_add", ContentManagerPlaylistAdd);
-  REGISTER_SYNC("ContentPlaylist_addBatch", ContentManagerPlaylistAddbatch);
-  REGISTER_SYNC("ContentPlaylist_get", ContentManagerPlaylistGet);
-  REGISTER_SYNC("ContentPlaylist_remove", ContentManagerPlaylistRemove);
-  REGISTER_SYNC("ContentPlaylist_removeBatch", ContentManagerPlaylistRemovebatch);
-  REGISTER_SYNC("ContentPlaylist_setOrder", ContentManagerPlaylistSetorder);
-  REGISTER_SYNC("ContentPlaylist_move", ContentManagerPlaylistMove);
-  REGISTER_SYNC("ContentManager_getLyrics", ContentManagerAudioGetLyrics);
-
-  REGISTER_SYNC("ContentPlaylist_getName", PlaylistGetName);
-  REGISTER_SYNC("ContentPlaylist_setName", PlaylistSetName);
-  REGISTER_SYNC("ContentPlaylist_getThumbnailUri", PlaylistGetThumbnailUri);
-  REGISTER_SYNC("ContentPlaylist_setThumbnailUri", PlaylistSetThumbnailUri);
-  REGISTER_SYNC("ContentPlaylist_getNumberOfTracks", PlaylistGetNumberOfTracks);
-  REGISTER_SYNC("ContentManager_createThumbnail", ContentManagerCreateThumbnail);
-#undef REGISTER_SYNC
+#define REGISTER_METHOD(M) \
+    RegisterSyncHandler(#M, std::bind(&ContentInstance::M, this, _1, _2))
+
+  REGISTER_METHOD(ContentManagerFind);
+  REGISTER_METHOD(ContentManagerUpdate);
+  REGISTER_METHOD(ContentManagerScanfile);
+  REGISTER_METHOD(ContentManagerScanDirectory);
+  REGISTER_METHOD(ContentManagerCancelScanDirectory);
+  REGISTER_METHOD(ContentManagerAddChangeListener);
+  REGISTER_METHOD(ContentManagerRemoveChangeListener);
+  REGISTER_METHOD(ContentManagerUnsetchangelistener);
+  REGISTER_METHOD(ContentManagerSetchangelistener);
+  REGISTER_METHOD(ContentManagerGetdirectories);
+  REGISTER_METHOD(ContentManagerUpdatebatch);
+  REGISTER_METHOD(ContentManagerRemoveplaylist);
+  REGISTER_METHOD(ContentManagerCreateplaylist);
+  REGISTER_METHOD(ContentManagerGetplaylists);
+  REGISTER_METHOD(ContentManagerPlaylistAdd);
+  REGISTER_METHOD(ContentManagerPlaylistAddbatch);
+  REGISTER_METHOD(ContentManagerPlaylistGet);
+  REGISTER_METHOD(ContentManagerPlaylistRemove);
+  REGISTER_METHOD(ContentManagerPlaylistRemovebatch);
+  REGISTER_METHOD(ContentManagerPlaylistSetorder);
+  REGISTER_METHOD(ContentManagerPlaylistMove);
+  REGISTER_METHOD(ContentManagerAudioGetLyrics);
+
+  REGISTER_METHOD(PlaylistGetName);
+  REGISTER_METHOD(PlaylistSetName);
+  REGISTER_METHOD(PlaylistGetThumbnailUri);
+  REGISTER_METHOD(PlaylistSetThumbnailUri);
+  REGISTER_METHOD(PlaylistGetNumberOfTracks);
+  REGISTER_METHOD(ContentManagerCreateThumbnail);
+
+#undef REGISTER_METHOD
 
   ContentManager::getInstance()->setContentInstance(this);
 }
index 415a1f5..658dc7c 100755 (executable)
@@ -542,7 +542,7 @@ function AudioContent(data) {
             contentURI: convertUriToPath_(this.contentURI)
         };
 
-        var result = native_.callSync('ContentManager_getLyrics', data);
+        var result = native_.callSync('ContentManagerAudioGetLyrics', data);
 
         if (native_.isFailure(result)) {
             utils_.log('Getting lyrics failed for ' + data.contentURI);
index 3c58545..51baab3 100755 (executable)
@@ -81,7 +81,7 @@ var ContentListenersManager = (function() {
 
     _ContentListenersManager.prototype.addChangeListener = function(changeCallback) {
         if (T_.isEmptyObject(this.listeners)) {
-            var result = native_.callSync('ContentManager_addChangeListener');
+            var result = native_.callSync('ContentManagerAddChangeListener');
             if (native_.isFailure(result)) {
                 throw native_.getErrorObject(result);
             }
@@ -97,7 +97,7 @@ var ContentListenersManager = (function() {
         delete this.listeners[listenerId];
 
         if (T_.isEmptyObject(this.listeners)) {
-            var result = native_.callSync('ContentManager_removeChangeListener');
+            var result = native_.callSync('ContentManagerRemoveChangeListener');
             if (native_.isFailure(result)) {
                 throw native_.getErrorObject(result);
             }
@@ -122,7 +122,7 @@ var ContentManagerUpdate = function(content) {
         content: args.content
     };
 
-    var result = native_.callSync('ContentManager_update', data);
+    var result = native_.callSync('ContentManagerUpdate', data);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -161,7 +161,7 @@ ContentManager.prototype.updateBatch = function(
         native_.callIfPossible(args.successCallback);
     };
 
-    var result = native_.call('ContentManager_updateBatch', data, callback);
+    var result = native_.call('ContentManagerUpdatebatch', data, callback);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -188,7 +188,7 @@ ContentManager.prototype.getDirectories = function(successCallback, errorCallbac
         native_.callIfPossible(args.successCallback, out);
     };
 
-    var result = native_.call('ContentManager_getDirectories', null, callback);
+    var result = native_.call('ContentManagerGetdirectories', null, callback);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -258,7 +258,7 @@ ContentManager.prototype.find = function(
         native_.callIfPossible(args.successCallback, out);
     };
 
-    var result = native_.call('ContentManager_find', data, callback);
+    var result = native_.call('ContentManagerFind', data, callback);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -297,7 +297,7 @@ ContentManager.prototype.scanFile = function(contentURI, successCallback, errorC
         native_.callIfPossible(args.successCallback, args.contentURI);
     };
 
-    var result = native_.call('ContentManager_scanFile', data, callback);
+    var result = native_.call('ContentManagerScanfile', data, callback);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -343,7 +343,7 @@ ContentManager.prototype.scanDirectory = function(
         native_.callIfPossible(args.successCallback, args.contentDirURI);
     };
 
-    var result = native_.call('ContentManager_scanDirectory', data, callback);
+    var result = native_.call('ContentManagerScanDirectory', data, callback);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -367,7 +367,7 @@ ContentManager.prototype.cancelScanDirectory = function(contentDirURI) {
         contentDirURI: convertUriToPath_(path)
     };
 
-    var result = native_.callSync('ContentManager_cancelScanDirectory', data);
+    var result = native_.callSync('ContentManagerCancelScanDirectory', data);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -440,7 +440,7 @@ ContentManager.prototype.setChangeListener = function(changeCallback) {
         oncontentdirremoved: args.changeCallback.oncontentdirremoved
     };
 
-    var result = native_.callSync('ContentManager_setChangeListener', data);
+    var result = native_.callSync('ContentManagerSetchangelistener', data);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -460,7 +460,7 @@ ContentManager.prototype.unsetChangeListener = function() {
 
     var data = {};
 
-    var result = native_.callSync('ContentManager_unsetChangeListener', data);
+    var result = native_.callSync('ContentManagerUnsetchangelistener', data);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -490,7 +490,7 @@ ContentManager.prototype.getPlaylists = function(successCallback, errorCallback)
         native_.callIfPossible(args.successCallback, out);
     };
 
-    var result = native_.call('ContentManager_getPlaylists', data, callback);
+    var result = native_.call('ContentManagerGetplaylists', data, callback);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -543,7 +543,7 @@ ContentManager.prototype.createPlaylist = function(
         );
     };
 
-    var result = native_.call('ContentManager_createPlaylist', data, callback);
+    var result = native_.call('ContentManagerCreateplaylist', data, callback);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -574,7 +574,7 @@ ContentManager.prototype.removePlaylist = function(id, successCallback, errorCal
         native_.callIfPossible(args.successCallback);
     };
 
-    var result = native_.call('ContentManager_removePlaylist', data, callback);
+    var result = native_.call('ContentManagerRemoveplaylist', data, callback);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -604,7 +604,7 @@ ContentManager.prototype.createThumbnail = function(
         args.successCallback(native_.getResultObject(result));
     };
 
-    var result = native_.call('ContentManager_createThumbnail', data, callback);
+    var result = native_.call('ContentManagerCreateThumbnail', data, callback);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
index 597f598..95e3d35 100755 (executable)
@@ -31,7 +31,7 @@ function Playlist(data) {
         },
         name: {
             get: function() {
-                var result = native_.callSync('ContentPlaylist_getName', {
+                var result = native_.callSync('PlaylistGetName', {
                     id: Number(id)
                 });
                 if (native_.isFailure(result)) {
@@ -42,7 +42,7 @@ function Playlist(data) {
             set: function(v) {
                 if (!type_.isNull(v)) {
                     var name = converter_.toString(v, false);
-                    var result = native_.callSync('ContentPlaylist_setName', {
+                    var result = native_.callSync('PlaylistSetName', {
                         id: Number(id),
                         name: name
                     });
@@ -55,7 +55,7 @@ function Playlist(data) {
         },
         numberOfTracks: {
             get: function() {
-                var result = native_.callSync('ContentPlaylist_getNumberOfTracks', {
+                var result = native_.callSync('PlaylistGetNumberOfTracks', {
                     id: Number(id)
                 });
                 if (native_.isFailure(result)) {
@@ -68,7 +68,7 @@ function Playlist(data) {
         },
         thumbnailURI: {
             get: function() {
-                var result = native_.callSync('ContentPlaylist_getThumbnailUri', {
+                var result = native_.callSync('PlaylistGetThumbnailUri', {
                     id: Number(id)
                 });
                 if (native_.isFailure(result)) {
@@ -88,7 +88,7 @@ function Playlist(data) {
                 }
                 //TODO probably thumbnailURI should be converted here to absolute
                 // uri in case of virtual
-                var result = native_.callSync('ContentPlaylist_setThumbnailUri', {
+                var result = native_.callSync('PlaylistSetThumbnailUri', {
                     id: Number(id),
                     uri: thumbnailURI
                 });
@@ -122,7 +122,7 @@ Playlist.prototype.add = function(item) {
         playlistId: this.id
     };
 
-    var result = native_.callSync('ContentPlaylist_add', data);
+    var result = native_.callSync('ContentManagerPlaylistAdd', data);
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
     }
@@ -153,7 +153,7 @@ Playlist.prototype.addBatch = function(items, successCallback, errorCallback) {
         native_.callIfPossible(args.successCallback);
     };
 
-    var result = native_.call('ContentPlaylist_addBatch', data, callback);
+    var result = native_.call('ContentManagerPlaylistAddbatch', data, callback);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -169,7 +169,7 @@ Playlist.prototype.remove = function(item) {
         playlistId: this.id,
         memberId: args.item.content.memberId
     };
-    var result = native_.callSync('ContentPlaylist_remove', data);
+    var result = native_.callSync('ContentManagerPlaylistRemove', data);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -206,7 +206,7 @@ Playlist.prototype.removeBatch = function(items, successCallback, errorCallback)
         native_.callIfPossible(args.successCallback);
     };
 
-    var result = native_.call('ContentPlaylist_removeBatch', data, callback);
+    var result = native_.call('ContentManagerPlaylistRemovebatch', data, callback);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -249,7 +249,7 @@ Playlist.prototype.get = function(successCallback, errorCallback, count, offset)
         native_.callIfPossible(args.successCallback, out);
     };
 
-    var result = native_.call('ContentPlaylist_get', data, callback);
+    var result = native_.call('ContentManagerPlaylistGet', data, callback);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -293,7 +293,7 @@ Playlist.prototype.setOrder = function(items, successCallback, errorCallback) {
         native_.callIfPossible(args.successCallback);
     };
 
-    var result = native_.call('ContentPlaylist_setOrder', data, callback);
+    var result = native_.call('ContentManagerPlaylistSetorder', data, callback);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -327,7 +327,7 @@ Playlist.prototype.move = function(item, delta, successCallback, errorCallback)
         native_.callIfPossible(args.successCallback);
     };
 
-    var result = native_.call('ContentPlaylist_move', data, callback);
+    var result = native_.call('ContentManagerPlaylistMove', data, callback);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
index 147a52d..426f2f5 100755 (executable)
@@ -139,7 +139,7 @@ var ServerCommandListener = new ListenerManager(
             reply: reply
         };
 
-        var result = native_.callSync('MediaControllerServer_replyCommand', nativeData);
+        var result = native_.callSync('MediaControllerServerReplyCommand', nativeData);
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
         }
@@ -399,7 +399,7 @@ var MediaControllerDisplayRotationType = {
 function MediaControllerManager() {}
 
 MediaControllerManager.prototype.getClient = function() {
-    var result = native_.callSync('MediaControllerManager_getClient', {});
+    var result = native_.callSync('MediaControllerManagerGetClient', {});
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -409,7 +409,7 @@ MediaControllerManager.prototype.getClient = function() {
 };
 
 MediaControllerManager.prototype.createServer = function() {
-    var result = native_.callSync('MediaControllerManager_createServer', {});
+    var result = native_.callSync('MediaControllerManagerCreateServer', {});
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
     }
@@ -945,7 +945,7 @@ var MediaControllerPlaybackAbilities = function() {
         };
 
         var result = native_.callSync(
-            'MediaControllerServer_savePlaybackAbilities',
+            'MediaControllerServerSavePlaybackAbilities',
             data
         );
         if (native_.isFailure(result)) {
@@ -1185,7 +1185,7 @@ var MediaControllerAbilitiesInfo = function(serverName) {
         var data = {
             serverName: serverName
         };
-        var result = native_.callSync('MediaControllerAbilitiesInfo_subscribe', data);
+        var result = native_.callSync('MediaControllerAbilitiesInfoSubscribe', data);
         if (native_.isFailure(result)) {
             throw new native_.getErrorObject(result);
         }
@@ -1195,7 +1195,7 @@ var MediaControllerAbilitiesInfo = function(serverName) {
         var data = {
             serverName: serverName
         };
-        var result = native_.callSync('MediaControllerAbilitiesInfo_unsubscribe', data);
+        var result = native_.callSync('MediaControllerAbilitiesInfoUnsubscribe', data);
         if (native_.isFailure(result)) {
             throw new native_.getErrorObject(result);
         }
@@ -1374,7 +1374,7 @@ var MediaControllerSubtitles = function() {
                 };
                 if (data.enabled !== _enabled) {
                     var result = native_.callSync(
-                        'MediaControllerSubtitles_updateEnabled',
+                        'MediaControllerSubtitlesUpdateEnabled',
                         data
                     );
                     if (native_.isFailure(result)) {
@@ -1406,7 +1406,7 @@ var MediaControllerSubtitlesListener = new ListenerManager(
             requestId: msg.requestId,
             reply: reply
         };
-        var result = native_.callSync('MediaControllerServer_replyCommand', nativeData);
+        var result = native_.callSync('MediaControllerServerReplyCommand', nativeData);
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
         }
@@ -1425,7 +1425,7 @@ MediaControllerSubtitles.prototype.addChangeRequestListener = function() {
 
     if (type_.isEmptyObject(MediaControllerSubtitlesListener.listeners)) {
         var result = native_.callSync(
-            'MediaControllerSubtitles_addChangeRequestListener',
+            'MediaControllerSubtitlesAddChangeRequestListener',
             {
                 listenerId: MediaControllerSubtitlesListener.listenerName
             }
@@ -1446,7 +1446,7 @@ MediaControllerSubtitles.prototype.removeChangeRequestListener = function(watchI
 
     if (type_.isEmptyObject(MediaControllerSubtitlesListener.listeners)) {
         var result = native_.callSync(
-            'MediaControllerSubtitles_removeChangeRequestListener'
+            'MediaControllerSubtitlesRemoveChangeRequestListener'
         );
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
@@ -1467,7 +1467,7 @@ var MediaControllerSubtitlesInfo = function(name) {
     Object.defineProperties(this, {
         enabled: {
             get: function() {
-                var result = native_.callSync('MediaControllerSubtitlesInfo_getEnabled', {
+                var result = native_.callSync('MediaControllerSubtitlesInfoGetEnabled', {
                     name: _serverName
                 });
                 if (native_.isFailure(result)) {
@@ -1506,7 +1506,7 @@ var MediaControllerSubtitlesInfo = function(name) {
         };
 
         var result = native_.callSync(
-            'MediaControllerSubtitlesInfo_sendRequest',
+            'MediaControllerSubtitlesInfoSendRequest',
             nativeData
         );
         if (native_.isFailure(result)) {
@@ -1524,7 +1524,7 @@ var MediaControllerSubtitlesInfo = function(name) {
 
         if (type_.isEmptyObject(SubtitlesChangeListener.listeners)) {
             var result = native_.callSync(
-                'MediaControllerSubtitlesInfo_addModeChangeListener',
+                'MediaControllerSubtitlesInfoAddModeChangeListener',
                 {
                     listenerId: SubtitlesChangeListener.listenerName
                 }
@@ -1545,7 +1545,7 @@ var MediaControllerSubtitlesInfo = function(name) {
 
         if (type_.isEmptyObject(SubtitlesChangeListener.listeners)) {
             var result = native_.callSync(
-                'MediaControllerSubtitlesInfo_removeModeChangeListener'
+                'MediaControllerSubtitlesInfoRemoveModeChangeListener'
             );
             if (native_.isFailure(result)) {
                 throw native_.getErrorObject(result);
@@ -1569,7 +1569,7 @@ var MediaControllerMode360 = function() {
                 };
                 if (data.enabled !== _enabled) {
                     var result = native_.callSync(
-                        'MediaControllerMode360_updateEnabled',
+                        'MediaControllerMode360UpdateEnabled',
                         data
                     );
                     if (native_.isFailure(result)) {
@@ -1601,7 +1601,7 @@ var MediaControllerMode360Listener = new ListenerManager(
             requestId: msg.requestId,
             reply: reply
         };
-        var result = native_.callSync('MediaControllerServer_replyCommand', nativeData);
+        var result = native_.callSync('MediaControllerServerReplyCommand', nativeData);
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
         }
@@ -1619,7 +1619,7 @@ MediaControllerMode360.prototype.addChangeRequestListener = function() {
     ]);
 
     if (type_.isEmptyObject(MediaControllerMode360Listener.listeners)) {
-        var result = native_.callSync('MediaControllerMode360_addChangeRequestListener', {
+        var result = native_.callSync('MediaControllerMode360AddChangeRequestListener', {
             listenerId: MediaControllerMode360Listener.listenerName
         });
         if (native_.isFailure(result)) {
@@ -1638,7 +1638,7 @@ MediaControllerMode360.prototype.removeChangeRequestListener = function(watchId)
 
     if (type_.isEmptyObject(MediaControllerMode360Listener.listeners)) {
         var result = native_.callSync(
-            'MediaControllerMode360_removeChangeRequestListener'
+            'MediaControllerMode360RemoveChangeRequestListener'
         );
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
@@ -1659,7 +1659,7 @@ var MediaControllerMode360Info = function(name) {
     Object.defineProperties(this, {
         enabled: {
             get: function() {
-                var result = native_.callSync('MediaControllerMode360Info_getEnabled', {
+                var result = native_.callSync('MediaControllerMode360InfoGetEnabled', {
                     name: _serverName
                 });
                 if (native_.isFailure(result)) {
@@ -1698,7 +1698,7 @@ var MediaControllerMode360Info = function(name) {
         };
 
         var result = native_.callSync(
-            'MediaControllerMode360Info_sendRequest',
+            'MediaControllerMode360InfoSendRequest',
             nativeData
         );
         if (native_.isFailure(result)) {
@@ -1716,7 +1716,7 @@ var MediaControllerMode360Info = function(name) {
 
         if (type_.isEmptyObject(Mode360ChangeListener.listeners)) {
             var result = native_.callSync(
-                'MediaControllerMode360Info_addModeChangeListener',
+                'MediaControllerMode360InfoAddModeChangeListener',
                 {
                     listenerId: Mode360ChangeListener.listenerName
                 }
@@ -1737,7 +1737,7 @@ var MediaControllerMode360Info = function(name) {
 
         if (type_.isEmptyObject(Mode360ChangeListener.listeners)) {
             var result = native_.callSync(
-                'MediaControllerMode360Info_removeModeChangeListener'
+                'MediaControllerMode360InfoRemoveModeChangeListener'
             );
             if (native_.isFailure(result)) {
                 throw native_.getErrorObject(result);
@@ -1765,7 +1765,7 @@ var MediaControllerDisplayMode = function() {
                 ]);
                 if (args.type !== _type) {
                     var result = native_.callSync(
-                        'MediaControllerDisplayMode_updateType',
+                        'MediaControllerDisplayModeUpdateType',
                         args
                     );
                     if (native_.isFailure(result)) {
@@ -1797,7 +1797,7 @@ var MediaControllerDisplayModeListener = new ListenerManager(
             requestId: msg.requestId,
             reply: reply
         };
-        var result = native_.callSync('MediaControllerServer_replyCommand', nativeData);
+        var result = native_.callSync('MediaControllerServerReplyCommand', nativeData);
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
         }
@@ -1816,7 +1816,7 @@ MediaControllerDisplayMode.prototype.addChangeRequestListener = function() {
 
     if (type_.isEmptyObject(MediaControllerDisplayModeListener.listeners)) {
         var result = native_.callSync(
-            'MediaControllerDisplayMode_addChangeRequestListener',
+            'MediaControllerDisplayModeAddChangeRequestListener',
             {
                 listenerId: MediaControllerDisplayModeListener.listenerName
             }
@@ -1837,7 +1837,7 @@ MediaControllerDisplayMode.prototype.removeChangeRequestListener = function(watc
 
     if (type_.isEmptyObject(MediaControllerDisplayModeListener.listeners)) {
         var result = native_.callSync(
-            'MediaControllerDisplayMode_removeChangeRequestListener'
+            'MediaControllerDisplayModeRemoveChangeRequestListener'
         );
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
@@ -1858,7 +1858,7 @@ var MediaControllerDisplayModeInfo = function(name) {
     Object.defineProperties(this, {
         type: {
             get: function() {
-                var result = native_.callSync('MediaControllerDisplayModeInfo_getType', {
+                var result = native_.callSync('MediaControllerDisplayModeInfoGetType', {
                     name: _serverName
                 });
                 if (native_.isFailure(result)) {
@@ -1898,7 +1898,7 @@ var MediaControllerDisplayModeInfo = function(name) {
         };
 
         var result = native_.callSync(
-            'MediaControllerDisplayModeInfo_SendRequest',
+            'MediaControllerDisplayModeInfoSendType',
             nativeData
         );
         if (native_.isFailure(result)) {
@@ -1916,7 +1916,7 @@ var MediaControllerDisplayModeInfo = function(name) {
 
         if (type_.isEmptyObject(DisplayModeChangeListener.listeners)) {
             var result = native_.callSync(
-                'MediaControllerDisplayModeInfo_addModeChangeListener',
+                'MediaControllerDisplayModeInfoAddModeChangeListener',
                 {
                     listenerId: DisplayModeChangeListener.listenerName
                 }
@@ -1939,7 +1939,7 @@ var MediaControllerDisplayModeInfo = function(name) {
 
         if (type_.isEmptyObject(DisplayModeChangeListener.listeners)) {
             var result = native_.callSync(
-                'MediaControllerDisplayModeInfo_removeModeChangeListener'
+                'MediaControllerDisplayModeInfoRemoveModeChangeListener'
             );
             if (native_.isFailure(result)) {
                 throw native_.getErrorObject(result);
@@ -1969,7 +1969,7 @@ var MediaControllerDisplayRotation = function() {
                     return;
                 }
                 var result = native_.callSync(
-                    'MediaControllerDisplayRotation_updateDisplayRotation',
+                    'MediaControllerDisplayRotationUpdate',
                     args
                 );
                 if (native_.isFailure(result)) {
@@ -1997,7 +1997,7 @@ var MediaControllerDisplayRotationListener = new ListenerManager(
             requestId: msg.requestId,
             reply: reply
         };
-        var result = native_.callSync('MediaControllerServer_replyCommand', nativeData);
+        var result = native_.callSync('MediaControllerServerReplyCommand', nativeData);
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
         }
@@ -2016,7 +2016,7 @@ MediaControllerDisplayRotation.prototype.addChangeRequestListener = function() {
 
     if (type_.isEmptyObject(MediaControllerDisplayRotationListener.listeners)) {
         var result = native_.callSync(
-            'MediaControllerDisplayRotation_addChangeRequestListener',
+            'MediaControllerDisplayRotationAddChangeRequestListener',
             {
                 listenerId: MediaControllerDisplayRotationListener.listenerName
             }
@@ -2037,7 +2037,7 @@ MediaControllerDisplayRotation.prototype.removeChangeRequestListener = function(
 
     if (type_.isEmptyObject(MediaControllerDisplayRotationListener.listeners)) {
         var result = native_.callSync(
-            'MediaControllerDisplayRotation_removeChangeRequestListener'
+            'MediaControllerDisplayRotationRemoveChangeRequestListener'
         );
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
@@ -2059,7 +2059,7 @@ var MediaControllerDisplayRotationInfo = function(name) {
         displayRotation: {
             get: function() {
                 var result = native_.callSync(
-                    'MediaControllerDisplayRotationInfo_getDisplayRotation',
+                    'MediaControllerDisplayRotationInfoGet',
                     {
                         name: _serverName
                     }
@@ -2103,7 +2103,7 @@ var MediaControllerDisplayRotationInfo = function(name) {
         };
 
         var result = native_.callSync(
-            'MediaControllerDisplayRotationInfo_sendRequest',
+            'MediaControllerDisplayRotationInfoSend',
             nativeData
         );
         if (native_.isFailure(result)) {
@@ -2121,7 +2121,7 @@ var MediaControllerDisplayRotationInfo = function(name) {
 
         if (type_.isEmptyObject(MediaControllerDisplayRotationChangeListener.listeners)) {
             var result = native_.callSync(
-                'MediaControllerDisplayRotationInfo_addDisplayRotationChangeListener',
+                'MediaControllerDisplayRotationInfoAddChangeListener',
                 {
                     listenerId: MediaControllerDisplayRotationChangeListener.listenerName
                 }
@@ -2147,7 +2147,7 @@ var MediaControllerDisplayRotationInfo = function(name) {
 
         if (type_.isEmptyObject(MediaControllerDisplayRotationChangeListener.listeners)) {
             var result = native_.callSync(
-                'MediaControllerDisplayRotationInfo_removeDisplayRotationChangeListener'
+                'MediaControllerDisplayRotationInfoRemoveChangeListener'
             );
             if (native_.isFailure(result)) {
                 throw native_.getErrorObject(result);
@@ -2210,7 +2210,7 @@ MediaControllerServer.prototype.updatePlaybackState = function(state) {
         state: args.state
     };
 
-    var result = native_.callSync('MediaControllerServer_updatePlaybackState', data);
+    var result = native_.callSync('MediaControllerServerUpdatePlaybackState', data);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -2230,7 +2230,7 @@ MediaControllerServer.prototype.updateIconURI = function(iconURI) {
         iconURI: args.iconURI
     };
 
-    var result = native_.callSync('MediaControllerServer_updateIconURI', data);
+    var result = native_.callSync('MediaControllerServerUpdateIconURI', data);
     if (native_.isFailure(result)) {
         throw new WebAPIException(
             WebAPIException.UNKNOWN_ERR,
@@ -2252,7 +2252,7 @@ MediaControllerServer.prototype.updatePlaybackPosition = function(position) {
         position: args.position
     };
 
-    var result = native_.callSync('MediaControllerServer_updatePlaybackPosition', data);
+    var result = native_.callSync('MediaControllerServerUpdatePlaybackPosition', data);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -2276,7 +2276,7 @@ MediaControllerServer.prototype.updatePlaybackAgeRating = function(rating) {
         rating: args.rating
     };
 
-    var result = native_.callSync('MediaControllerServer_updatePlaybackAgeRating', data);
+    var result = native_.callSync('MediaControllerServerUpdatePlaybackAgeRating', data);
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
     }
@@ -2300,7 +2300,7 @@ MediaControllerServer.prototype.updatePlaybackContentType = function(contentType
     };
 
     var result = native_.callSync(
-        'MediaControllerServer_updatePlaybackContentType',
+        'MediaControllerServerUpdatePlaybackContentType',
         data
     );
     if (native_.isFailure(result)) {
@@ -2321,7 +2321,7 @@ MediaControllerServer.prototype.updateShuffleMode = function(mode) {
         mode: args.mode
     };
 
-    var result = native_.callSync('MediaControllerServer_updateShuffleMode', data);
+    var result = native_.callSync('MediaControllerServerUpdateShuffleMode', data);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -2342,7 +2342,7 @@ MediaControllerServer.prototype.updateRepeatMode = function(mode) {
         mode: args.mode
     };
 
-    var result = native_.callSync('MediaControllerServer_updateRepeatMode', data);
+    var result = native_.callSync('MediaControllerServerUpdateRepeatMode', data);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -2369,7 +2369,7 @@ MediaControllerServer.prototype.updateRepeatState = function() {
         state: args.state
     };
 
-    var result = native_.callSync('MediaControllerServer_updateRepeatState', data);
+    var result = native_.callSync('MediaControllerServerUpdateRepeatState', data);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -2397,7 +2397,7 @@ MediaControllerServer.prototype.updateMetadata = function(metadata) {
         metadata: args.metadata
     };
 
-    var result = native_.callSync('MediaControllerServer_updateMetadata', data);
+    var result = native_.callSync('MediaControllerServerUpdateMetadata', data);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -2428,7 +2428,7 @@ MediaControllerServer.prototype.addChangeRequestPlaybackInfoListener = function(
 
     if (type_.isEmptyObject(ServerPlaybackInfoListener.listeners)) {
         var result = native_.callSync(
-            'MediaControllerServer_addChangeRequestPlaybackInfoListener',
+            'MediaControllerServerAddChangeRequestPlaybackInfoListener',
             {
                 listenerId: ServerPlaybackInfoListener.listenerName
             }
@@ -2451,7 +2451,7 @@ MediaControllerServer.prototype.removeChangeRequestPlaybackInfoListener = functi
     ServerPlaybackInfoListener.removeListener(args.watchId);
 
     if (type_.isEmptyObject(ServerPlaybackInfoListener.listeners)) {
-        native_.callSync('MediaControllerServer_removeCommandListener');
+        native_.callSync('MediaControllerServerRemoveCommandListener');
     }
 };
 
@@ -2461,7 +2461,7 @@ MediaControllerServer.prototype.addCommandListener = function(listener) {
     ]);
 
     if (type_.isEmptyObject(ServerCommandListener.listeners)) {
-        var result = native_.callSync('MediaControllerServer_addCommandListener', {
+        var result = native_.callSync('MediaControllerServerAddCommandListener', {
             listenerId: ServerCommandListener.listenerName
         });
         if (native_.isFailure(result)) {
@@ -2480,7 +2480,7 @@ MediaControllerServer.prototype.removeCommandListener = function(watchId) {
     ServerCommandListener.removeListener(args.watchId);
 
     if (type_.isEmptyObject(ServerCommandListener.listeners)) {
-        native_.callSync('MediaControllerServer_removeCommandListener');
+        native_.callSync('MediaControllerServerRemoveCommandListener');
     }
 };
 
@@ -2493,7 +2493,7 @@ MediaControllerServer.prototype.createPlaylist = function(name) {
         name: args.name
     };
 
-    var result = native_.callSync('MediaControllerServer_createPlaylist', data);
+    var result = native_.callSync('MediaControllerServerCreatePlaylist', data);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -2534,7 +2534,7 @@ MediaControllerServer.prototype.savePlaylist = function(
         native_.callIfPossible(args.successCallback);
     };
 
-    var result = native_.call('MediaControllerServer_savePlaylist', data, callback);
+    var result = native_.call('MediaControllerServerSavePlaylist', data, callback);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -2569,7 +2569,7 @@ MediaControllerServer.prototype.deletePlaylist = function(
         native_.callIfPossible(args.successCallback);
     };
 
-    var result = native_.call('MediaControllerServer_deletePlaylist', data, callback);
+    var result = native_.call('MediaControllerServerDeletePlaylist', data, callback);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -2587,7 +2587,7 @@ MediaControllerServer.prototype.updatePlaybackItem = function(playlistName, inde
         index: args.index
     };
 
-    var result = native_.callSync('MediaControllerServer_updatePlaybackItem', data);
+    var result = native_.callSync('MediaControllerServerUpdatePlaybackItem', data);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -2627,7 +2627,7 @@ MediaControllerServer.prototype.getAllPlaylists = function(
 
         native_.callIfPossible(args.successCallback, playlists);
     };
-    var result = native_.call('MediaControllerServer_getAllPlaylists', {}, callback);
+    var result = native_.call('MediaControllerServerGetAllPlaylists', {}, callback);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -2646,7 +2646,7 @@ MediaControllerServer.prototype.setSearchRequestListener = function(listener) {
     ]);
 
     if (!native_.isListenerSet('SearchRequestListener')) {
-        var result = native_.callSync('MediaControllerServer_addSearchRequestListener', {
+        var result = native_.callSync('MediaControllerServerAddSearchRequestListener', {
             listenerId: 'SearchRequestListener'
         });
         if (native_.isFailure(result)) {
@@ -2678,7 +2678,7 @@ MediaControllerServer.prototype.setSearchRequestListener = function(listener) {
             reply: reply
         };
 
-        var result = native_.callSync('MediaControllerServer_replyCommand', nativeData);
+        var result = native_.callSync('MediaControllerServerReplyCommand', nativeData);
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
         }
@@ -2688,7 +2688,7 @@ MediaControllerServer.prototype.setSearchRequestListener = function(listener) {
 };
 
 MediaControllerServer.prototype.unsetSearchRequestListener = function() {
-    var result = native_.callSync('MediaControllerServer_removeSearchRequestListener');
+    var result = native_.callSync('MediaControllerServerRemoveSearchRequestListener');
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
     }
@@ -2701,7 +2701,7 @@ var getPlaybackAbility = function(serverName, action) {
         action: action
     };
 
-    var result = native_.callSync('MediaControllerClient_getPlaybackAbility', data);
+    var result = native_.callSync('MediaControllerClientGetPlaybackAbility', data);
     if (native_.isFailure(result)) {
         throw new native_.getErrorObject(result);
     }
@@ -2714,7 +2714,7 @@ var getSimpleAbility = function(name, type) {
         serverName: name,
         abilityType: type
     };
-    var result = native_.callSync('MediaControllerClient_getSimpleAbility', data);
+    var result = native_.callSync('MediaControllerClientGetSimpleAbility', data);
     if (native_.isFailure(result)) {
         throw new native_.getErrorObject(result);
     }
@@ -2748,7 +2748,7 @@ var setSimpleAbility = function(abilityType, support) {
         support: args.support
     };
 
-    var result = native_.callSync('MediaControllerServer_setSimpleAbility', data);
+    var result = native_.callSync('MediaControllerServerSetSimpleAbility', data);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -2779,7 +2779,7 @@ var setDisplayModeAbility = function(mode, val) {
         mode: mode,
         support: val
     };
-    var result = native_.callSync('MediaControllerServer_setDisplayModeAbility', data);
+    var result = native_.callSync('MediaControllerServerSetDisplayModeAbility', data);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -2792,7 +2792,7 @@ var getDisplayModeAbility = function(serverName, mode) {
         mode: mode
     };
 
-    var result = native_.callSync('MediaControllerClient_getDisplayModeAbility', data);
+    var result = native_.callSync('MediaControllerClientGetDisplayModeAbility', data);
     if (native_.isFailure(result)) {
         throw new native_.getErrorObject(result);
     }
@@ -2805,7 +2805,7 @@ var getDisplayRotationAbility = function(serverName, displayRotation) {
         displayRotationAbility: displayRotation
     };
     var result = native_.callSync(
-        'MediaControllerClient_getDisplayRotationAbility',
+        'MediaControllerClientGetDisplayRotationAbility',
         data
     );
     if (native_.isFailure(result)) {
@@ -2824,7 +2824,7 @@ var setDisplayRotationAbility = function(displayRotationAbility, support) {
     };
 
     var result = native_.callSync(
-        'MediaControllerServer_setDisplayRotationAbility',
+        'MediaControllerServerSetDisplayRotationAbility',
         data
     );
 
@@ -2970,11 +2970,11 @@ MediaControllerClient.prototype.findServers = function(successCallback, errorCal
         native_.callIfPossible(args.successCallback, info);
     };
 
-    native_.call('MediaControllerClient_findServers', {}, callback);
+    native_.call('MediaControllerClientFindServers', {}, callback);
 };
 
 MediaControllerClient.prototype.getLatestServerInfo = function() {
-    var result = native_.callSync('MediaControllerClient_getLatestServerInfo', {});
+    var result = native_.callSync('MediaControllerClientGetLatestServerInfo', {});
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -3135,7 +3135,7 @@ MediaControllerClient.prototype.addAbilityChangeListener = function(callback) {
             listenerId: ClientAbilityChangeListener.listenerName
         };
         var result = native_.callSync(
-            'MediaControllerClient_addAbilityChangeListener',
+            'MediaControllerClientAddAbilityChangeListener',
             nativeData
         );
         if (native_.isFailure(result)) {
@@ -3158,7 +3158,7 @@ MediaControllerClient.prototype.removeAbilityChangeListener = function(callbackI
 
     if (type_.isEmptyObject(ClientAbilityChangeListener.listeners)) {
         var result = native_.callSync(
-            'MediaControllerClient_removeAbilityChangeListener'
+            'MediaControllerClientRemoveAbilityChangeListener'
         );
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
@@ -3196,7 +3196,7 @@ MediaControllerClient.prototype.findSubscribedServers = function(
         native_.callIfPossible(args.successCallback, info);
     };
 
-    native_.call('MediaControllerClient_findSubscribedServers', {}, callback);
+    native_.call('MediaControllerClientFindSubscribedServers', {}, callback);
 };
 
 function MediaControllerServerInfo(data) {
@@ -3213,7 +3213,7 @@ function MediaControllerServerInfo(data) {
         },
         playbackInfo: {
             get: function() {
-                var result = native_.callSync('MediaControllerClient_getPlaybackInfo', {
+                var result = native_.callSync('MediaControllerClientGetPlaybackInfo', {
                     name: this.name
                 });
                 if (native_.isFailure(result)) {
@@ -3231,7 +3231,7 @@ function MediaControllerServerInfo(data) {
         },
         iconURI: {
             get: function() {
-                var result = native_.callSync('MediaControllerServerInfo_getIconURI', {
+                var result = native_.callSync('MediaControllerServerInfoGetIconURI', {
                     name: this.name
                 });
                 if (native_.isFailure(result)) {
@@ -3304,7 +3304,7 @@ MediaControllerServerInfo.prototype.sendPlaybackState = function(
         native_.callIfPossible(args.successCallback);
     };
 
-    native_.call('MediaControllerServerInfo_sendPlaybackState', data, callback);
+    native_.call('MediaControllerServerInfoSendPlaybackState', data, callback);
 };
 
 MediaControllerServerInfo.prototype.sendPlaybackPosition = function(
@@ -3340,7 +3340,7 @@ MediaControllerServerInfo.prototype.sendPlaybackPosition = function(
         name: this.name
     };
 
-    native_.call('MediaControllerServerInfo_sendPlaybackPosition', data, callback);
+    native_.call('MediaControllerServerInfoSendPlaybackPosition', data, callback);
 };
 
 MediaControllerServerInfo.prototype.sendShuffleMode = function(
@@ -3371,7 +3371,7 @@ MediaControllerServerInfo.prototype.sendShuffleMode = function(
         mode: args.mode,
         name: this.name
     };
-    native_.call('MediaControllerServerInfo_sendShuffleMode', data, callback);
+    native_.call('MediaControllerServerInfoSendShuffleMode', data, callback);
 };
 
 MediaControllerServerInfo.prototype.sendRepeatMode = function(
@@ -3403,7 +3403,7 @@ MediaControllerServerInfo.prototype.sendRepeatMode = function(
         mode: args.mode,
         name: this.name
     };
-    native_.call('MediaControllerServerInfo_sendRepeatMode', data, callback);
+    native_.call('MediaControllerServerInfoSendRepeatMode', data, callback);
 };
 
 MediaControllerServerInfo.prototype.sendRepeatState = function() {
@@ -3434,7 +3434,7 @@ MediaControllerServerInfo.prototype.sendRepeatState = function() {
         state: args.state,
         name: this.name
     };
-    native_.call('MediaControllerServerInfo_sendRepeatState', data, callback);
+    native_.call('MediaControllerServerInfoSendRepeatState', data, callback);
 };
 
 MediaControllerServerInfo.prototype.sendCommand = function(
@@ -3470,7 +3470,7 @@ MediaControllerServerInfo.prototype.sendCommand = function(
     };
 
     var replyListenerId = ReplyCommandListener.addListener(callback);
-    var result = native_.callSync('MediaControllerServerInfo_sendCommand', nativeData);
+    var result = native_.callSync('MediaControllerServerInfoSendCommand', nativeData);
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
     }
@@ -3512,7 +3512,7 @@ MediaControllerServerInfo.prototype.sendSearchRequest = function(
     };
 
     var result = native_.callSync(
-        'MediaControllerServerInfo_sendSearchRequest',
+        'MediaControllerServerInfoSendSearchRequest',
         nativeData,
         callback
     );
@@ -3531,7 +3531,7 @@ MediaControllerServerInfo.prototype.addServerStatusChangeListener = function(lis
 
     if (type_.isEmptyObject(ServerInfoStatusListener.listeners)) {
         var result = native_.callSync(
-            'MediaControllerServerInfo_addServerStatusChangeListener',
+            'MediaControllerServerInfoAddServerStatusChangeListener',
             {
                 listenerId: ServerInfoStatusListener.listenerName
             }
@@ -3551,7 +3551,7 @@ MediaControllerServerInfo.prototype.removeServerStatusChangeListener = function(
     ServerInfoStatusListener.removeServerInfoListener(args.watchId);
 
     if (type_.isEmptyObject(ServerInfoStatusListener.listeners)) {
-        native_.callSync('MediaControllerServerInfo_removeServerStatusChangeListener');
+        native_.callSync('MediaControllerServerInfoRemoveServerStatusChangeListener');
     }
 };
 
@@ -3572,7 +3572,7 @@ MediaControllerServerInfo.prototype.addPlaybackInfoChangeListener = function(lis
 
     if (type_.isEmptyObject(ServerInfoPlaybackInfoListener.listeners)) {
         var result = native_.callSync(
-            'MediaControllerServerInfo_addPlaybackInfoChangeListener',
+            'MediaControllerServerInfoAddPlaybackInfoChangeListener',
             {
                 listenerId: ServerInfoPlaybackInfoListener.listenerName
             }
@@ -3593,7 +3593,7 @@ MediaControllerServerInfo.prototype.removePlaybackInfoChangeListener = function(
     ServerInfoPlaybackInfoListener.removeServerInfoListener(args.watchId);
 
     if (type_.isEmptyObject(ServerInfoPlaybackInfoListener.listeners)) {
-        native_.callSync('MediaControllerServerInfo_removePlaybackInfoChangeListener');
+        native_.callSync('MediaControllerServerInfoRemovePlaybackInfoChangeListener');
     }
 };
 
@@ -3627,7 +3627,7 @@ MediaControllerServerInfo.prototype.getAllPlaylists = function(
     };
 
     var result = native_.call(
-        'MediaControllerServerInfo_getAllPlaylists',
+        'MediaControllerServerInfoGetAllPlaylists',
         { name: this.name },
         callback
     );
@@ -3662,7 +3662,7 @@ MediaControllerServerInfo.prototype.sendPlaybackItem = function(
         position: args.position
     };
 
-    var result = native_.callSync('MediaControllerServerInfo_sendPlaybackItem', data);
+    var result = native_.callSync('MediaControllerServerInfoSendPlaybackItem', data);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -3680,7 +3680,7 @@ MediaControllerServerInfo.prototype.addPlaylistUpdatedListener = function(listen
 
     if (type_.isEmptyObject(ServerInfoPlaylistUpdatedListener.listeners)) {
         var result = native_.callSync(
-            'MediaControllerServerInfo_addPlaylistUpdatedListener',
+            'MediaControllerServerInfoAddPlaylistUpdateListener',
             {
                 listenerId: ServerInfoPlaylistUpdatedListener.listenerName
             }
@@ -3702,7 +3702,7 @@ MediaControllerServerInfo.prototype.removePlaylistUpdatedListener = function(wat
 
     if (type_.isEmptyObject(ServerInfoPlaylistUpdatedListener.listeners)) {
         var result = native_.callSync(
-            'MediaControllerServerInfo_removePlaylistUpdatedListener'
+            'MediaControllerServerInfoRemovePlaylistUpdateListener'
         );
         if (native_.isFailure(result)) {
             throw native_.getErrorObject(result);
@@ -3783,7 +3783,7 @@ MediaControllerPlaylist.prototype.addItem = function(index, metadata) {
         name: this.name
     };
 
-    var result = native_.callSync('MediaControllerPlaylist_addItem', data);
+    var result = native_.callSync('MediaControllerPlaylistAddItem', data);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
@@ -3820,7 +3820,7 @@ MediaControllerPlaylist.prototype.getItems = function(successCallback, errorCall
         native_.callIfPossible(args.successCallback, items);
     };
 
-    var result = native_.call('MediaControllerPlaylist_getItems', data, callback);
+    var result = native_.call('MediaControllerPlaylistGetItems', data, callback);
 
     if (native_.isFailure(result)) {
         throw native_.getErrorObject(result);
index 8736d71..b3d2e42 100644 (file)
@@ -44,186 +44,119 @@ MediaControllerInstance::MediaControllerInstance() {
   ScopeLogger();
   using namespace std::placeholders;
 
-#define REGISTER_SYNC(c, x) \
-  RegisterSyncHandler(c, std::bind(&MediaControllerInstance::x, this, _1, _2));
-#define REGISTER_ASYNC(c, x) \
-  RegisterSyncHandler(c, std::bind(&MediaControllerInstance::x, this, _1, _2));
+#define REGISTER_METHOD(M) \
+    RegisterSyncHandler(#M, std::bind(&MediaControllerInstance::M, this, _1, _2))
 
   // server
-  REGISTER_SYNC("MediaControllerManager_createServer", MediaControllerManagerCreateServer);
-  REGISTER_SYNC("MediaControllerServer_updatePlaybackState",
-                MediaControllerServerUpdatePlaybackState);
-  REGISTER_SYNC("MediaControllerServer_updatePlaybackPosition",
-                MediaControllerServerUpdatePlaybackPosition);
-  REGISTER_SYNC("MediaControllerServer_updatePlaybackAgeRating",
-                MediaControllerServerUpdatePlaybackAgeRating);
-  REGISTER_SYNC("MediaControllerServer_updateRepeatMode", MediaControllerServerUpdateRepeatMode);
-  REGISTER_SYNC("MediaControllerServer_updateRepeatState", MediaControllerServerUpdateRepeatState);
-  REGISTER_SYNC("MediaControllerServer_updateShuffleMode", MediaControllerServerUpdateShuffleMode);
-  REGISTER_SYNC("MediaControllerServer_updatePlaybackContentType",
-                MediaControllerServerUpdatePlaybackContentType);
-  REGISTER_SYNC("MediaControllerServer_updateMetadata", MediaControllerServerUpdateMetadata);
-  REGISTER_SYNC("MediaControllerServer_addChangeRequestPlaybackInfoListener",
-                MediaControllerServerAddChangeRequestPlaybackInfoListener);
-  REGISTER_SYNC("MediaControllerServer_removeChangeRequestPlaybackInfoListener",
-                MediaControllerServerRemoveChangeRequestPlaybackInfoListener);
-  REGISTER_SYNC("MediaControllerServer_addSearchRequestListener",
-                MediaControllerServerAddSearchRequestListener);
-  REGISTER_SYNC("MediaControllerServer_removeSearchRequestListener",
-                MediaControllerServerRemoveSearchRequestListener);
-  REGISTER_SYNC("MediaControllerServer_addCommandListener",
-                MediaControllerServerAddCommandListener);
-  REGISTER_SYNC("MediaControllerServer_replyCommand", MediaControllerServerReplyCommand);
-  REGISTER_SYNC("MediaControllerServer_removeCommandListener",
-                MediaControllerServerRemoveCommandListener);
-  REGISTER_SYNC("MediaControllerServer_createPlaylist", MediaControllerServerCreatePlaylist);
-  REGISTER_ASYNC("MediaControllerServer_savePlaylist", MediaControllerServerSavePlaylist);
-  REGISTER_ASYNC("MediaControllerServer_deletePlaylist", MediaControllerServerDeletePlaylist);
-  REGISTER_SYNC("MediaControllerServer_updatePlaybackItem",
-                MediaControllerServerUpdatePlaybackItem);
-  REGISTER_ASYNC("MediaControllerServer_getAllPlaylists", MediaControllerServerGetAllPlaylists);
-  REGISTER_SYNC("MediaControllerServer_updateIconURI", MediaControllerServerUpdateIconURI);
-  REGISTER_SYNC("MediaControllerServer_savePlaybackAbilities",
-                MediaControllerServerSavePlaybackAbilities);
-  REGISTER_SYNC("MediaControllerServer_setDisplayModeAbility",
-                MediaControllerServerSetDisplayModeAbility);
-  REGISTER_SYNC("MediaControllerServer_setDisplayRotationAbility",
-                MediaControllerServerSetDisplayRotationAbility);
-  REGISTER_SYNC("MediaControllerServer_setSimpleAbility", MediaControllerServerSetSimpleAbility);
-  REGISTER_SYNC("MediaControllerServer_getAllClientsInfo", MediaControllerServerGetAllClientsInfo);
-
-  // client info
-  REGISTER_SYNC("MediaControllerClientInfo_sendEvent", MediaControllerClientInfoSendEvent);
+  REGISTER_METHOD(MediaControllerManagerCreateServer);
+  REGISTER_METHOD(MediaControllerServerUpdatePlaybackState);
+  REGISTER_METHOD(MediaControllerServerUpdatePlaybackPosition);
+  REGISTER_METHOD(MediaControllerServerUpdatePlaybackAgeRating);
+  REGISTER_METHOD(MediaControllerServerUpdateRepeatMode);
+  REGISTER_METHOD(MediaControllerServerUpdateRepeatState);
+  REGISTER_METHOD(MediaControllerServerUpdateShuffleMode);
+  REGISTER_METHOD(MediaControllerServerUpdateMetadata);
+  REGISTER_METHOD(MediaControllerServerUpdatePlaybackContentType);
+  REGISTER_METHOD(MediaControllerServerUpdatePlaybackContentType);
+  REGISTER_METHOD(MediaControllerServerAddChangeRequestPlaybackInfoListener);
+  REGISTER_METHOD(MediaControllerServerRemoveChangeRequestPlaybackInfoListener);
+  REGISTER_METHOD(MediaControllerServerAddSearchRequestListener);
+  REGISTER_METHOD(MediaControllerServerRemoveSearchRequestListener);
+  REGISTER_METHOD(MediaControllerServerAddCommandListener);
+  REGISTER_METHOD(MediaControllerServerReplyCommand);
+  REGISTER_METHOD(MediaControllerServerRemoveCommandListener);
+  REGISTER_METHOD(MediaControllerServerCreatePlaylist);
+  REGISTER_METHOD(MediaControllerServerSavePlaylist);
+  REGISTER_METHOD(MediaControllerServerDeletePlaylist);
+  REGISTER_METHOD(MediaControllerServerUpdatePlaybackItem);
+
+  REGISTER_METHOD(MediaControllerServerGetAllPlaylists);
+  REGISTER_METHOD(MediaControllerServerUpdateIconURI);
+  REGISTER_METHOD(MediaControllerServerSavePlaybackAbilities);
+  REGISTER_METHOD(MediaControllerServerSetDisplayModeAbility);
+  REGISTER_METHOD(MediaControllerServerSetDisplayRotationAbility);
+  REGISTER_METHOD(MediaControllerServerSetSimpleAbility);
 
   // client
-  REGISTER_SYNC("MediaControllerManager_getClient", MediaControllerManagerGetClient);
-  REGISTER_ASYNC("MediaControllerClient_findServers", MediaControllerClientFindServers);
-  REGISTER_SYNC("MediaControllerClient_getLatestServerInfo",
-                MediaControllerClientGetLatestServerInfo);
-  REGISTER_SYNC("MediaControllerClient_getPlaybackInfo", MediaControllerClientGetPlaybackInfo);
-  REGISTER_SYNC("MediaControllerClient_getPlaybackAbility",
-                MediaControllerClientGetPlaybackAbility);
-  REGISTER_SYNC("MediaControllerClient_getDisplayModeAbility",
-                MediaControllerClientGetDisplayModeAbility);
-  REGISTER_SYNC("MediaControllerClient_getDisplayRotationAbility",
-                MediaControllerClientGetDisplayRotationAbility);
-  REGISTER_SYNC("MediaControllerClient_getSimpleAbility", MediaControllerClientGetSimpleAbility);
-  REGISTER_ASYNC("MediaControllerClient_findSubscribedServers",
-                 MediaControllerClientFindSubscribedServers);
-  REGISTER_SYNC("MediaControllerClient_setCustomEventListener",
-                MediaControllerClientSetCustomEventListener);
-  REGISTER_SYNC("MediaControllerClient_unsetCustomEventListener",
-                MediaControllerClientUnsetCustomEventListener);
-  REGISTER_SYNC("MediaControllerClient_sendEventReply", MediaControllerClientSendEventReply);
+  REGISTER_METHOD(MediaControllerManagerGetClient);
+  REGISTER_METHOD(MediaControllerClientFindServers);
+  REGISTER_METHOD(MediaControllerClientGetLatestServerInfo);
+  REGISTER_METHOD(MediaControllerClientGetPlaybackInfo);
+  REGISTER_METHOD(MediaControllerClientGetPlaybackAbility);
+  REGISTER_METHOD(MediaControllerClientGetDisplayModeAbility);
+  REGISTER_METHOD(MediaControllerClientGetDisplayRotationAbility);
+  REGISTER_METHOD(MediaControllerClientGetSimpleAbility);
+  REGISTER_METHOD(MediaControllerClientFindSubscribedServers);
 
   // server_info
-  REGISTER_SYNC("MediaControllerServerInfo_sendPlaybackState",
-                MediaControllerServerInfoSendPlaybackState);
-  REGISTER_ASYNC("MediaControllerServerInfo_sendPlaybackPosition",
-                 MediaControllerServerInfoSendPlaybackPosition);
-  REGISTER_ASYNC("MediaControllerServerInfo_sendRepeatMode",
-                 MediaControllerServerInfoSendRepeatMode);
-  REGISTER_ASYNC("MediaControllerServerInfo_sendRepeatState",
-                 MediaControllerServerInfoSendRepeatState);
-  REGISTER_ASYNC("MediaControllerServerInfo_sendShuffleMode",
-                 MediaControllerServerInfoSendShuffleMode);
-  REGISTER_ASYNC("MediaControllerServerInfo_sendSearchRequest",
-                 MediaControllerServerInfoSendSearchRequest);
-  REGISTER_ASYNC("MediaControllerServerInfo_sendCommand", MediaControllerServerInfoSendCommand);
-  REGISTER_SYNC("MediaControllerServerInfo_addServerStatusChangeListener",
-                MediaControllerServerInfoAddServerStatusChangeListener);
-  REGISTER_SYNC("MediaControllerServerInfo_removeServerStatusChangeListener",
-                MediaControllerServerInfoRemoveServerStatusChangeListener);
-  REGISTER_SYNC("MediaControllerServerInfo_addPlaybackInfoChangeListener",
-                MediaControllerServerInfoAddPlaybackInfoChangeListener);
-  REGISTER_SYNC("MediaControllerServerInfo_removePlaybackInfoChangeListener",
-                MediaControllerServerInfoRemovePlaybackInfoChangeListener);
-  REGISTER_SYNC("MediaControllerServerInfo_sendPlaybackItem",
-                MediaControllerServerInfoSendPlaybackItem);
-  REGISTER_SYNC("MediaControllerServerInfo_addPlaylistUpdatedListener",
-                MediaControllerServerInfoAddPlaylistUpdateListener);
-  REGISTER_SYNC("MediaControllerServerInfo_removePlaylistUpdatedListener",
-                MediaControllerServerInfoRemovePlaylistUpdateListener);
-  REGISTER_ASYNC("MediaControllerServerInfo_getAllPlaylists",
-                 MediaControllerServerInfoGetAllPlaylists);
-  REGISTER_SYNC("MediaControllerServerInfo_getIconURI", MediaControllerServerInfoGetIconURI);
-  REGISTER_SYNC("MediaControllerClient_addAbilityChangeListener",
-                MediaControllerClientAddAbilityChangeListener);
-  REGISTER_SYNC("MediaControllerClient_removeAbilityChangeListener",
-                MediaControllerClientRemoveAbilityChangeListener);
+  REGISTER_METHOD(MediaControllerServerInfoSendPlaybackState);
+  REGISTER_METHOD(MediaControllerServerInfoSendPlaybackPosition);
+  REGISTER_METHOD(MediaControllerServerInfoSendRepeatMode);
+  REGISTER_METHOD(MediaControllerServerInfoSendRepeatState);
+  REGISTER_METHOD(MediaControllerServerInfoSendShuffleMode);
+  REGISTER_METHOD(MediaControllerServerInfoSendSearchRequest);
+  REGISTER_METHOD(MediaControllerServerInfoSendCommand);
+  REGISTER_METHOD(MediaControllerServerInfoAddServerStatusChangeListener);
+  REGISTER_METHOD(MediaControllerServerInfoRemoveServerStatusChangeListener);
+  REGISTER_METHOD(MediaControllerServerInfoAddPlaybackInfoChangeListener);
+  REGISTER_METHOD(MediaControllerServerInfoRemovePlaybackInfoChangeListener);
+  REGISTER_METHOD(MediaControllerServerInfoSendPlaybackItem);
+  REGISTER_METHOD(MediaControllerServerInfoAddPlaylistUpdateListener);
+  REGISTER_METHOD(MediaControllerServerInfoRemovePlaylistUpdateListener);
+  REGISTER_METHOD(MediaControllerServerInfoGetAllPlaylists);
+  REGISTER_METHOD(MediaControllerServerInfoGetIconURI);
+  REGISTER_METHOD(MediaControllerClientAddAbilityChangeListener);
+  REGISTER_METHOD(MediaControllerClientRemoveAbilityChangeListener);
 
   // abilities_info
-  REGISTER_SYNC("MediaControllerAbilitiesInfo_subscribe", MediaControllerAbilitiesInfoSubscribe);
-  REGISTER_SYNC("MediaControllerAbilitiesInfo_unsubscribe",
-                MediaControllerAbilitiesInfoUnsubscribe);
+  REGISTER_METHOD(MediaControllerAbilitiesInfoSubscribe);
+  REGISTER_METHOD(MediaControllerAbilitiesInfoUnsubscribe);
 
   // playlist
-  REGISTER_SYNC("MediaControllerPlaylist_addItem", MediaControllerPlaylistAddItem);
-  REGISTER_ASYNC("MediaControllerPlaylist_getItems", MediaControllerPlaylistGetItems);
+  REGISTER_METHOD(MediaControllerPlaylistAddItem);
+  REGISTER_METHOD(MediaControllerPlaylistGetItems);
 
   // subtitles
-  REGISTER_SYNC("MediaControllerSubtitles_updateEnabled", MediaControllerSubtitlesUpdateEnabled);
-  REGISTER_SYNC("MediaControllerSubtitles_addChangeRequestListener",
-                MediaControllerSubtitlesAddChangeRequestListener);
-  REGISTER_SYNC("MediaControllerSubtitles_removeChangeRequestListener",
-                MediaControllerSubtitlesRemoveChangeRequestListener);
-
-  REGISTER_SYNC("MediaControllerSubtitlesInfo_getEnabled", MediaControllerSubtitlesInfoGetEnabled);
-  REGISTER_ASYNC("MediaControllerSubtitlesInfo_sendRequest",
-                 MediaControllerSubtitlesInfoSendRequest);
-  REGISTER_SYNC("MediaControllerSubtitlesInfo_addModeChangeListener",
-                MediaControllerSubtitlesInfoAddModeChangeListener);
-  REGISTER_SYNC("MediaControllerSubtitlesInfo_removeModeChangeListener",
-                MediaControllerSubtitlesInfoRemoveModeChangeListener);
+  REGISTER_METHOD(MediaControllerSubtitlesUpdateEnabled);
+  REGISTER_METHOD(MediaControllerSubtitlesAddChangeRequestListener);
+  REGISTER_METHOD(MediaControllerSubtitlesRemoveChangeRequestListener);
+
+  REGISTER_METHOD(MediaControllerSubtitlesInfoGetEnabled);
+  REGISTER_METHOD(MediaControllerSubtitlesInfoSendRequest);
+  REGISTER_METHOD(MediaControllerSubtitlesInfoAddModeChangeListener);
+  REGISTER_METHOD(MediaControllerSubtitlesInfoRemoveModeChangeListener);
 
   // mode360
-  REGISTER_SYNC("MediaControllerMode360_updateEnabled", MediaControllerMode360UpdateEnabled);
-  REGISTER_SYNC("MediaControllerMode360_addChangeRequestListener",
-                MediaControllerMode360AddChangeRequestListener);
-  REGISTER_SYNC("MediaControllerMode360_removeChangeRequestListener",
-                MediaControllerMode360RemoveChangeRequestListener);
-
-  REGISTER_SYNC("MediaControllerMode360Info_getEnabled", MediaControllerMode360InfoGetEnabled);
-  REGISTER_ASYNC("MediaControllerMode360Info_sendRequest", MediaControllerMode360InfoSendRequest);
-  REGISTER_SYNC("MediaControllerMode360Info_addModeChangeListener",
-                MediaControllerMode360InfoAddModeChangeListener);
-  REGISTER_SYNC("MediaControllerMode360Info_removeModeChangeListener",
-                MediaControllerMode360InfoRemoveModeChangeListener);
+  REGISTER_METHOD(MediaControllerMode360UpdateEnabled);
+  REGISTER_METHOD(MediaControllerMode360AddChangeRequestListener);
+  REGISTER_METHOD(MediaControllerMode360RemoveChangeRequestListener);
+
+  REGISTER_METHOD(MediaControllerMode360InfoGetEnabled);
+  REGISTER_METHOD(MediaControllerMode360InfoSendRequest);
+  REGISTER_METHOD(MediaControllerMode360InfoAddModeChangeListener);
+  REGISTER_METHOD(MediaControllerMode360InfoRemoveModeChangeListener);
 
   // displayMode
-  REGISTER_SYNC("MediaControllerDisplayMode_updateType", MediaControllerDisplayModeUpdateType);
-  REGISTER_SYNC("MediaControllerDisplayMode_addChangeRequestListener",
-                MediaControllerDisplayModeAddChangeRequestListener);
-  REGISTER_SYNC("MediaControllerDisplayMode_removeChangeRequestListener",
-                MediaControllerDisplayModeRemoveChangeRequestListener);
-
-  REGISTER_SYNC("MediaControllerDisplayModeInfo_getType", MediaControllerDisplayModeInfoGetType);
-  REGISTER_ASYNC("MediaControllerDisplayModeInfo_SendRequest",
-                 MediaControllerDisplayModeInfoSendType);
-  REGISTER_SYNC("MediaControllerDisplayModeInfo_addModeChangeListener",
-                MediaControllerDisplayModeInfoAddModeChangeListener);
-  REGISTER_SYNC("MediaControllerDisplayModeInfo_removeModeChangeListener",
-                MediaControllerDisplayModeInfoRemoveModeChangeListener);
+  REGISTER_METHOD(MediaControllerDisplayModeUpdateType);
+  REGISTER_METHOD(MediaControllerDisplayModeAddChangeRequestListener);
+  REGISTER_METHOD(MediaControllerDisplayModeRemoveChangeRequestListener);
+
+  REGISTER_METHOD(MediaControllerDisplayModeInfoGetType);
+  REGISTER_METHOD(MediaControllerDisplayModeInfoSendType);
+  REGISTER_METHOD(MediaControllerDisplayModeInfoAddModeChangeListener);
+  REGISTER_METHOD(MediaControllerDisplayModeInfoRemoveModeChangeListener);
 
   // displayRotation
-  REGISTER_SYNC("MediaControllerDisplayRotation_updateDisplayRotation",
-                MediaControllerDisplayRotationUpdate);
-  REGISTER_SYNC("MediaControllerDisplayRotation_addChangeRequestListener",
-                MediaControllerDisplayRotationAddChangeRequestListener);
-  REGISTER_SYNC("MediaControllerDisplayRotation_removeChangeRequestListener",
-                MediaControllerDisplayRotationRemoveChangeRequestListener);
-
-  REGISTER_SYNC("MediaControllerDisplayRotationInfo_getDisplayRotation",
-                MediaControllerDisplayRotationInfoGet);
-  REGISTER_ASYNC("MediaControllerDisplayRotationInfo_sendRequest",
-                 MediaControllerDisplayRotationInfoSend);
-  REGISTER_SYNC("MediaControllerDisplayRotationInfo_addDisplayRotationChangeListener",
-                MediaControllerDisplayRotationInfoAddChangeListener);
-  REGISTER_SYNC("MediaControllerDisplayRotationInfo_removeDisplayRotationChangeListener",
-                MediaControllerDisplayRotationInfoRemoveChangeListener);
-
-#undef REGISTER_SYNC
-#undef REGISTER_ASYNC
+  REGISTER_METHOD(MediaControllerDisplayRotationUpdate);
+  REGISTER_METHOD(MediaControllerDisplayRotationAddChangeRequestListener);
+  REGISTER_METHOD(MediaControllerDisplayRotationRemoveChangeRequestListener);
+
+  REGISTER_METHOD(MediaControllerDisplayRotationInfoGet);
+  REGISTER_METHOD(MediaControllerDisplayRotationInfoSend);
+  REGISTER_METHOD(MediaControllerDisplayRotationInfoAddChangeListener);
+  REGISTER_METHOD(MediaControllerDisplayRotationInfoRemoveChangeListener);
+
+#undef REGISTER_METHOD
 }
 
 MediaControllerInstance::~MediaControllerInstance() {