From 5a905147d566e62ceafd8f885143a49e2866947e Mon Sep 17 00:00:00 2001 From: Marcus Fritzsch Date: Tue, 27 Jun 2017 08:24:10 +0200 Subject: [PATCH] wayland: moved screen inline methods to .cpp Signed-off-by: Marcus Fritzsch --- src/wayland.cpp | 15 +++++++++++++++ src/wayland.hpp | 16 +++------------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/wayland.cpp b/src/wayland.cpp index 71dca0f..4678661 100644 --- a/src/wayland.cpp +++ b/src/wayland.cpp @@ -732,4 +732,19 @@ screen::screen(uint32_t i, struct controller *c, : wayland_proxy(p), controller_child(c, i) { logdebug("genivi::screen @ %p id %u", p, i); } + +void screen::clear() { ivi_controller_screen_clear(this->proxy); } + +void screen::add_layer(layer *l) { + ivi_controller_screen_add_layer(this->proxy, l->proxy); +} + +void screen::set_render_order(std::vector const &ro) { + struct wl_array wlro { + .size = ro.size() * sizeof(ro[0]), .alloc = ro.capacity() * sizeof(ro[0]), + .data = const_cast(static_cast(ro.data())) + }; + ivi_controller_screen_set_render_order(this->proxy, &wlro); +} + } // namespace genivi diff --git a/src/wayland.hpp b/src/wayland.hpp index 9a5541d..79dd7ae 100644 --- a/src/wayland.hpp +++ b/src/wayland.hpp @@ -208,19 +208,9 @@ struct layer : public wayland_proxy, struct screen : public wayland_proxy, controller_child { screen(uint32_t i, struct controller *c, struct ivi_controller_screen *p); - - void clear() { ivi_controller_screen_clear(this->proxy); } - void add_layer(layer *l) { - ivi_controller_screen_add_layer(this->proxy, l->proxy); - } - void set_render_order(std::vector const &ro) { - struct wl_array wlro { - .size = ro.size() * sizeof(ro[0]), - .alloc = ro.capacity() * sizeof(ro[0]), - .data = const_cast(static_cast(ro.data())) - }; - ivi_controller_screen_set_render_order(this->proxy, &wlro); - } + void clear(); + void add_layer(layer *l); + void set_render_order(std::vector const &ro); }; // _ _ _ -- 2.16.6