X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Flayers.cpp;h=0110f179cf4b8b0c02944c401b5a86c9d9dd380d;hb=d79d0c83452212355d212e8fcd4ad5c27c1906fc;hp=2209847241e46d4b4dc39de803f02983a5100efd;hpb=ef1b8f5fa4c2e939e9b6f08069ee08d362ee0ee5;p=staging%2Fwindowmanager.git diff --git a/src/layers.cpp b/src/layers.cpp index 2209847..0110f17 100644 --- a/src/layers.cpp +++ b/src/layers.cpp @@ -25,7 +25,6 @@ namespace wm { using json = nlohmann::json; layer::layer(nlohmann::json const &j) { - DB(j); if (j["type"] == "range") { this->id_min = j["first_surface_id"]; this->id_max = j["last_surface_id"]; @@ -45,7 +44,6 @@ layer::layer(nlohmann::json const &j) { } struct result to_layer_map(nlohmann::json const &j) { - DB(j); try { layer_map stl{}; auto m = j["mappings"]; @@ -76,7 +74,7 @@ struct result to_layer_map(nlohmann::json const &j) { auto jtests = j.value("tests", json()); if (!jtests.empty()) { - DB("Embedded tests..."); + logdebug("Embedded tests..."); std::vector> tests; tests.reserve(jtests.size()); std::transform(std::cbegin(jtests), std::cend(jtests), @@ -88,8 +86,7 @@ struct result to_layer_map(nlohmann::json const &j) { for (auto sid : tests) { int lid = stl.get_layer_id(sid.first).value_or(-1); - DB("this=" << sid.first << ", that=" << lid - << ", expect=" << sid.second); + logdebug("this=%d, that=%d, expect=%d", sid.first, lid, sid.second); if (lid != sid.second) { return Err("ID Map embedded test failed!"); }