From 67e6afc628935e5ca5b8e41b6e0f43ca5e73bef6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 22 Feb 2020 18:35:02 +0200 Subject: [PATCH] gstreamer/log: Allow any glib::Object as target for logging gst::Object is not actually required. For plain glib::Objects only the pointer address is printed instead of a name but it works fine. --- gstreamer/src/error.rs | 4 ++-- gstreamer/src/log.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gstreamer/src/error.rs b/gstreamer/src/error.rs index 520b2a631..cba004469 100644 --- a/gstreamer/src/error.rs +++ b/gstreamer/src/error.rs @@ -145,7 +145,7 @@ impl LoggableError { pub fn log(&self) { self.category.log( - None as Option<&::Object>, + None as Option<&glib::Object>, ::DebugLevel::Error, self.bool_error.filename, self.bool_error.function, @@ -154,7 +154,7 @@ impl LoggableError { ); } - pub fn log_with_object>(&self, obj: &O) { + pub fn log_with_object>(&self, obj: &O) { self.category.log( Some(obj), ::DebugLevel::Error, diff --git a/gstreamer/src/log.rs b/gstreamer/src/log.rs index a53adafd2..272a0e6ce 100644 --- a/gstreamer/src/log.rs +++ b/gstreamer/src/log.rs @@ -122,7 +122,7 @@ impl DebugCategory { } #[inline] - pub fn log>( + pub fn log>( self, obj: Option<&O>, level: ::DebugLevel, @@ -304,7 +304,7 @@ macro_rules! gst_log_with_level( module_path!(), line!(), format_args!($($args)*)) }}; ($cat:expr, level: $level:expr, $($args:tt)*) => { { - $crate::DebugCategory::log($cat.clone(), None as Option<&$crate::Object>, $level, file!(), + $crate::DebugCategory::log($cat.clone(), None as Option<&$crate::glib::Object>, $level, file!(), module_path!(), line!(), format_args!($($args)*)) }}; );