From 1d2609d4487731754b9217d177bf324847f42dec Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Thu, 30 Apr 2020 09:49:06 +0200 Subject: [PATCH] gstreamer: Return any lifetime instead of 'static Following https://github.com/gtk-rs/glib/pull/633 --- gstreamer/src/structure.rs | 4 ++-- gstreamer/src/tags.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gstreamer/src/structure.rs b/gstreamer/src/structure.rs index 89f0bbe26..3825e5676 100644 --- a/gstreamer/src/structure.rs +++ b/gstreamer/src/structure.rs @@ -443,7 +443,7 @@ impl StructureRef { } } - pub fn get_name(&self) -> &'static str { + pub fn get_name<'a>(&self) -> &'a str { unsafe { CStr::from_ptr(gst_sys::gst_structure_get_name(&self.0)) .to_str() @@ -500,7 +500,7 @@ impl StructureRef { Iter::new(self) } - pub fn get_nth_field_name(&self, idx: u32) -> Option<&'static str> { + pub fn get_nth_field_name<'a>(&self, idx: u32) -> Option<&'a str> { unsafe { let field_name = gst_sys::gst_structure_nth_field_name(&self.0, idx); if field_name.is_null() { diff --git a/gstreamer/src/tags.rs b/gstreamer/src/tags.rs index e82439ae1..432dafaf9 100644 --- a/gstreamer/src/tags.rs +++ b/gstreamer/src/tags.rs @@ -798,7 +798,7 @@ pub fn tag_get_type(name: &str) -> glib::Type { unsafe { from_glib(gst_sys::gst_tag_get_type(name.to_glib_none().0)) } } -pub fn tag_get_nick(name: &str) -> Option<&'static str> { +pub fn tag_get_nick<'b>(name: &str) -> Option<&'b str> { skip_assert_initialized!(); unsafe { let ptr = gst_sys::gst_tag_get_nick(name.to_glib_none().0); @@ -811,7 +811,7 @@ pub fn tag_get_nick(name: &str) -> Option<&'static str> { } } -pub fn tag_get_description(name: &str) -> Option<&'static str> { +pub fn tag_get_description<'b>(name: &str) -> Option<&'b str> { skip_assert_initialized!(); unsafe { let ptr = gst_sys::gst_tag_get_description(name.to_glib_none().0);