mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2024-05-20 17:28:49 +00:00
Code Issues Projects Releases Wiki Activity

Minor cleanup

Browse source
This commit is contained in:
Sebastian Dröge 2017-04-24 10:13:32 +01:00
parent 9b593136da
commit 139c9be958
3 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gst-plugin/src/caps.rs
View file

@ -84,14 +84,22 @@ impl Caps {
pub fn get_structure(&self, idx: u32) -> Option<&Structure> {
unsafe {
let structure = gst::gst_caps_get_structure(self.as_ptr(), idx);
Structure::from_borrowed_ptr(structure as *const gst::GstStructure)
if structure.is_null() {
return None;
}
Some(Structure::from_borrowed_ptr(structure as *const gst::GstStructure))
}
}
pub fn get_mut_structure(&mut self, idx: u32) -> Option<&mut Structure> {
unsafe {
let structure = gst::gst_caps_get_structure(self.as_ptr(), idx);
Structure::from_borrowed_mut_ptr(structure as *mut gst::GstStructure)
if structure.is_null() {
return None;
}
Some(Structure::from_borrowed_mut_ptr(structure as *mut gst::GstStructure))
}
}

2
gst-plugin/src/miniobject.rs
View file

@ -146,10 +146,12 @@ pub unsafe trait MiniObject
}
unsafe fn from_ptr<'a>(ptr: *const Self::PtrType) -> &'a Self {
assert!(!ptr.is_null());
&*(ptr as *const Self)
}
unsafe fn from_mut_ptr<'a>(ptr: *mut Self::PtrType) -> &'a mut Self {
assert!(!ptr.is_null());
&mut *(ptr as *mut Self)
}
}

17
gst-plugin/src/structure.rs
View file

@ -141,21 +141,16 @@ impl ToOwned for Structure {
pub struct Structure(gst::GstStructure);
impl Structure {
pub unsafe fn from_borrowed_ptr<'a>(ptr: *const gst::GstStructure) -> Option<&'a Structure> {
if ptr.is_null() {
return None;
}
pub unsafe fn from_borrowed_ptr<'a>(ptr: *const gst::GstStructure) -> &'a Structure {
assert!(!ptr.is_null());
Some(&*(ptr as *mut Structure))
&*(ptr as *mut Structure)
}
pub unsafe fn from_borrowed_mut_ptr<'a>(ptr: *mut gst::GstStructure)
-> Option<&'a mut Structure> {
if ptr.is_null() {
return None;
}
pub unsafe fn from_borrowed_mut_ptr<'a>(ptr: *mut gst::GstStructure) -> &'a mut Structure {
assert!(!ptr.is_null());
Some(&mut *(ptr as *mut Structure))
&mut *(ptr as *mut Structure)
}
pub fn to_string(&self) -> String {