wayland: moved screen inline methods to .cpp
authorMarcus Fritzsch <marcus_fritzsch@mentor.com>
Tue, 27 Jun 2017 06:24:10 +0000 (08:24 +0200)
committerMarcus Fritzsch <marcus_fritzsch@mentor.com>
Tue, 8 Aug 2017 15:24:00 +0000 (17:24 +0200)
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
src/wayland.cpp
src/wayland.hpp

index 71dca0f..4678661 100644 (file)
@@ -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<uint32_t> const &ro) {
+   struct wl_array wlro {
+      .size = ro.size() * sizeof(ro[0]), .alloc = ro.capacity() * sizeof(ro[0]),
+      .data = const_cast<void *>(static_cast<void const *>(ro.data()))
+   };
+   ivi_controller_screen_set_render_order(this->proxy, &wlro);
+}
+
 }  // namespace genivi
index 9a5541d..79dd7ae 100644 (file)
@@ -208,19 +208,9 @@ struct layer : public wayland_proxy<struct ivi_controller_layer>,
 struct screen : public wayland_proxy<struct ivi_controller_screen>,
                 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<uint32_t> const &ro) {
-      struct wl_array wlro {
-         .size = ro.size() * sizeof(ro[0]),
-         .alloc = ro.capacity() * sizeof(ro[0]),
-         .data = const_cast<void *>(static_cast<void const *>(ro.data()))
-      };
-      ivi_controller_screen_set_render_order(this->proxy, &wlro);
-   }
+   void clear();
+   void add_layer(layer *l);
+   void set_render_order(std::vector<uint32_t> const &ro);
 };
 
 //                  _             _ _