summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Preisinger <alexander.preisinger@gmail.com>2014-04-26 14:50:01 +0200
committerwm4 <wm4@nowhere>2014-04-30 11:45:31 +0200
commit4eb5b62e5a49051ff87a75e3202a491adc4b6d40 (patch)
tree901d07c24896a0ddaa63f3d7bf63a54756a0d82f
parentb9e32d0d3d33cf66712fbbeea965d629a39ea7f9 (diff)
downloadmpv-4eb5b62e5a49051ff87a75e3202a491adc4b6d40.tar.bz2
mpv-4eb5b62e5a49051ff87a75e3202a491adc4b6d40.tar.xz
Revert "wayland: print waylands display erros"
This reverts commit 6e34b0ec1f50612cb2767da3dbc27be0be63041d. There has always been an error message "proxy already has a listener" and I couldn't reproduce where it is comming from until now. The display interface already has a listener and we can't overwrite it. Now remove the code and avoid this error message. Conflicts: video/out/wayland_common.c
-rw-r--r--video/out/wayland_common.c39
1 files changed, 0 insertions, 39 deletions
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c
index fe2b872d85..6f0d5c0635 100644
--- a/video/out/wayland_common.c
+++ b/video/out/wayland_common.c
@@ -112,43 +112,6 @@ static const struct mp_keymap keymap[] = {
/** Wayland listeners **/
-static void display_handle_error(void *data,
- struct wl_display *display,
- void *object_id,
- uint32_t code,
- const char *message)
-{
- struct vo_wayland_state *wl = data;
- const char * error_type_msg = "";
-
- switch (code) {
- case WL_DISPLAY_ERROR_INVALID_OBJECT:
- error_type_msg = "Invalid object";
- break;
- case WL_DISPLAY_ERROR_INVALID_METHOD:
- error_type_msg = "Invalid method";
- break;
- case WL_DISPLAY_ERROR_NO_MEMORY:
- error_type_msg = "No memory";
- break;
- }
-
- MP_ERR(wl, "%s: %s\n", error_type_msg, message);
-}
-
-static void display_handle_delete_id(void *data,
- struct wl_display *display,
- uint32_t id)
-{
- struct vo_wayland_state *wl = data;
- MP_DBG(wl, "Object %u deleted\n", id);
-}
-
-static const struct wl_display_listener display_listener = {
- display_handle_error,
- display_handle_delete_id
-};
-
static void ssurface_handle_ping(void *data,
struct wl_shell_surface *shell_surface,
uint32_t serial)
@@ -644,8 +607,6 @@ static bool create_display (struct vo_wayland_state *wl)
return false;
}
- wl_display_add_listener(wl->display.display, &display_listener, wl);
-
wl->display.registry = wl_display_get_registry(wl->display.display);
wl_registry_add_listener(wl->display.registry, &registry_listener, wl);