diff options
Diffstat (limited to 'src/wayland.cpp')
-rw-r--r-- | src/wayland.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/wayland.cpp b/src/wayland.cpp index ce20978..c19b0dc 100644 --- a/src/wayland.cpp +++ b/src/wayland.cpp @@ -158,24 +158,24 @@ namespace { void controller_screen(void *data, struct ivi_controller *ivi_controller, uint32_t id_screen, struct ivi_controller_screen *screen) { - static_cast<struct controller *>(data)->screen(id_screen, screen); + static_cast<struct controller *>(data)->controller_screen(id_screen, screen); } void controller_layer(void *data, struct ivi_controller *ivi_controller, uint32_t id_layer) { - static_cast<struct controller *>(data)->layer(id_layer); + static_cast<struct controller *>(data)->controller_layer(id_layer); } void controller_surface(void *data, struct ivi_controller *ivi_controller, uint32_t id_surface) { - static_cast<struct controller *>(data)->surface(id_surface); + static_cast<struct controller *>(data)->controller_surface(id_surface); } void controller_error(void *data, struct ivi_controller *ivi_controller, int32_t object_id, int32_t object_type, int32_t error_code, const char *error_text) { - static_cast<struct controller *>(data)->error(object_id, object_type, - error_code, error_text); + static_cast<struct controller *>(data)->controller_error( + object_id, object_type, error_code, error_text); } constexpr struct ivi_controller_listener listener = { @@ -190,24 +190,25 @@ controller::controller(struct wl_registry *r, uint32_t name, uint32_t version) controller::~controller() {} -void controller::screen(uint32_t id, struct ivi_controller_screen *screen) { +void controller::controller_screen(uint32_t id, + struct ivi_controller_screen *screen) { logdebug("genivi::controller @ %p screen %u (%x) @ %p", this->proxy, id, id, screen); this->screens[id] = std::make_unique<struct screen>(id, this, screen); } -void controller::layer(uint32_t id) { +void controller::controller_layer(uint32_t id) { logdebug("genivi::controller @ %p layer %u (%x)", this->proxy, id, id); this->layers[id] = std::make_unique<struct layer>(id, this); } -void controller::surface(uint32_t id) { +void controller::controller_surface(uint32_t id) { logdebug("genivi::controller @ %p surface %u (%x)", this->proxy, id, id); this->surfaces[id] = std::make_unique<struct surface>(id, this); } -void controller::error(int32_t object_id, int32_t object_type, - int32_t error_code, const char *error_text) { +void controller::controller_error(int32_t object_id, int32_t object_type, + int32_t error_code, const char *error_text) { logdebug("genivi::controller @ %p error o %i t %i c %i text %s", this->proxy, object_id, object_type, error_code, error_text); } |