diff options
author | Marcus Fritzsch <marcus_fritzsch@mentor.com> | 2017-09-13 13:59:23 +0200 |
---|---|---|
committer | Marcus Fritzsch <marcus_fritzsch@mentor.com> | 2017-09-14 14:04:51 +0200 |
commit | f09cbfb256460bc934f1df1cef2939a35e032bab (patch) | |
tree | 8f5bcf849c53f52ed2cea0370fa3a60251a9ab91 | |
parent | f7f02a664fc0438f00e6bd09797a3bf4184c123f (diff) |
binding/afbclient: use the correct binding names
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
-rw-r--r-- | client-lib/AFBClient.cpp | 8 | ||||
-rw-r--r-- | generate-binding-glue.py | 6 | ||||
-rw-r--r-- | src/afb_binding_api.cpp | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/client-lib/AFBClient.cpp b/client-lib/AFBClient.cpp index dc1c523..e0c4efa 100644 --- a/client-lib/AFBClient.cpp +++ b/client-lib/AFBClient.cpp @@ -239,7 +239,7 @@ int AFBClient::Impl::requestSurface(const char *label) { int rc = -1; /* send the request */ int rc2 = - this->api_call("request_surface", j, [&rc](bool ok, json_object *j) { + this->api_call("RequestSurface", j, [&rc](bool ok, json_object *j) { if (ok) { int id = json_object_get_int(json_object_object_get(j, "response")); @@ -275,7 +275,7 @@ int AFBClient::Impl::requestSurface(const char *label) { int AFBClient::Impl::activateSurface(const char *label) { TRACE(); json_object *j = drawing_name_json_argument(label); - return this->api_call("activate_surface", j, [](bool ok, json_object *j) { + return this->api_call("ActivateSurface", j, [](bool ok, json_object *j) { if (!ok) { fprintf(stderr, "API Call activate_surface() failed: %s\n", j != nullptr ? json_object_to_json_string_ext( @@ -288,7 +288,7 @@ int AFBClient::Impl::activateSurface(const char *label) { int AFBClient::Impl::deactivateSurface(const char *label) { TRACE(); json_object *j = drawing_name_json_argument(label); - return this->api_call("deactivate_surface", j, [](bool ok, json_object *j) { + return this->api_call("DeactivateSurface", j, [](bool ok, json_object *j) { if (!ok) { fprintf(stderr, "API Call deactivate_surface() failed: %s\n", j != nullptr ? json_object_to_json_string_ext( @@ -301,7 +301,7 @@ int AFBClient::Impl::deactivateSurface(const char *label) { int AFBClient::Impl::endDraw(const char *label) { TRACE(); json_object *j = drawing_name_json_argument(label); - return this->api_call("enddraw", j, [](bool ok, json_object *j) { + return this->api_call("EndDraw", j, [](bool ok, json_object *j) { if (!ok) { fprintf(stderr, "API Call endDraw() failed: %s\n", j != nullptr ? json_object_to_json_string_ext( diff --git a/generate-binding-glue.py b/generate-binding-glue.py index 4791b4d..177b8c2 100644 --- a/generate-binding-glue.py +++ b/generate-binding-glue.py @@ -106,20 +106,20 @@ API = { 'api': 'g_afb_instance->app.api.', # where are our API functions 'functions': [ { - 'name': 'request_surface', + 'name': 'requestsurface', #'return_type': 'int', # Or do they return all just some json? 'args': [ # describes the functions arguments, and their names as found in the json request { 'name': 'drawing_name', 'type': 'char const*', 'jtype': 'string' }, ], }, { - 'name': 'activate_surface', + 'name': 'activatesurface', 'args': [ { 'name': 'drawing_name', 'type': 'char const*', 'jtype': 'string' }, ], }, { - 'name': 'deactivate_surface', + 'name': 'deactivatesurface', 'args': [ { 'name': 'drawing_name', 'type': 'char const*', 'jtype': 'string' }, ], diff --git a/src/afb_binding_api.cpp b/src/afb_binding_api.cpp index 9fd2430..9311700 100644 --- a/src/afb_binding_api.cpp +++ b/src/afb_binding_api.cpp @@ -32,7 +32,7 @@ namespace wm { // | |_) | | | | | (_| | | | | | (_| | | (_| | |_) | | | | | | | | | |_) | | // |_.__/|_|_| |_|\__,_|_|_| |_|\__, |___\__,_| .__/|_| |_|_| |_| |_| .__/|_| // |___/_____| |_| |_| -binding_api::result_type binding_api::request_surface( +binding_api::result_type binding_api::requestsurface( char const *drawing_name) { auto r = this->app->api_request_surface(drawing_name); if (r.is_err()) { @@ -41,7 +41,7 @@ binding_api::result_type binding_api::request_surface( return Ok(json_object_new_int(r.unwrap())); } -binding_api::result_type binding_api::activate_surface( +binding_api::result_type binding_api::activatesurface( char const *drawing_name) { logdebug("%s drawing_name %s", __func__, drawing_name); auto r = this->app->api_activate_surface(drawing_name); @@ -52,7 +52,7 @@ binding_api::result_type binding_api::activate_surface( return Ok(json_object_new_object()); } -binding_api::result_type binding_api::deactivate_surface(char const* drawing_name) { +binding_api::result_type binding_api::deactivatesurface(char const* drawing_name) { logdebug("%s drawing_name %s", __func__, drawing_name); auto r = this->app->api_deactivate_surface(drawing_name); if (r != nullptr) { |