X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=client-lib%2FAFBClient.cpp;h=60743d9123cfbb5d2ff5e867b47c99f7f54531c3;hb=8ec32940e425c028d7669b1dc9a81d8d72859e71;hp=1677509b779aa12c0f6e77c756b43505baa6083c;hpb=530b7054a0f2800936ef312f016b9d55f9defddf;p=staging%2Fwindowmanager.git diff --git a/client-lib/AFBClient.cpp b/client-lib/AFBClient.cpp index 1677509..60743d9 100644 --- a/client-lib/AFBClient.cpp +++ b/client-lib/AFBClient.cpp @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + #include "AFBClient.h" #include @@ -68,13 +84,13 @@ namespace { constexpr const int token_maxlen = 20; constexpr const char *const wmAPI = "winman"; -#ifdef NDEBUG -#define TRACE() -#define TRACEN(N) -#else #define CONCAT_(X, Y) X##Y #define CONCAT(X, Y) CONCAT_(X, Y) +#ifndef SCOPE_TRACING +#define TRACE() +#define TRACEN(N) +#else #define TRACE() \ ScopeTrace __attribute__((unused)) CONCAT(trace_scope_, __LINE__)(__func__) #define TRACEN(N) \ @@ -223,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")); @@ -259,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( @@ -272,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( @@ -285,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( @@ -320,8 +336,8 @@ std::pair make_event_type(char const *et) { true, CONCAT(AFBClient::Event_, A)); \ } while (false) - ET("activated", Active); - ET("deactivated", Inactive); + ET("active", Active); + ET("inactive", Inactive); ET("visible", Visible); ET("invisible", Invisible); ET("syncdraw", SyncDraw);