mirrors/gstreamer-rs
mirrors/gstreamer-rs
1
1
Fork 1
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git synced 2024-11-26 11:31:06 +00:00
Code Issues Projects Releases Wiki Activity

gstreamer/serde: Update for glib::Date API changes

Browse source
This commit is contained in:
Sebastian Dröge 2020-12-23 10:31:49 +02:00
parent 3428e5c0c7
commit 03f928ee0c
4 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gstreamer/src/date_time_serde.rs
View file

@ -123,7 +123,7 @@ impl TryFrom<DateTimeVariants> for Date {
month, month,
y.try_into() y.try_into()
.map_err(|_| glib::bool_error!("Out of range `year` for `Date`"))?, .map_err(|_| glib::bool_error!("Out of range `year` for `Date`"))?,
))) )?))
} }
_ => Err(glib::bool_error!( _ => Err(glib::bool_error!(
"Incompatible variant for `Date` (expecting \"YMD\")" "Incompatible variant for `Date` (expecting \"YMD\")"

6
gstreamer/src/structure_serde.rs
View file

@ -178,7 +178,7 @@ mod tests {
.field("f2", &String::from("bcd")) .field("f2", &String::from("bcd"))
.field("f3", &123i32) .field("f3", &123i32)
.field("fraction", &Fraction::new(1, 2)) .field("fraction", &Fraction::new(1, 2))
.field("date", &Date::new_dmy(19, DateMonth::August, 2019)) .field("date", &Date::new_dmy(19, DateMonth::August, 2019).unwrap())
.field( .field(
"date_time", "date_time",
&DateTime::new(2f32, 2019, 8, 19, 13, 34, 42f64).unwrap(), &DateTime::new(2f32, 2019, 8, 19, 13, 34, 42f64).unwrap(),
@ -236,7 +236,7 @@ mod tests {
("f1", &"abc"), ("f1", &"abc"),
("f2", &"bcd"), ("f2", &"bcd"),
("f3", &123), ("f3", &123),
("date", &Date::new_dmy(19, DateMonth::August, 2019)), ("date", &Date::new_dmy(19, DateMonth::August, 2019).unwrap()),
( (
"date_time", "date_time",
&DateTime::new(2f32, 2019, 8, 19, 13, 34, 42f64).unwrap() &DateTime::new(2f32, 2019, 8, 19, 13, 34, 42f64).unwrap()
@ -258,7 +258,7 @@ mod tests {
.field("f2", &"bcd".to_owned()) .field("f2", &"bcd".to_owned())
.field("f3", &123i32) .field("f3", &123i32)
.field("fraction", &Fraction::new(1, 2)) .field("fraction", &Fraction::new(1, 2))
.field("date", &Date::new_dmy(19, DateMonth::August, 2019)) .field("date", &Date::new_dmy(19, DateMonth::August, 2019).unwrap())
.field( .field(
"date_time", "date_time",
&DateTime::new(2f32, 2019, 8, 19, 13, 34, 42f64).unwrap(), &DateTime::new(2f32, 2019, 8, 19, 13, 34, 42f64).unwrap(),

8
gstreamer/src/tags_serde.rs
View file

@ -341,7 +341,7 @@ mod tests {
tags.add::<Bitrate>(&96_000, TagMergeMode::Append); // u32 tags.add::<Bitrate>(&96_000, TagMergeMode::Append); // u32
tags.add::<TrackGain>(&1f64, TagMergeMode::Append); // f64 tags.add::<TrackGain>(&1f64, TagMergeMode::Append); // f64
tags.add::<Date>( tags.add::<Date>(
&glib::Date::new_dmy(28, glib::DateMonth::May, 2018), &glib::Date::new_dmy(28, glib::DateMonth::May, 2018).unwrap(),
TagMergeMode::Append, TagMergeMode::Append,
); );
tags.add::<DateTime>( tags.add::<DateTime>(
@ -491,7 +491,7 @@ mod tests {
); );
assert_eq!( assert_eq!(
tags.get_index::<Date>(0).unwrap().get().unwrap(), tags.get_index::<Date>(0).unwrap().get().unwrap(),
glib::Date::new_dmy(28, glib::DateMonth::May, 2018) glib::Date::new_dmy(28, glib::DateMonth::May, 2018).unwrap()
); );
assert_eq!( assert_eq!(
tags.get_index::<DateTime>(0).unwrap().get().unwrap(), tags.get_index::<DateTime>(0).unwrap().get().unwrap(),
@ -532,7 +532,7 @@ mod tests {
); );
assert_eq!( assert_eq!(
tags.get_index::<Date>(0).unwrap().get().unwrap(), tags.get_index::<Date>(0).unwrap().get().unwrap(),
glib::Date::new_dmy(28, glib::DateMonth::May, 2018) glib::Date::new_dmy(28, glib::DateMonth::May, 2018).unwrap()
); );
assert_eq!( assert_eq!(
tags.get_index::<DateTime>(0).unwrap().get().unwrap(), tags.get_index::<DateTime>(0).unwrap().get().unwrap(),
@ -561,7 +561,7 @@ mod tests {
tags.add::<Bitrate>(&96_000, TagMergeMode::Append); // u32 tags.add::<Bitrate>(&96_000, TagMergeMode::Append); // u32
tags.add::<TrackGain>(&1f64, TagMergeMode::Append); // f64 tags.add::<TrackGain>(&1f64, TagMergeMode::Append); // f64
tags.add::<Date>( tags.add::<Date>(
&glib::Date::new_dmy(28, glib::DateMonth::May, 2018), &glib::Date::new_dmy(28, glib::DateMonth::May, 2018).unwrap(),
TagMergeMode::Append, TagMergeMode::Append,
); );
tags.add::<DateTime>( tags.add::<DateTime>(

8
gstreamer/src/value_serde.rs
View file

@ -364,7 +364,7 @@ mod tests {
let value_12 = Fraction::new(1, 2); let value_12 = Fraction::new(1, 2);
let value_str = "test str"; let value_str = "test str";
let value_str_none: Option<&str> = None; let value_str_none: Option<&str> = None;
let value_date = Date::new_dmy(19, DateMonth::August, 2019); let value_date = Date::new_dmy(19, DateMonth::August, 2019).unwrap();
let value_date_none: Option<Date> = None; let value_date_none: Option<Date> = None;
let array = Array::new(&[ let array = Array::new(&[
@ -555,7 +555,7 @@ mod tests {
assert!(slice[3].get::<String>().expect("slice[3]").is_none()); assert!(slice[3].get::<String>().expect("slice[3]").is_none());
assert_eq!( assert_eq!(
Date::new_dmy(19, DateMonth::August, 2019), Date::new_dmy(19, DateMonth::August, 2019).unwrap(),
slice[4].get::<Date>().expect("slice[4]").unwrap() slice[4].get::<Date>().expect("slice[4]").unwrap()
); );
@ -582,7 +582,7 @@ mod tests {
assert!(slice[3].get::<String>().expect("slice[3]").is_none()); assert!(slice[3].get::<String>().expect("slice[3]").is_none());
assert_eq!( assert_eq!(
Date::new_dmy(19, DateMonth::August, 2019), Date::new_dmy(19, DateMonth::August, 2019).unwrap(),
slice[4].get::<Date>().expect("slice[4]").unwrap() slice[4].get::<Date>().expect("slice[4]").unwrap()
); );
@ -628,7 +628,7 @@ mod tests {
let value_12 = Fraction::new(1, 2); let value_12 = Fraction::new(1, 2);
let value_str = "test str"; let value_str = "test str";
let value_str_none: Option<&str> = None; let value_str_none: Option<&str> = None;
let value_date = Date::new_dmy(19, DateMonth::August, 2019); let value_date = Date::new_dmy(19, DateMonth::August, 2019).unwrap();
let value_date_none: Option<Date> = None; let value_date_none: Option<Date> = None;
let array = Array::new(&[ let array = Array::new(&[