diff options
| -rw-r--r-- | layers.json | 12 | ||||
| -rw-r--r-- | src/json_helper.hpp | 10 | ||||
| -rw-r--r-- | src/layers.cpp | 2 |
3 files changed, 7 insertions, 17 deletions
diff --git a/layers.json b/layers.json index b5973a0..0208502 100644 --- a/layers.json +++ b/layers.json @@ -2,25 +2,25 @@ "comment": "Surface ID to Layer ID mapping", "main_surface": { - "surface_id": "1000", + "surface_id": 1000, "comment": "This surface should never be made invisible (The HomeScreen)" }, "layers": [ { "name": "HomeScreen", - "layer_id": "1000", + "layer_id": 1000, "area": { "type": "full" } }, { "name": "Apps", - "layer_id": "1001", - "area": { "type": "rect", "rect": { "x": "0", "y": "100", "width": "-1", "height": "-201" } } + "layer_id": 1001, + "area": { "type": "rect", "rect": { "x": 0, "y": 100, "width": -1, "height": -201 } } }, { "name": "Popups", - "layer_id": "9999", - "area": { "type": "rect", "rect": { "x": "0", "y": "100", "width": "-1", "height": "-201" } } + "layer_id": 9999, + "area": { "type": "rect", "rect": { "x": 0, "y": 100, "width": -1, "height": -201 } } } ], diff --git a/src/json_helper.hpp b/src/json_helper.hpp index 68aaa08..15d72c3 100644 --- a/src/json_helper.hpp +++ b/src/json_helper.hpp @@ -27,14 +27,4 @@ json_object *to_json(genivi::screen const *s); json_object *to_json(genivi::controller::props_map const &s); json_object *to_json(std::vector<uint32_t> const &v); -// We ned to manually unwrap numbers -template <typename T> -wm::result<T> get(nlohmann::json const &j) { - // DB(j); - T r; - std::istringstream s(j.get<std::string>()); - s >> r; - return !s.eof() || s.fail() ? wm::Err<T>("Could not read int") : wm::Ok(r); -} - #endif // TMCAGLWM_JSON_HELPER_HPP diff --git a/src/layers.cpp b/src/layers.cpp index 0110f17..8f79451 100644 --- a/src/layers.cpp +++ b/src/layers.cpp @@ -67,7 +67,7 @@ struct result<struct layer_map> to_layer_map(nlohmann::json const &j) { auto msi = j.find("main_surface"); if (msi != j.end()) { - stl.main_surface = get<int>((*msi)["surface_id"]); + stl.main_surface = (*msi)["surface_id"]; } // Check lookup |