From a7090b2a03697c0a210ee2ce18960e32ad97183f Mon Sep 17 00:00:00 2001 From: Tony Jinwoo Ahn Date: Sat, 23 Nov 2019 12:51:38 +0000 Subject: [PATCH] gstreamer-gl/wayland: Change a function from returning an Option to Results Partial work for: https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/issues/216 --- gstreamer-gl/src/gl_display_wayland.rs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/gstreamer-gl/src/gl_display_wayland.rs b/gstreamer-gl/src/gl_display_wayland.rs index 67c1a91fd..0d06fd386 100644 --- a/gstreamer-gl/src/gl_display_wayland.rs +++ b/gstreamer-gl/src/gl_display_wayland.rs @@ -13,9 +13,15 @@ use libc::uintptr_t; use GLDisplayWayland; impl GLDisplayWayland { - pub unsafe fn new_with_display(display: uintptr_t) -> Option { - from_glib_full(gst_gl_sys::gst_gl_display_wayland_new_with_display( + pub unsafe fn new_with_display( + display: uintptr_t, + ) -> Result { + let result = from_glib_full(gst_gl_sys::gst_gl_display_wayland_new_with_display( display as gpointer, - )) + )); + match result { + Some(d) => Ok(d), + None => Err(glib_bool_error!("Failed to create new Wayland GL display")), + } } }