X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fjson_helper.cpp;h=93e6d698770e8e5fd1f57f6cf01245d579ce0398;hb=9ce5644a2350f8acbf606b2ee1073727578111ee;hp=823c030a0ed2472a9c9f80b99880f3185114d49b;hpb=9dfa6b9427115e7402ce25e40e4d78b20d559c93;p=staging%2Fwindowmanager.git

diff --git a/src/json_helper.cpp b/src/json_helper.cpp
index 823c030..93e6d69 100644
--- a/src/json_helper.cpp
+++ b/src/json_helper.cpp
@@ -2,35 +2,55 @@
 
 #include <json.h>
 
-#include <json.hpp>
+json_object *to_json(genivi::surface_properties const &s) {
+   // auto j = json::object({
+   auto j = json_object_new_object();
 
-using json = nlohmann::json;
+   //    {"id", s.id},
+   json_object_object_add(j, "id", json_object_new_int(s.id));
 
-template <typename T>
-json_object *to_json_(T const *s) {
-   auto j = json::object({
-      {"id", s->id},
-      {"size", {{"width", s->size.w}, {"height", s->size.h}}},
-      {"dst",
-       {{"width", s->dst_rect.w},
-        {"height", s->dst_rect.h},
-        {"x", s->dst_rect.x},
-        {"y", s->dst_rect.y}}},
-      {"src",
-       {{"width", s->src_rect.w},
-        {"height", s->src_rect.h},
-        {"x", s->src_rect.x},
-        {"y", s->src_rect.y}}},
-      {"visibility", s->visibility},
-      {"opacity", s->opacity},
-      {"orientation", s->orientation},
-   });
-   return json_tokener_parse(j.dump().c_str());
-}
+   //    {"size", {{"width", s.size.w}, {"height", s.size.h}}},
+   auto jsize = json_object_new_object();
+   json_object_object_add(jsize, "width", json_object_new_int(s.size.w));
+   json_object_object_add(jsize, "height", json_object_new_int(s.size.h));
+   json_object_object_add(j, "size", jsize);
+
+   //    {"dst",
+   //     {{"width", s.dst_rect.w},
+   //      {"height", s.dst_rect.h},
+   //      {"x", s.dst_rect.x},
+   //      {"y", s.dst_rect.y}}},
+   auto jdst = json_object_new_object();
+   json_object_object_add(jdst, "width", json_object_new_int(s.dst_rect.w));
+   json_object_object_add(jdst, "height", json_object_new_int(s.dst_rect.h));
+   json_object_object_add(jdst, "x", json_object_new_int(s.dst_rect.x));
+   json_object_object_add(jdst, "y", json_object_new_int(s.dst_rect.y));
+   json_object_object_add(j, "dst", jdst);
+
+   //    {"src",
+   //     {{"width", s.src_rect.w},
+   //      {"height", s.src_rect.h},
+   //      {"x", s.src_rect.x},
+   //      {"y", s.src_rect.y}}},
+   auto jsrc = json_object_new_object();
+   json_object_object_add(jsrc, "width", json_object_new_int(s.src_rect.w));
+   json_object_object_add(jsrc, "height", json_object_new_int(s.src_rect.h));
+   json_object_object_add(jsrc, "x", json_object_new_int(s.src_rect.x));
+   json_object_object_add(jsrc, "y", json_object_new_int(s.src_rect.y));
+   json_object_object_add(j, "src", jsrc);
+
+   //    {"visibility", s.visibility},
+   json_object_object_add(j, "visibility", json_object_new_boolean(s.visibility == 1));
+
+   //    {"opacity", s.opacity},
+   json_object_object_add(j, "opacity", json_object_new_double(s.opacity));
 
-json_object *to_json(genivi::surface const *s) { return to_json_(s); }
+   //    {"orientation", s.orientation},
+   json_object_object_add(j, "orientation", json_object_new_int(s.orientation));
 
-json_object *to_json(genivi::layer const *l) { return to_json_(l); }
+   // });
+   return j;
+}
 
 json_object *to_json(genivi::screen const *s) {
    auto o = json_object_new_object();
@@ -44,22 +64,14 @@ json_object *to_json_(T const &s) {
 
    if (!s.empty()) {
       for (auto const &i : s) {
-         json_object_array_add(a, to_json(i.second.get()));
+         json_object_array_add(a, to_json(i.second));
       }
    }
 
    return a;
 }
 
-json_object *to_json(genivi::controller::surface_map_type const &s) {
-   return to_json_(s);
-}
-
-json_object *to_json(genivi::controller::layer_map_type const &l) {
-   return to_json_(l);
-}
-
-json_object *to_json(genivi::controller::screen_map_type const &s) {
+json_object *to_json(genivi::controller::props_map const &s) {
    return to_json_(s);
 }