+/*
+ * 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 "json_helper.hpp"
#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);
-json_object *to_json(genivi::surface const *s) { return to_json_(s); }
+ // {"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);
-json_object *to_json(genivi::layer const *l) { return to_json_(l); }
+ // {"visibility", s.visibility},
+ json_object_object_add(
+ j, "visibility",
+ json_object_new_boolean(static_cast<json_bool>(s.visibility == 1)));
+
+ // {"opacity", s.opacity},
+ json_object_object_add(j, "opacity", json_object_new_double(s.opacity));
+
+ // {"orientation", s.orientation},
+ json_object_object_add(j, "orientation", json_object_new_int(s.orientation));
+
+ // });
+ return j;
+}
json_object *to_json(genivi::screen const *s) {
auto o = json_object_new_object();
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);
}