From bef6d741d3743562fbf9ded198fbb64004c20e09 Mon Sep 17 00:00:00 2001 From: Philippe Normand Date: Sun, 9 Dec 2018 16:09:20 +0000 Subject: [PATCH] Fix examples and tutorials for GString support --- examples/src/bin/appsink.rs | 6 +++--- examples/src/bin/appsrc.rs | 6 +++--- examples/src/bin/decodebin.rs | 13 ++++++------- examples/src/bin/encodebin.rs | 13 ++++++------- examples/src/bin/glupload.rs | 4 ++-- examples/src/bin/pango-cairo.rs | 8 +++++--- examples/src/bin/rtpfecclient.rs | 8 ++++---- examples/src/bin/rtpfecserver.rs | 8 ++++---- examples/src/bin/tagsetter.rs | 7 ++++--- examples/src/bin/transmux.rs | 6 +++--- tutorials/src/bin/basic-tutorial-9.rs | 2 +- 11 files changed, 41 insertions(+), 40 deletions(-) diff --git a/examples/src/bin/appsink.rs b/examples/src/bin/appsink.rs index 7373f6f01..5fa1d694a 100644 --- a/examples/src/bin/appsink.rs +++ b/examples/src/bin/appsink.rs @@ -173,12 +173,12 @@ fn main_loop(pipeline: gst::Pipeline) -> Result<(), Error> { MessageView::Error(err) => { pipeline.set_state(gst::State::Null).into_result()?; Err(ErrorMessage { - src: err + src: msg .get_src() - .map(|s| s.get_path_string()) + .map(|s| String::from(s.get_path_string())) .unwrap_or_else(|| String::from("None")), error: err.get_error().description().into(), - debug: err.get_debug(), + debug: Some(err.get_debug().unwrap().to_string()), cause: err.get_error(), })?; } diff --git a/examples/src/bin/appsrc.rs b/examples/src/bin/appsrc.rs index fb6175542..2fc610df9 100644 --- a/examples/src/bin/appsrc.rs +++ b/examples/src/bin/appsrc.rs @@ -155,12 +155,12 @@ fn main_loop(pipeline: gst::Pipeline) -> Result<(), Error> { MessageView::Error(err) => { pipeline.set_state(gst::State::Null).into_result()?; Err(ErrorMessage { - src: err + src: msg .get_src() - .map(|s| s.get_path_string()) + .map(|s| String::from(s.get_path_string())) .unwrap_or_else(|| String::from("None")), error: err.get_error().description().into(), - debug: err.get_debug(), + debug: Some(err.get_debug().unwrap().to_string()), cause: err.get_error(), })?; } diff --git a/examples/src/bin/decodebin.rs b/examples/src/bin/decodebin.rs index a14efc828..bbaa9a2f3 100644 --- a/examples/src/bin/decodebin.rs +++ b/examples/src/bin/decodebin.rs @@ -33,7 +33,6 @@ extern crate gstreamer as gst; use gst::prelude::*; -#[macro_use] extern crate glib; use std::env; @@ -275,12 +274,12 @@ fn example_main() -> Result<(), Error> { .map(Result::Err) .expect("error-details message without actual error"), _ => Err(ErrorMessage { - src: err + src: msg .get_src() - .map(|s| s.get_path_string()) + .map(|s| String::from(s.get_path_string())) .unwrap_or_else(|| String::from("None")), error: err.get_error().description().into(), - debug: err.get_debug(), + debug: Some(err.get_debug().unwrap().to_string()), cause: err.get_error(), } .into()), @@ -289,12 +288,12 @@ fn example_main() -> Result<(), Error> { #[cfg(not(feature = "v1_10"))] { Err(ErrorMessage { - src: err + src: msg .get_src() - .map(|s| s.get_path_string()) + .map(|s| String::from(s.get_path_string())) .unwrap_or_else(|| String::from("None")), error: err.get_error().description().into(), - debug: err.get_debug(), + debug: Some(err.get_debug().unwrap().to_string()), cause: err.get_error(), })?; } diff --git a/examples/src/bin/encodebin.rs b/examples/src/bin/encodebin.rs index f22a56474..f7a1a38b8 100644 --- a/examples/src/bin/encodebin.rs +++ b/examples/src/bin/encodebin.rs @@ -19,7 +19,6 @@ use gst::prelude::*; extern crate gstreamer_pbutils as gst_pbutils; use gst_pbutils::prelude::*; -#[macro_use] extern crate glib; use std::env; @@ -304,12 +303,12 @@ fn example_main() -> Result<(), Error> { .map(Result::Err) .expect("error-details message without actual error"), _ => Err(ErrorMessage { - src: err + src: msg .get_src() - .map(|s| s.get_path_string()) + .map(|s| String::from(s.get_path_string())) .unwrap_or_else(|| String::from("None")), error: err.get_error().description().into(), - debug: err.get_debug(), + debug: Some(err.get_debug().unwrap().to_string()), cause: err.get_error(), } .into()), @@ -318,12 +317,12 @@ fn example_main() -> Result<(), Error> { #[cfg(not(feature = "v1_10"))] { Err(ErrorMessage { - src: err + src: msg .get_src() - .map(|s| s.get_path_string()) + .map(|s| String::from(s.get_path_string())) .unwrap_or_else(|| String::from("None")), error: err.get_error().description().into(), - debug: err.get_debug(), + debug: Some(err.get_debug().unwrap().to_string()), cause: err.get_error(), })?; } diff --git a/examples/src/bin/glupload.rs b/examples/src/bin/glupload.rs index c6251e1ce..dc79df7bd 100644 --- a/examples/src/bin/glupload.rs +++ b/examples/src/bin/glupload.rs @@ -509,10 +509,10 @@ impl App { Err(ErrorMessage { src: msg .get_src() - .map(|s| s.get_path_string()) + .map(|s| String::from(s.get_path_string())) .unwrap_or_else(|| String::from("None")), error: err.get_error().description().into(), - debug: err.get_debug(), + debug: Some(err.get_debug().unwrap().to_string()), cause: err.get_error(), })?; } diff --git a/examples/src/bin/pango-cairo.rs b/examples/src/bin/pango-cairo.rs index e733fc37c..3bb6d7d75 100644 --- a/examples/src/bin/pango-cairo.rs +++ b/examples/src/bin/pango-cairo.rs @@ -29,6 +29,8 @@ use std::sync::{Arc, Mutex}; extern crate failure; use failure::Error; +use glib::GString; + #[macro_use] extern crate failure_derive; @@ -249,12 +251,12 @@ fn main_loop(pipeline: gst::Pipeline) -> Result<(), Error> { MessageView::Error(err) => { pipeline.set_state(gst::State::Null).into_result()?; Err(ErrorMessage { - src: err + src: msg .get_src() - .map(|s| s.get_path_string()) + .map(|s| String::from(s.get_path_string())) .unwrap_or_else(|| String::from("None")), error: err.get_error().description().into(), - debug: err.get_debug(), + debug: Some(err.get_debug().unwrap().to_string()), cause: err.get_error(), })?; } diff --git a/examples/src/bin/rtpfecclient.rs b/examples/src/bin/rtpfecclient.rs index 59a7aa724..85b7dc420 100644 --- a/examples/src/bin/rtpfecclient.rs +++ b/examples/src/bin/rtpfecclient.rs @@ -60,7 +60,7 @@ fn get_static_pad(element: &gst::Element, pad_name: &'static str) -> Result Ok(pad), None => { 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 Ok(pad), None => { 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 { src: msg .get_src() - .map(|s| s.get_path_string()) + .map(|s| String::from(s.get_path_string())) .unwrap_or_else(|| String::from("None")), error: err.get_error().description().into(), - debug: err.get_debug(), + debug: Some(err.get_debug().unwrap().to_string()), cause: err.get_error(), } .into()); diff --git a/examples/src/bin/rtpfecserver.rs b/examples/src/bin/rtpfecserver.rs index decef4421..2e837f129 100644 --- a/examples/src/bin/rtpfecserver.rs +++ b/examples/src/bin/rtpfecserver.rs @@ -57,7 +57,7 @@ fn get_static_pad(element: &gst::Element, pad_name: &'static str) -> Result Ok(pad), None => { 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 Ok(pad), None => { 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 { src: msg .get_src() - .map(|s| s.get_path_string()) + .map(|s| String::from(s.get_path_string())) .unwrap_or_else(|| String::from("None")), error: err.get_error().description().into(), - debug: err.get_debug(), + debug: Some(err.get_debug().unwrap().to_string()), cause: err.get_error(), } .into()); diff --git a/examples/src/bin/tagsetter.rs b/examples/src/bin/tagsetter.rs index aa8791eeb..608211189 100644 --- a/examples/src/bin/tagsetter.rs +++ b/examples/src/bin/tagsetter.rs @@ -64,7 +64,7 @@ fn example_main() -> Result<(), Error> { Ok(pipeline) => pipeline, Err(err) => { if let Some(gst::ParseError::NoSuchElement) = err.kind::() { - return Err(MissingElement(context.get_missing_elements().join(",")).into()); + return Err(MissingElement(context.get_missing_elements().join(",".into())).into()); } else { return Err(err.into()); } @@ -106,9 +106,10 @@ fn example_main() -> Result<(), Error> { src: err .get_src() .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(), - debug: err.get_debug(), + debug: Some(err.get_debug().unwrap().to_string()), cause: err.get_error(), })?; break; diff --git a/examples/src/bin/transmux.rs b/examples/src/bin/transmux.rs index 4bcd0debb..6f183ce47 100644 --- a/examples/src/bin/transmux.rs +++ b/examples/src/bin/transmux.rs @@ -168,12 +168,12 @@ fn example_main() -> Result<(), Error> { pipeline.set_state(gst::State::Null).into_result()?; Err(ErrorMessage { - src: err + src: msg .get_src() - .map(|s| s.get_path_string()) + .map(|s| String::from(s.get_path_string())) .unwrap_or_else(|| String::from("None")), error: err.get_error().description().into(), - debug: err.get_debug(), + debug: Some(err.get_debug().unwrap().to_string()), cause: err.get_error(), })?; break; diff --git a/tutorials/src/bin/basic-tutorial-9.rs b/tutorials/src/bin/basic-tutorial-9.rs index 2dbdaa57f..ae839f881 100644 --- a/tutorials/src/bin/basic-tutorial-9.rs +++ b/tutorials/src/bin/basic-tutorial-9.rs @@ -18,7 +18,7 @@ fn send_value_as_str(v: &glib::SendValue) -> Option { if let Some(s) = v.get::<&str>() { Some(s.to_string()) } else if let Some(serialized) = v.serialize() { - Some(serialized) + Some(serialized.into()) } else { None }