mirrors/gstreamer-rs
mirrors/gstreamer-rs
1
1
Fork 1
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git synced 2025-09-03 18:33:51 +00:00
Code Issues Projects Releases Wiki Activity

Fix examples and tutorials for GString support

Browse source
This commit is contained in:
Philippe Normand 2018-12-09 16:09:20 +00:00 committed by Sebastian Dröge
parent 9534416760
commit bef6d741d3
11 changed files with 41 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
examples/src/bin/appsink.rs
View file

@ -173,12 +173,12 @@ fn main_loop(pipeline: gst::Pipeline) -> Result<(), Error> {
MessageView::Error(err) => { MessageView::Error(err) => {
pipeline.set_state(gst::State::Null).into_result()?; pipeline.set_state(gst::State::Null).into_result()?;
Err(ErrorMessage { Err(ErrorMessage {
src: err src: msg
.get_src() .get_src()
.map(|s| s.get_path_string()) .map(|s| String::from(s.get_path_string()))
.unwrap_or_else(|| String::from("None")), .unwrap_or_else(|| String::from("None")),
error: err.get_error().description().into(), error: err.get_error().description().into(),
debug: err.get_debug(), debug: Some(err.get_debug().unwrap().to_string()),
cause: err.get_error(), cause: err.get_error(),
})?; })?;
} }

6
examples/src/bin/appsrc.rs
View file

@ -155,12 +155,12 @@ fn main_loop(pipeline: gst::Pipeline) -> Result<(), Error> {
MessageView::Error(err) => { MessageView::Error(err) => {
pipeline.set_state(gst::State::Null).into_result()?; pipeline.set_state(gst::State::Null).into_result()?;
Err(ErrorMessage { Err(ErrorMessage {
src: err src: msg
.get_src() .get_src()
.map(|s| s.get_path_string()) .map(|s| String::from(s.get_path_string()))
.unwrap_or_else(|| String::from("None")), .unwrap_or_else(|| String::from("None")),
error: err.get_error().description().into(), error: err.get_error().description().into(),
debug: err.get_debug(), debug: Some(err.get_debug().unwrap().to_string()),
cause: err.get_error(), cause: err.get_error(),
})?; })?;
} }

13
examples/src/bin/decodebin.rs
View file

@ -33,7 +33,6 @@
extern crate gstreamer as gst; extern crate gstreamer as gst;
use gst::prelude::*; use gst::prelude::*;
#[macro_use]
extern crate glib; extern crate glib;
use std::env; use std::env;
@ -275,12 +274,12 @@ fn example_main() -> Result<(), Error> {
.map(Result::Err) .map(Result::Err)
.expect("error-details message without actual error"), .expect("error-details message without actual error"),
_ => Err(ErrorMessage { _ => Err(ErrorMessage {
src: err src: msg
.get_src() .get_src()
.map(|s| s.get_path_string()) .map(|s| String::from(s.get_path_string()))
.unwrap_or_else(|| String::from("None")), .unwrap_or_else(|| String::from("None")),
error: err.get_error().description().into(), error: err.get_error().description().into(),
debug: err.get_debug(), debug: Some(err.get_debug().unwrap().to_string()),
cause: err.get_error(), cause: err.get_error(),
} }
.into()), .into()),
@ -289,12 +288,12 @@ fn example_main() -> Result<(), Error> {
#[cfg(not(feature = "v1_10"))] #[cfg(not(feature = "v1_10"))]
{ {
Err(ErrorMessage { Err(ErrorMessage {
src: err src: msg
.get_src() .get_src()
.map(|s| s.get_path_string()) .map(|s| String::from(s.get_path_string()))
.unwrap_or_else(|| String::from("None")), .unwrap_or_else(|| String::from("None")),
error: err.get_error().description().into(), error: err.get_error().description().into(),
debug: err.get_debug(), debug: Some(err.get_debug().unwrap().to_string()),
cause: err.get_error(), cause: err.get_error(),
})?; })?;
} }

13
examples/src/bin/encodebin.rs
View file

@ -19,7 +19,6 @@ use gst::prelude::*;
extern crate gstreamer_pbutils as gst_pbutils; extern crate gstreamer_pbutils as gst_pbutils;
use gst_pbutils::prelude::*; use gst_pbutils::prelude::*;
#[macro_use]
extern crate glib; extern crate glib;
use std::env; use std::env;
@ -304,12 +303,12 @@ fn example_main() -> Result<(), Error> {
.map(Result::Err) .map(Result::Err)
.expect("error-details message without actual error"), .expect("error-details message without actual error"),
_ => Err(ErrorMessage { _ => Err(ErrorMessage {
src: err src: msg
.get_src() .get_src()
.map(|s| s.get_path_string()) .map(|s| String::from(s.get_path_string()))
.unwrap_or_else(|| String::from("None")), .unwrap_or_else(|| String::from("None")),
error: err.get_error().description().into(), error: err.get_error().description().into(),
debug: err.get_debug(), debug: Some(err.get_debug().unwrap().to_string()),
cause: err.get_error(), cause: err.get_error(),
} }
.into()), .into()),
@ -318,12 +317,12 @@ fn example_main() -> Result<(), Error> {
#[cfg(not(feature = "v1_10"))] #[cfg(not(feature = "v1_10"))]
{ {
Err(ErrorMessage { Err(ErrorMessage {
src: err src: msg
.get_src() .get_src()
.map(|s| s.get_path_string()) .map(|s| String::from(s.get_path_string()))
.unwrap_or_else(|| String::from("None")), .unwrap_or_else(|| String::from("None")),
error: err.get_error().description().into(), error: err.get_error().description().into(),
debug: err.get_debug(), debug: Some(err.get_debug().unwrap().to_string()),
cause: err.get_error(), cause: err.get_error(),
})?; })?;
} }

4
examples/src/bin/glupload.rs
View file

@ -509,10 +509,10 @@ impl App {
Err(ErrorMessage { Err(ErrorMessage {
src: msg src: msg
.get_src() .get_src()
.map(|s| s.get_path_string()) .map(|s| String::from(s.get_path_string()))
.unwrap_or_else(|| String::from("None")), .unwrap_or_else(|| String::from("None")),
error: err.get_error().description().into(), error: err.get_error().description().into(),
debug: err.get_debug(), debug: Some(err.get_debug().unwrap().to_string()),
cause: err.get_error(), cause: err.get_error(),
})?; })?;
} }

8
examples/src/bin/pango-cairo.rs
View file

@ -29,6 +29,8 @@ use std::sync::{Arc, Mutex};
extern crate failure; extern crate failure;
use failure::Error; use failure::Error;
use glib::GString;
#[macro_use] #[macro_use]
extern crate failure_derive; extern crate failure_derive;
@ -249,12 +251,12 @@ fn main_loop(pipeline: gst::Pipeline) -> Result<(), Error> {
MessageView::Error(err) => { MessageView::Error(err) => {
pipeline.set_state(gst::State::Null).into_result()?; pipeline.set_state(gst::State::Null).into_result()?;
Err(ErrorMessage { Err(ErrorMessage {
src: err src: msg
.get_src() .get_src()
.map(|s| s.get_path_string()) .map(|s| String::from(s.get_path_string()))
.unwrap_or_else(|| String::from("None")), .unwrap_or_else(|| String::from("None")),
error: err.get_error().description().into(), error: err.get_error().description().into(),
debug: err.get_debug(), debug: Some(err.get_debug().unwrap().to_string()),
cause: err.get_error(), cause: err.get_error(),
})?; })?;
} }

8
examples/src/bin/rtpfecclient.rs
View file

@ -60,7 +60,7 @@ fn get_static_pad(element: &gst::Element, pad_name: &'static str) -> Result<gst:
Some(pad) => Ok(pad), Some(pad) => Ok(pad),
None => { None => {
let element_name = element.get_name(); let element_name = element.get_name();
Err(Error::from(NoSuchPad(pad_name, element_name))) Err(Error::from(NoSuchPad(pad_name, element_name.to_string())))
} }
} }
} }
@ -70,7 +70,7 @@ fn get_request_pad(element: &gst::Element, pad_name: &'static str) -> Result<gst
Some(pad) => Ok(pad), Some(pad) => Ok(pad),
None => { None => {
let element_name = element.get_name(); let element_name = element.get_name();
Err(Error::from(NoSuchPad(pad_name, element_name))) Err(Error::from(NoSuchPad(pad_name, element_name.to_string())))
} }
} }
} }
@ -261,10 +261,10 @@ fn example_main() -> Result<(), Error> {
return Err(ErrorMessage { return Err(ErrorMessage {
src: msg src: msg
.get_src() .get_src()
.map(|s| s.get_path_string()) .map(|s| String::from(s.get_path_string()))
.unwrap_or_else(|| String::from("None")), .unwrap_or_else(|| String::from("None")),
error: err.get_error().description().into(), error: err.get_error().description().into(),
debug: err.get_debug(), debug: Some(err.get_debug().unwrap().to_string()),
cause: err.get_error(), cause: err.get_error(),
} }
.into()); .into());

8
examples/src/bin/rtpfecserver.rs
View file

@ -57,7 +57,7 @@ fn get_static_pad(element: &gst::Element, pad_name: &'static str) -> Result<gst:
Some(pad) => Ok(pad), Some(pad) => Ok(pad),
None => { None => {
let element_name = element.get_name(); let element_name = element.get_name();
Err(Error::from(NoSuchPad(pad_name, element_name))) Err(Error::from(NoSuchPad(pad_name, element_name.to_string())))
} }
} }
} }
@ -67,7 +67,7 @@ fn get_request_pad(element: &gst::Element, pad_name: &'static str) -> Result<gst
Some(pad) => Ok(pad), Some(pad) => Ok(pad),
None => { None => {
let element_name = element.get_name(); let element_name = element.get_name();
Err(Error::from(NoSuchPad(pad_name, element_name))) Err(Error::from(NoSuchPad(pad_name, element_name.to_string())))
} }
} }
} }
@ -192,10 +192,10 @@ fn example_main() -> Result<(), Error> {
return Err(ErrorMessage { return Err(ErrorMessage {
src: msg src: msg
.get_src() .get_src()
.map(|s| s.get_path_string()) .map(|s| String::from(s.get_path_string()))
.unwrap_or_else(|| String::from("None")), .unwrap_or_else(|| String::from("None")),
error: err.get_error().description().into(), error: err.get_error().description().into(),
debug: err.get_debug(), debug: Some(err.get_debug().unwrap().to_string()),
cause: err.get_error(), cause: err.get_error(),
} }
.into()); .into());

7
examples/src/bin/tagsetter.rs
View file

@ -64,7 +64,7 @@ fn example_main() -> Result<(), Error> {
Ok(pipeline) => pipeline, Ok(pipeline) => pipeline,
Err(err) => { Err(err) => {
if let Some(gst::ParseError::NoSuchElement) = err.kind::<gst::ParseError>() { if let Some(gst::ParseError::NoSuchElement) = err.kind::<gst::ParseError>() {
return Err(MissingElement(context.get_missing_elements().join(",")).into()); return Err(MissingElement(context.get_missing_elements().join(",".into())).into());
} else { } else {
return Err(err.into()); return Err(err.into());
} }
@ -106,9 +106,10 @@ fn example_main() -> Result<(), Error> {
src: err src: err
.get_src() .get_src()
.map(|s| s.get_path_string()) .map(|s| s.get_path_string())
.unwrap_or_else(|| String::from("None")), .unwrap_or_else(|| "None".into())
.to_string(),
error: err.get_error().description().into(), error: err.get_error().description().into(),
debug: err.get_debug(), debug: Some(err.get_debug().unwrap().to_string()),
cause: err.get_error(), cause: err.get_error(),
})?; })?;
break; break;

6
examples/src/bin/transmux.rs
View file

@ -168,12 +168,12 @@ fn example_main() -> Result<(), Error> {
pipeline.set_state(gst::State::Null).into_result()?; pipeline.set_state(gst::State::Null).into_result()?;
Err(ErrorMessage { Err(ErrorMessage {
src: err src: msg
.get_src() .get_src()
.map(|s| s.get_path_string()) .map(|s| String::from(s.get_path_string()))
.unwrap_or_else(|| String::from("None")), .unwrap_or_else(|| String::from("None")),
error: err.get_error().description().into(), error: err.get_error().description().into(),
debug: err.get_debug(), debug: Some(err.get_debug().unwrap().to_string()),
cause: err.get_error(), cause: err.get_error(),
})?; })?;
break; break;

2
tutorials/src/bin/basic-tutorial-9.rs
View file

@ -18,7 +18,7 @@ fn send_value_as_str(v: &glib::SendValue) -> Option<String> {
if let Some(s) = v.get::<&str>() { if let Some(s) = v.get::<&str>() {
Some(s.to_string()) Some(s.to_string())
} else if let Some(serialized) = v.serialize() { } else if let Some(serialized) = v.serialize() {
Some(serialized) Some(serialized.into())
} else { } else {
None None
} }