diff options
| -rw-r--r-- | src/app.cpp | 4 | ||||
| -rw-r--r-- | src/json_helper.cpp | 2 | ||||
| -rw-r--r-- | src/wayland.cpp | 7 |
3 files changed, 3 insertions, 10 deletions
diff --git a/src/app.cpp b/src/app.cpp index 482aff1..871222f 100644 --- a/src/app.cpp +++ b/src/app.cpp @@ -4,10 +4,10 @@ #include "app.hpp" #include "json_helper.hpp" +#include "layers.hpp" #include "layout.hpp" #include "util.hpp" #include "wayland.hpp" -#include "layers.hpp" #include <cstdio> #include <memory> @@ -106,7 +106,7 @@ struct result<surface_id_to_layer_map> } // namespace App::App(wl::display *d) - : api{this}, display{d}, controller{}, outputs(), layouts() { + : api{this}, display{d}, controller{} { // layouts(load_layout("../layout.json").unwrap()) { assert(g_app == nullptr); g_app = this; diff --git a/src/json_helper.cpp b/src/json_helper.cpp index 93e6d69..45d2cb3 100644 --- a/src/json_helper.cpp +++ b/src/json_helper.cpp @@ -40,7 +40,7 @@ json_object *to_json(genivi::surface_properties const &s) { json_object_object_add(j, "src", jsrc); // {"visibility", s.visibility}, - json_object_object_add(j, "visibility", json_object_new_boolean(s.visibility == 1)); + 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)); diff --git a/src/wayland.cpp b/src/wayland.cpp index ff08488..424ad0d 100644 --- a/src/wayland.cpp +++ b/src/wayland.cpp @@ -191,13 +191,6 @@ constexpr struct ivi_controller_listener listener = { controller::controller(struct wl_registry *r, uint32_t name, uint32_t version) : wayland_proxy( wl_registry_bind(r, name, &ivi_controller_interface, version)), - surface_proxy_to_id{}, - layer_proxy_to_id{}, - screen_proxy_to_id{}, - surfaces{}, - layers{}, - screens{}, - pending{}, output_size{} { ivi_controller_add_listener(this->proxy.get(), &listener, this); } |