mirrors/gstreamer-rs
mirrors/gstreamer-rs
1
1
Fork 1
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git synced 2025-06-05 15:09:00 +00:00
Code Issues Projects Releases Wiki Activity

Code/text of progress messages is mandatory

Browse source
This commit is contained in:
Sebastian Dröge 2017-12-16 18:38:53 +02:00
parent 974e681a5d
commit bcf6b34c1b
1 changed files with 14 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
gstreamer/src/message.rs
View file

@ -278,9 +278,13 @@ impl GstRc<MessageRef> {
QosBuilder::new(live, running_time, stream_time, timestamp, duration) QosBuilder::new(live, running_time, stream_time, timestamp, duration)
} }
pub fn new_progress<'a>(type_: ::ProgressType) -> ProgressBuilder<'a> { pub fn new_progress<'a>(
type_: ::ProgressType,
code: &'a str,
text: &'a str,
) -> ProgressBuilder<'a> {
assert_initialized_main_thread!(); assert_initialized_main_thread!();
ProgressBuilder::new(type_) ProgressBuilder::new(type_, code, text)
} }
pub fn new_toc(toc: &::Toc, updated: bool) -> TocBuilder { pub fn new_toc(toc: &::Toc, updated: bool) -> TocBuilder {
@ -924,7 +928,7 @@ impl<'a> Qos<'a> {
pub struct Progress<'a>(&'a MessageRef); pub struct Progress<'a>(&'a MessageRef);
impl<'a> Progress<'a> { impl<'a> Progress<'a> {
pub fn get(&self) -> (::ProgressType, Option<&'a str>, Option<&'a str>) { pub fn get(&self) -> (::ProgressType, &'a str, &'a str) {
unsafe { unsafe {
let mut type_ = mem::uninitialized(); let mut type_ = mem::uninitialized();
let mut code = ptr::null_mut(); let mut code = ptr::null_mut();
@ -932,17 +936,8 @@ impl<'a> Progress<'a> {
ffi::gst_message_parse_progress(self.0.as_mut_ptr(), &mut type_, &mut code, &mut text); ffi::gst_message_parse_progress(self.0.as_mut_ptr(), &mut type_, &mut code, &mut text);
let code = if code.is_null() { let code = CStr::from_ptr(code).to_str().unwrap();
None let text = CStr::from_ptr(text).to_str().unwrap();
} else {
Some(CStr::from_ptr(code).to_str().unwrap())
};
let text = if text.is_null() {
None
} else {
Some(CStr::from_ptr(text).to_str().unwrap())
};
(from_glib(type_), code, text) (from_glib(type_), code, text)
} }
@ -2066,33 +2061,19 @@ pub struct ProgressBuilder<'a> {
seqnum: Option<Seqnum>, seqnum: Option<Seqnum>,
other_fields: Vec<(&'a str, &'a ToSendValue)>, other_fields: Vec<(&'a str, &'a ToSendValue)>,
type_: ::ProgressType, type_: ::ProgressType,
code: Option<&'a str>, code: &'a str,
text: Option<&'a str>, text: &'a str,
} }
impl<'a> ProgressBuilder<'a> { impl<'a> ProgressBuilder<'a> {
fn new(type_: ::ProgressType) -> Self { fn new(type_: ::ProgressType, code: &'a str, text: &'a str) -> Self {
skip_assert_initialized!(); skip_assert_initialized!();
Self { Self {
src: None, src: None,
seqnum: None, seqnum: None,
other_fields: Vec::new(), other_fields: Vec::new(),
type_: type_, type_: type_,
code: None, code: code,
text: None, text: text,
}
}
pub fn code(self, code: &'a str) -> Self {
Self {
code: Some(code),
..self
}
}
pub fn text(self, text: &'a str) -> Self {
Self {
text: Some(text),
..self
} }
} }