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

Allow creating Error/Warning/Info messages only from specific kinds of glib::Error domains

Browse source
This commit is contained in:
Sebastian Dröge 2017-09-15 18:35:54 +03:00
parent 96d00c4ecc
commit de10335167
2 changed files with 51 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gstreamer/src/lib.rs
View file

@ -64,7 +64,7 @@ pub use log::*;
pub mod miniobject;
pub use miniobject::{GstRc, MiniObject};
pub mod message;
pub use message::{Message, MessageRef, MessageView};
pub use message::{Message, MessageErrorDomain, MessageRef, MessageView};
pub mod structure;
pub use structure::{Structure, StructureRef};
pub mod caps;

75
gstreamer/src/message.rs
View file

@ -109,19 +109,19 @@ impl GstRc<MessageRef> {
EosBuilder::new()
}
pub fn new_error(error: &glib::Error) -> ErrorBuilder {
pub fn new_error<T: MessageErrorDomain>(error: T, message: &str) -> ErrorBuilder<T> {
assert_initialized_main_thread!();
ErrorBuilder::new(error)
ErrorBuilder::new(error, message)
}
pub fn new_warning(error: &glib::Error) -> WarningBuilder {
pub fn new_warning<T: MessageErrorDomain>(error: T, message: &str) -> WarningBuilder<T> {
assert_initialized_main_thread!();
WarningBuilder::new(error)
WarningBuilder::new(error, message)
}
pub fn new_info(error: &glib::Error) -> InfoBuilder {
pub fn new_info<T: MessageErrorDomain>(error: T, message: &str) -> InfoBuilder<T> {
assert_initialized_main_thread!();
InfoBuilder::new(error)
InfoBuilder::new(error, message)
}
pub fn new_tag(tags: &TagList) -> TagBuilder {
@ -1112,7 +1112,7 @@ impl<'a> Redirect<'a> {
macro_rules! message_builder_generic_impl {
($new_fn:expr) => {
pub fn src<T: IsA<Object> + Cast + Clone>(self, src: Option<&T>) -> Self {
pub fn src<O: IsA<Object> + Cast + Clone>(self, src: Option<&O>) -> Self {
Self {
src: src.map(|o| {
let o = (*o).clone();
@ -1181,22 +1181,31 @@ impl<'a> EosBuilder<'a> {
message_builder_generic_impl!(|_, src| ffi::gst_message_new_eos(src));
}
pub struct ErrorBuilder<'a> {
pub trait MessageErrorDomain: glib::error::ErrorDomain {}
impl MessageErrorDomain for ::CoreError {}
impl MessageErrorDomain for ::ResourceError {}
impl MessageErrorDomain for ::StreamError {}
impl MessageErrorDomain for ::LibraryError {}
pub struct ErrorBuilder<'a, T> {
src: Option<Object>,
seqnum: Option<u32>,
other_fields: Vec<(&'a str, &'a ToValue)>,
error: &'a glib::Error,
error: T,
message: &'a str,
debug: Option<&'a str>,
#[allow(unused)] details: Option<Structure>,
}
impl<'a> ErrorBuilder<'a> {
fn new(error: &'a glib::Error) -> Self {
impl<'a, T: MessageErrorDomain> ErrorBuilder<'a, T> {
fn new(error: T, message: &'a str) -> Self {
skip_assert_initialized!();
Self {
src: None,
seqnum: None,
other_fields: Vec::new(),
error: error,
message: message,
debug: None,
details: None,
}
@ -1225,40 +1234,46 @@ impl<'a> ErrorBuilder<'a> {
Some(details) => details.into_ptr(),
};
let error = glib::Error::new(s.error, s.message);
ffi::gst_message_new_error_with_details(
src,
mut_override(s.error.to_glib_none().0),
mut_override(error.to_glib_none().0),
s.debug.to_glib_none().0,
details,
)
}
#[cfg(not(feature = "v1_10"))]
{
let error = glib::Error::new(s.error, s.message);
ffi::gst_message_new_error(
src,
mut_override(s.error.to_glib_none().0),
mut_override(error.to_glib_none().0),
s.debug.to_glib_none().0,
)
}
});
}
pub struct WarningBuilder<'a> {
pub struct WarningBuilder<'a, T> {
src: Option<Object>,
seqnum: Option<u32>,
other_fields: Vec<(&'a str, &'a ToValue)>,
error: &'a glib::Error,
error: T,
message: &'a str,
debug: Option<&'a str>,
#[allow(unused)] details: Option<Structure>,
}
impl<'a> WarningBuilder<'a> {
fn new(error: &'a glib::Error) -> Self {
impl<'a, T: MessageErrorDomain> WarningBuilder<'a, T> {
fn new(error: T, message: &'a str) -> Self {
skip_assert_initialized!();
Self {
src: None,
seqnum: None,
other_fields: Vec::new(),
error: error,
message: message,
debug: None,
details: None,
}
@ -1287,40 +1302,46 @@ impl<'a> WarningBuilder<'a> {
Some(details) => details.into_ptr(),
};
let error = glib::Error::new(s.error, s.message);
ffi::gst_message_new_warning_with_details(
src,
mut_override(s.error.to_glib_none().0),
mut_override(error.to_glib_none().0),
s.debug.to_glib_none().0,
details,
)
}
#[cfg(not(feature = "v1_10"))]
{
let error = glib::Error::new(s.error, s.message);
ffi::gst_message_new_warning(
src,
mut_override(s.error.to_glib_none().0),
mut_override(error.to_glib_none().0),
s.debug.to_glib_none().0,
)
}
});
}
pub struct InfoBuilder<'a> {
pub struct InfoBuilder<'a, T> {
src: Option<Object>,
seqnum: Option<u32>,
other_fields: Vec<(&'a str, &'a ToValue)>,
error: &'a glib::Error,
error: T,
message: &'a str,
debug: Option<&'a str>,
#[allow(unused)] details: Option<Structure>,
}
impl<'a> InfoBuilder<'a> {
fn new(error: &'a glib::Error) -> Self {
impl<'a, T: MessageErrorDomain> InfoBuilder<'a, T> {
fn new(error: T, message: &'a str) -> Self {
skip_assert_initialized!();
Self {
src: None,
seqnum: None,
other_fields: Vec::new(),
error: error,
message: message,
debug: None,
details: None,
}
@ -1349,18 +1370,22 @@ impl<'a> InfoBuilder<'a> {
Some(details) => details.into_ptr(),
};
let error = glib::Error::new(s.error, s.message);
ffi::gst_message_new_info_with_details(
src,
mut_override(s.error.to_glib_none().0),
mut_override(error.to_glib_none().0),
s.debug.to_glib_none().0,
details,
)
}
#[cfg(not(feature = "v1_10"))]
{
let error = glib::Error::new(s.error, s.message);
ffi::gst_message_new_info(
src,
mut_override(s.error.to_glib_none().0),
mut_override(error.to_glib_none().0),
s.debug.to_glib_none().0,
)
}