mirrors/gstreamer-rs
mirrors/gstreamer-rs
1
1
Fork 1
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git synced 2025-02-20 12:56:22 +00:00
Code Issues Projects Releases Wiki Activity

Use &ToValue instead of &Value for simple structure/caps setters/constructors

Browse source
This commit is contained in:
Sebastian Dröge 2017-07-27 23:36:44 +01:00
parent 3dac0c8b30
commit 27d191f854
2 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gstreamer/src/caps.rs
View file

@ -16,6 +16,7 @@ use CapsIntersectMode;
use glib; use glib;
use ffi; use ffi;
use glib::translate::{from_glib, from_glib_none, from_glib_full, ToGlibPtr, ToGlib}; use glib::translate::{from_glib, from_glib_none, from_glib_full, ToGlibPtr, ToGlib};
use glib::value::ToValue;
#[repr(C)] #[repr(C)]
pub struct CapsRef(ffi::GstCaps); pub struct CapsRef(ffi::GstCaps);
@ -37,7 +38,7 @@ impl GstRc<CapsRef> {
unsafe { from_glib_full(ffi::gst_caps_new_any()) } unsafe { from_glib_full(ffi::gst_caps_new_any()) }
} }
pub fn new_simple(name: &str, values: &[(&str, &glib::Value)]) -> Self { pub fn new_simple(name: &str, values: &[(&str, &ToValue)]) -> Self {
assert_initialized_main_thread!(); assert_initialized_main_thread!();
let mut caps = Caps::new_empty(); let mut caps = Caps::new_empty();
@ -103,8 +104,10 @@ impl str::FromStr for Caps {
} }
impl CapsRef { impl CapsRef {
pub fn set_simple(&mut self, values: &[(&str, &glib::Value)]) { pub fn set_simple(&mut self, values: &[(&str, &ToValue)]) {
for &(name, ref value) in values { for &(name, ref value) in values {
let value = value.to_value();
unsafe { unsafe {
ffi::gst_caps_set_value( ffi::gst_caps_set_value(
self.as_mut_ptr(), self.as_mut_ptr(),
@ -355,7 +358,6 @@ unsafe impl Send for CapsRef {}
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
use glib::ToValue;
use Fraction; use Fraction;
#[test] #[test]
@ -365,10 +367,10 @@ mod tests {
let caps = Caps::new_simple( let caps = Caps::new_simple(
"foo/bar", "foo/bar",
&[ &[
("int", &12.to_value()), ("int", &12),
("bool", &true.to_value()), ("bool", &true),
("string", &"bla".to_value()), ("string", &"bla"),
("fraction", &Fraction::new(1, 2).to_value()), ("fraction", &Fraction::new(1, 2)),
//("array", vec![1.into(), 2.into()].into()), //("array", vec![1.into(), 2.into()].into()),
], ],
); );
@ -385,10 +387,10 @@ mod tests {
Structure::new( Structure::new(
"foo/bar", "foo/bar",
&[ &[
("int", &12.to_value()), ("int", &12),
("bool", &true.to_value()), ("bool", &true),
("string", &"bla".to_value()), ("string", &"bla"),
("fraction", &Fraction::new(1, 2).to_value()) ("fraction", &Fraction::new(1, 2))
//("array", vec![1.into(), 2.into()].into()), //("array", vec![1.into(), 2.into()].into()),
], ],
).as_ref() ).as_ref()

10
gstreamer/src/structure.rs
View file

@ -34,12 +34,12 @@ impl Structure {
) )
} }
pub fn new(name: &str, values: &[(&str, &Value)]) -> Structure { pub fn new(name: &str, values: &[(&str, &ToValue)]) -> Structure {
assert_initialized_main_thread!(); assert_initialized_main_thread!();
let mut structure = Structure::new_empty(name); let mut structure = Structure::new_empty(name);
for &(f, v) in values { for &(f, v) in values {
structure.set_value(f, v.clone()); structure.set_value(f, v.to_value());
} }
structure structure
@ -590,9 +590,9 @@ mod tests {
let s2 = Structure::new( let s2 = Structure::new(
"test", "test",
&[ &[
("f1", &"abc".to_value()), ("f1", &"abc"),
("f2", &"bcd".to_value()), ("f2", &"bcd"),
("f3", &123i32.to_value()), ("f3", &123i32),
], ],
); );
assert_eq!(s, s2); assert_eq!(s, s2);