diff --git a/examples/src/bin/appsink.rs b/examples/src/bin/appsink.rs index 648f9b4cd..7e111c7ca 100644 --- a/examples/src/bin/appsink.rs +++ b/examples/src/bin/appsink.rs @@ -23,10 +23,9 @@ mod examples_common; #[derive(Debug, Display, Error)] #[display(fmt = "Received error from {}: {} (debug: {:?})", src, error, debug)] struct ErrorMessage { - src: String, - error: String, - debug: Option, - source: glib::Error, + src: glib::GString, + error: glib::Error, + debug: Option, } fn create_pipeline() -> Result { @@ -135,11 +134,10 @@ fn main_loop(pipeline: gst::Pipeline) -> Result<(), Error> { return Err(ErrorMessage { src: msg .src() - .map(|s| String::from(s.path_string())) - .unwrap_or_else(|| String::from("None")), - error: err.error().to_string(), + .map(|s| s.path_string()) + .unwrap_or_else(|| glib::GString::from("UNKNOWN")), + error: err.error(), debug: err.debug(), - source: err.error(), } .into()); } diff --git a/examples/src/bin/appsrc.rs b/examples/src/bin/appsrc.rs index 73690dff0..92ddba4ad 100644 --- a/examples/src/bin/appsrc.rs +++ b/examples/src/bin/appsrc.rs @@ -20,10 +20,9 @@ mod examples_common; #[derive(Debug, Display, Error)] #[display(fmt = "Received error from {}: {} (debug: {:?})", src, error, debug)] struct ErrorMessage { - src: String, - error: String, - debug: Option, - source: glib::Error, + src: glib::GString, + error: glib::Error, + debug: Option, } const WIDTH: usize = 320; @@ -151,11 +150,10 @@ fn main_loop(pipeline: gst::Pipeline) -> Result<(), Error> { return Err(ErrorMessage { src: msg .src() - .map(|s| String::from(s.path_string())) - .unwrap_or_else(|| String::from("None")), - error: err.error().to_string(), + .map(|s| s.path_string()) + .unwrap_or_else(|| glib::GString::from("UNKNOWN")), + error: err.error(), debug: err.debug(), - source: err.error(), } .into()); } diff --git a/examples/src/bin/decodebin.rs b/examples/src/bin/decodebin.rs index e287bfa7d..d38c3aef3 100644 --- a/examples/src/bin/decodebin.rs +++ b/examples/src/bin/decodebin.rs @@ -44,10 +44,9 @@ mod examples_common; #[derive(Debug, Display, Error)] #[display(fmt = "Received error from {}: {} (debug: {:?})", src, error, debug)] struct ErrorMessage { - src: String, - error: String, - debug: Option, - source: glib::Error, + src: glib::GString, + error: glib::Error, + debug: Option, } #[derive(Clone, Debug, glib::Boxed)] @@ -234,11 +233,10 @@ fn example_main() -> Result<(), Error> { _ => Err(ErrorMessage { src: msg .src() - .map(|s| String::from(s.path_string())) - .unwrap_or_else(|| String::from("None")), - error: err.error().to_string(), + .map(|s| s.path_string()) + .unwrap_or_else(|| glib::GString::from("UNKNOWN")), + error: err.error(), debug: err.debug(), - source: err.error(), } .into()), }?; diff --git a/examples/src/bin/encodebin.rs b/examples/src/bin/encodebin.rs index de71c4dbe..e43c3581d 100644 --- a/examples/src/bin/encodebin.rs +++ b/examples/src/bin/encodebin.rs @@ -28,10 +28,9 @@ mod examples_common; #[derive(Debug, Display, Error)] #[display(fmt = "Received error from {}: {} (debug: {:?})", src, error, debug)] struct ErrorMessage { - src: String, - error: String, - debug: Option, - source: glib::Error, + src: glib::GString, + error: glib::Error, + debug: Option, } #[derive(Clone, Debug, glib::Boxed)] @@ -251,11 +250,10 @@ fn example_main() -> Result<(), Error> { _ => Err(ErrorMessage { src: msg .src() - .map(|s| String::from(s.path_string())) - .unwrap_or_else(|| String::from("None")), - error: err.error().to_string(), + .map(|s| s.path_string()) + .unwrap_or_else(|| glib::GString::from("UNKNOWN")), + error: err.error(), debug: err.debug(), - source: err.error(), } .into()), }?; diff --git a/examples/src/bin/fd_allocator.rs b/examples/src/bin/fd_allocator.rs index ae5b2a4f4..0b89a5f03 100644 --- a/examples/src/bin/fd_allocator.rs +++ b/examples/src/bin/fd_allocator.rs @@ -20,7 +20,6 @@ use std::{ }; use anyhow::Error; -use derive_more::{Display, Error}; use futures::StreamExt; use gst::{element_error, prelude::*}; use memmap2::MmapMut; @@ -29,15 +28,6 @@ use uds::UnixStreamExt; #[path = "../examples-common.rs"] mod examples_common; -#[derive(Debug, Display, Error)] -#[display(fmt = "Received error from {}: {} (debug: {:?})", src, error, debug)] -struct ErrorMessage { - src: String, - error: String, - debug: Option, - source: glib::Error, -} - fn create_receiver_pipeline( video_info: &gst_video::VideoInfo, receiver: UnixStream, diff --git a/examples/src/bin/overlay-composition.rs b/examples/src/bin/overlay-composition.rs index 8fda4b92d..36c2e6339 100644 --- a/examples/src/bin/overlay-composition.rs +++ b/examples/src/bin/overlay-composition.rs @@ -24,10 +24,9 @@ mod examples_common; #[derive(Debug, Display, Error)] #[display(fmt = "Received error from {}: {} (debug: {:?})", src, error, debug)] struct ErrorMessage { - src: String, - error: String, - debug: Option, - source: glib::Error, + src: glib::GString, + error: glib::Error, + debug: Option, } struct DrawingContext { @@ -275,11 +274,10 @@ fn main_loop(pipeline: gst::Pipeline) -> Result<(), Error> { return Err(ErrorMessage { src: msg .src() - .map(|s| String::from(s.path_string())) - .unwrap_or_else(|| String::from("None")), - error: err.error().to_string(), + .map(|s| s.path_string()) + .unwrap_or_else(|| glib::GString::from("UNKNOWN")), + error: err.error(), debug: err.debug(), - source: err.error(), } .into()); } diff --git a/examples/src/bin/pango-cairo.rs b/examples/src/bin/pango-cairo.rs index 651fb9a33..a9b391fa2 100644 --- a/examples/src/bin/pango-cairo.rs +++ b/examples/src/bin/pango-cairo.rs @@ -27,10 +27,9 @@ mod examples_common; #[derive(Debug, Display, Error)] #[display(fmt = "Received error from {}: {} (debug: {:?})", src, error, debug)] struct ErrorMessage { - src: String, - error: String, - debug: Option, - source: glib::Error, + src: glib::GString, + error: glib::Error, + debug: Option, } struct DrawingContext { @@ -219,11 +218,10 @@ fn main_loop(pipeline: gst::Pipeline) -> Result<(), Error> { return Err(ErrorMessage { src: msg .src() - .map(|s| String::from(s.path_string())) - .unwrap_or_else(|| String::from("None")), - error: err.error().to_string(), + .map(|s| s.path_string()) + .unwrap_or_else(|| glib::GString::from("UNKNOWN")), + error: err.error(), debug: err.debug(), - source: err.error(), } .into()); } diff --git a/examples/src/bin/rtpfecclient.rs b/examples/src/bin/rtpfecclient.rs index 4182eb497..365934b38 100644 --- a/examples/src/bin/rtpfecclient.rs +++ b/examples/src/bin/rtpfecclient.rs @@ -23,10 +23,9 @@ struct UsageError(#[error(not(source))] String); #[derive(Debug, Display, Error)] #[display(fmt = "Received error from {}: {} (debug: {:?})", src, error, debug)] struct ErrorMessage { - src: String, - error: String, - debug: Option, - source: glib::Error, + src: glib::GString, + error: glib::Error, + debug: Option, } fn static_pad(element: &gst::Element, pad_name: &'static str) -> Result { @@ -243,11 +242,10 @@ fn example_main() -> Result<(), Error> { return Err(ErrorMessage { src: msg .src() - .map(|s| String::from(s.path_string())) - .unwrap_or_else(|| String::from("None")), - error: err.error().to_string(), + .map(|s| s.path_string()) + .unwrap_or_else(|| glib::GString::from("UNKNOWN")), + error: err.error(), debug: err.debug(), - source: err.error(), } .into()); } diff --git a/examples/src/bin/rtpfecserver.rs b/examples/src/bin/rtpfecserver.rs index b2d5f3b5a..3f9fe4df2 100644 --- a/examples/src/bin/rtpfecserver.rs +++ b/examples/src/bin/rtpfecserver.rs @@ -19,10 +19,9 @@ struct UsageError(#[error(not(source))] String); #[derive(Debug, Display, Error)] #[display(fmt = "Received error from {}: {} (debug: {:?})", src, error, debug)] struct ErrorMessage { - src: String, - error: String, - debug: Option, - source: glib::Error, + src: glib::GString, + error: glib::Error, + debug: Option, } fn static_pad(element: &gst::Element, pad_name: &'static str) -> Result { @@ -169,11 +168,10 @@ fn example_main() -> Result<(), Error> { return Err(ErrorMessage { src: msg .src() - .map(|s| String::from(s.path_string())) - .unwrap_or_else(|| String::from("None")), - error: err.error().to_string(), + .map(|s| s.path_string()) + .unwrap_or_else(|| glib::GString::from("UNKNOWN")), + error: err.error(), debug: err.debug(), - source: err.error(), } .into()); } diff --git a/examples/src/bin/subclass.rs b/examples/src/bin/subclass.rs index d328425d6..32397068c 100644 --- a/examples/src/bin/subclass.rs +++ b/examples/src/bin/subclass.rs @@ -231,10 +231,9 @@ mod fir_filter { #[derive(Debug, Display, Error)] #[display(fmt = "Received error from {}: {} (debug: {:?})", src, error, debug)] struct ErrorMessage { - src: String, - error: String, - debug: Option, - source: glib::Error, + src: glib::GString, + error: glib::Error, + debug: Option, } fn create_pipeline() -> Result { @@ -303,11 +302,10 @@ fn main_loop(pipeline: gst::Pipeline) -> Result<(), Error> { return Err(ErrorMessage { src: msg .src() - .map(|s| String::from(s.path_string())) - .unwrap_or_else(|| String::from("None")), - error: err.error().to_string(), + .map(|s| s.path_string()) + .unwrap_or_else(|| glib::GString::from("UNKNOWN")), + error: err.error(), debug: err.debug(), - source: err.error(), } .into()); } diff --git a/examples/src/bin/tagsetter.rs b/examples/src/bin/tagsetter.rs index 8dd71e71a..48f521151 100644 --- a/examples/src/bin/tagsetter.rs +++ b/examples/src/bin/tagsetter.rs @@ -32,10 +32,9 @@ struct MissingElement(#[error(not(source))] String); #[derive(Debug, Display, Error)] #[display(fmt = "Received error from {}: {} (debug: {:?})", src, error, debug)] struct ErrorMessage { - src: String, - error: String, - debug: Option, - source: glib::Error, + src: glib::GString, + error: glib::Error, + debug: Option, } fn example_main() -> Result<(), Error> { @@ -90,14 +89,12 @@ fn example_main() -> Result<(), Error> { MessageView::Eos(..) => break, MessageView::Error(err) => { return Err(ErrorMessage { - src: err + src: msg .src() .map(|s| s.path_string()) - .unwrap_or_else(|| "None".into()) - .to_string(), - error: err.error().to_string(), + .unwrap_or_else(|| glib::GString::from("UNKNOWN")), + error: err.error(), debug: err.debug(), - source: err.error(), } .into()); } diff --git a/examples/src/bin/thumbnail.rs b/examples/src/bin/thumbnail.rs index fd0468af7..caff63361 100644 --- a/examples/src/bin/thumbnail.rs +++ b/examples/src/bin/thumbnail.rs @@ -17,10 +17,9 @@ mod examples_common; #[derive(Debug, Display, Error)] #[display(fmt = "Received error from {}: {} (debug: {:?})", src, error, debug)] struct ErrorMessage { - src: String, - error: String, - debug: Option, - source: glib::Error, + src: glib::GString, + error: glib::Error, + debug: Option, } fn create_pipeline(uri: String, out_path: std::path::PathBuf) -> Result { @@ -202,11 +201,10 @@ fn main_loop(pipeline: gst::Pipeline, position: u64) -> Result<(), Error> { return Err(ErrorMessage { src: msg .src() - .map(|s| String::from(s.path_string())) - .unwrap_or_else(|| String::from("None")), - error: err.error().to_string(), + .map(|s| s.path_string()) + .unwrap_or_else(|| glib::GString::from("UNKNOWN")), + error: err.error(), debug: err.debug(), - source: err.error(), } .into()); } diff --git a/examples/src/bin/transmux.rs b/examples/src/bin/transmux.rs index 67c823545..f7c0ecf5f 100644 --- a/examples/src/bin/transmux.rs +++ b/examples/src/bin/transmux.rs @@ -29,10 +29,9 @@ mod examples_common; #[derive(Debug, Display, Error)] #[display(fmt = "Received error from {}: {} (debug: {:?})", src, error, debug)] struct ErrorMessage { - src: String, - error: String, - debug: Option, - source: glib::Error, + src: glib::GString, + error: glib::Error, + debug: Option, } fn example_main() -> Result<(), Error> { @@ -140,11 +139,10 @@ fn example_main() -> Result<(), Error> { return Err(ErrorMessage { src: msg .src() - .map(|s| String::from(s.path_string())) - .unwrap_or_else(|| String::from("None")), - error: err.error().to_string(), + .map(|s| s.path_string()) + .unwrap_or_else(|| glib::GString::from("UNKNOWN")), + error: err.error(), debug: err.debug(), - source: err.error(), } .into()); } diff --git a/examples/src/glupload.rs b/examples/src/glupload.rs index 5dd37c534..ec80e5994 100644 --- a/examples/src/glupload.rs +++ b/examples/src/glupload.rs @@ -14,10 +14,9 @@ use gst_gl::prelude::*; #[derive(Debug, Display, Error)] #[display(fmt = "Received error from {}: {} (debug: {:?})", src, error, debug)] struct ErrorMessage { - src: String, - error: String, - debug: Option, - source: glib::Error, + src: glib::GString, + error: glib::Error, + debug: Option, } #[rustfmt::skip] @@ -587,11 +586,10 @@ impl App { return Err(ErrorMessage { src: msg .src() - .map(|s| String::from(s.path_string())) - .unwrap_or_else(|| String::from("None")), - error: err.error().to_string(), + .map(|s| s.path_string()) + .unwrap_or_else(|| glib::GString::from("UNKNOWN")), + error: err.error(), debug: err.debug(), - source: err.error(), } .into()); } diff --git a/gstreamer/src/message.rs b/gstreamer/src/message.rs index 5606aa30c..c304ccdcd 100644 --- a/gstreamer/src/message.rs +++ b/gstreamer/src/message.rs @@ -339,7 +339,7 @@ impl Error { #[doc(alias = "get_debug")] #[doc(alias = "gst_message_parse_error")] - pub fn debug(&self) -> Option { + pub fn debug(&self) -> Option { unsafe { let mut debug = ptr::null_mut(); @@ -409,7 +409,7 @@ impl Warning { #[doc(alias = "get_debug")] #[doc(alias = "gst_message_parse_warning")] - pub fn debug(&self) -> Option { + pub fn debug(&self) -> Option { unsafe { let mut debug = ptr::null_mut(); @@ -479,7 +479,7 @@ impl Info { #[doc(alias = "get_debug")] #[doc(alias = "gst_message_parse_info")] - pub fn debug(&self) -> Option { + pub fn debug(&self) -> Option { unsafe { let mut debug = ptr::null_mut();