rafaelcaricio/gstreamer-rs
1
0
Fork 0
forked from mirrors/gstreamer-rs
Code Pull requests Activity

gstreamer: Reduce some code duplication in the logging code

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1163>
This commit is contained in:
Sebastian Dröge 2022-12-09 11:44:58 +02:00
parent 846bd77ef7
commit 2cf5347d1b
1 changed files with 2 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
gstreamer/src/log.rs
View file

@ -186,43 +186,7 @@ impl DebugCategory {
} }
} }
let obj_ptr = match obj { self.log_unfiltered(obj, level, file, module, line, args)
Some(obj) => obj.as_ptr() as *mut glib::gobject_ffi::GObject,
None => ptr::null_mut(),
};
let mut w = glib::GStringBuilder::default();
// Can't really happen but better safe than sorry
if fmt::write(&mut w, args).is_err() {
return;
}
#[cfg(feature = "v1_20")]
unsafe {
ffi::gst_debug_log_literal(
cat.as_ptr(),
level.into_glib(),
file.to_glib_none().0,
module.to_glib_none().0,
line as i32,
obj_ptr,
w.into_string().to_glib_none().0,
);
}
#[cfg(not(feature = "v1_20"))]
unsafe {
ffi::gst_debug_log(
cat.as_ptr(),
level.into_glib(),
file.to_glib_none().0,
module.to_glib_none().0,
line as i32,
obj_ptr,
b"%s\0".as_ptr() as *const _,
ToGlibPtr::<*const i8>::to_glib_none(&w.into_string()).0,
);
}
} }
// rustdoc-stripper-ignore-next // rustdoc-stripper-ignore-next
@ -315,17 +279,7 @@ impl DebugCategory {
return; return;
} }
unsafe { self.log_id_unfiltered(id, level, file, module, line, args);
ffi::gst_debug_log_id_literal(
cat.as_ptr(),
level.into_glib(),
file.to_glib_none().0,
module.to_glib_none().0,
line as i32,
id.to_glib_none().0,
w.into_string().to_glib_none().0,
);
}
} }
#[cfg(any(feature = "v1_22", feature = "dox"))] #[cfg(any(feature = "v1_22", feature = "dox"))]