mirrors/gstreamer-rs
mirrors/gstreamer-rs
1
1
Fork 1
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git synced 2024-11-25 02:51:10 +00:00
Code Issues Projects Releases Wiki Activity

video: Reuse Self::Err in from_str

Browse source
This commit is contained in:
Marijn Suijten 2020-11-28 12:34:36 +01:00
parent 2447664df6
commit 0763d2645d
10 changed files with 29 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gstreamer-audio/src/audio_format.rs
View file

@ -138,14 +138,12 @@ impl crate::AudioFormat {
impl str::FromStr for crate::AudioFormat {
type Err = glib::BoolError;
fn from_str(s: &str) -> Result<Self, glib::BoolError> {
fn from_str(s: &str) -> Result<Self, Self::Err> {
assert_initialized_main_thread!();
unsafe {
let fmt = crate::AudioFormat::from_glib(ffi::gst_audio_format_from_string(
s.to_glib_none().0,
));
if fmt == crate::AudioFormat::Unknown {
let fmt = Self::from_glib(ffi::gst_audio_format_from_string(s.to_glib_none().0));
if fmt == Self::Unknown {
Err(glib::glib_bool_error!(
"Failed to parse audio format from string"
))

4
gstreamer-audio/src/audio_format_info.rs
View file

@ -292,10 +292,10 @@ impl fmt::Display for AudioFormatInfo {
impl str::FromStr for crate::AudioFormatInfo {
type Err = glib::BoolError;
fn from_str(s: &str) -> Result<Self, glib::BoolError> {
fn from_str(s: &str) -> Result<Self, Self::Err> {
skip_assert_initialized!();
let format = s.parse()?;
Ok(AudioFormatInfo::from_format(format))
Ok(Self::from_format(format))
}
}

8
gstreamer-video/src/video_format.rs
View file

@ -339,15 +339,13 @@ impl crate::VideoFormat {
impl str::FromStr for crate::VideoFormat {
type Err = glib::BoolError;
fn from_str(s: &str) -> Result<Self, glib::BoolError> {
fn from_str(s: &str) -> Result<Self, Self::Err> {
assert_initialized_main_thread!();
unsafe {
let fmt = crate::VideoFormat::from_glib(ffi::gst_video_format_from_string(
s.to_glib_none().0,
));
let fmt = Self::from_glib(ffi::gst_video_format_from_string(s.to_glib_none().0));
if fmt == crate::VideoFormat::Unknown {
if fmt == Self::Unknown {
Err(glib::glib_bool_error!(
"Failed to parse video format from string"
))

4
gstreamer-video/src/video_format_info.rs
View file

@ -431,10 +431,10 @@ impl fmt::Display for VideoFormatInfo {
impl str::FromStr for crate::VideoFormatInfo {
type Err = glib::BoolError;
fn from_str(s: &str) -> Result<Self, glib::BoolError> {
fn from_str(s: &str) -> Result<Self, Self::Err> {
skip_assert_initialized!();
let format = s.parse()?;
Ok(VideoFormatInfo::from_format(format))
Ok(Self::from_format(format))
}
}

15
gstreamer-video/src/video_info.rs
View file

@ -139,7 +139,7 @@ impl Eq for VideoColorimetry {}
impl str::FromStr for crate::VideoColorimetry {
type Err = glib::error::BoolError;
fn from_str(s: &str) -> Result<Self, glib::error::BoolError> {
fn from_str(s: &str) -> Result<Self, Self::Err> {
assert_initialized_main_thread!();
unsafe {
@ -149,7 +149,7 @@ impl str::FromStr for crate::VideoColorimetry {
s.to_glib_none().0,
));
if valid {
Ok(VideoColorimetry(colorimetry.assume_init()))
Ok(Self(colorimetry.assume_init()))
} else {
Err(glib::glib_bool_error!("Invalid colorimetry info"))
}
@ -179,12 +179,13 @@ impl fmt::Display for crate::VideoColorimetry {
impl str::FromStr for crate::VideoChromaSite {
type Err = glib::error::BoolError;
fn from_str(s: &str) -> Result<Self, glib::error::BoolError> {
fn from_str(s: &str) -> Result<Self, Self::Err> {
assert_initialized_main_thread!();
unsafe {
let chroma_site = from_glib(ffi::gst_video_chroma_from_string(s.to_glib_none().0));
if chroma_site == crate::VideoChromaSite::empty() {
let chroma_site: Self =
from_glib(ffi::gst_video_chroma_from_string(s.to_glib_none().0));
if chroma_site.is_empty() {
Err(glib::glib_bool_error!("Invalid chroma site"))
} else {
Ok(chroma_site)
@ -1034,7 +1035,7 @@ impl crate::VideoFieldOrder {
impl str::FromStr for crate::VideoFieldOrder {
type Err = glib::error::BoolError;
fn from_str(s: &str) -> Result<Self, glib::error::BoolError> {
fn from_str(s: &str) -> Result<Self, Self::Err> {
assert_initialized_main_thread!();
unsafe {
@ -1066,7 +1067,7 @@ impl crate::VideoInterlaceMode {
impl str::FromStr for crate::VideoInterlaceMode {
type Err = glib::error::BoolError;
fn from_str(s: &str) -> Result<Self, glib::error::BoolError> {
fn from_str(s: &str) -> Result<Self, Self::Err> {
assert_initialized_main_thread!();
unsafe {

4
gstreamer-video/src/video_time_code.rs
View file

@ -475,10 +475,10 @@ generic_impl!(ValidVideoTimeCode);
impl str::FromStr for VideoTimeCode {
type Err = glib::error::BoolError;
fn from_str(s: &str) -> Result<Self, glib::error::BoolError> {
fn from_str(s: &str) -> Result<Self, Self::Err> {
assert_initialized_main_thread!();
unsafe {
Option::<VideoTimeCode>::from_glib_full(ffi::gst_video_time_code_new_from_string(
Option::<Self>::from_glib_full(ffi::gst_video_time_code_new_from_string(
s.to_glib_none().0,
))
.ok_or_else(|| glib::glib_bool_error!("Failed to create VideoTimeCode from string"))

8
gstreamer-video/src/video_time_code_interval.rs
View file

@ -120,12 +120,12 @@ impl fmt::Display for VideoTimeCodeInterval {
impl str::FromStr for VideoTimeCodeInterval {
type Err = glib::error::BoolError;
fn from_str(s: &str) -> Result<Self, glib::error::BoolError> {
fn from_str(s: &str) -> Result<Self, Self::Err> {
assert_initialized_main_thread!();
unsafe {
Option::<VideoTimeCodeInterval>::from_glib_full(
ffi::gst_video_time_code_interval_new_from_string(s.to_glib_none().0),
)
Option::<Self>::from_glib_full(ffi::gst_video_time_code_interval_new_from_string(
s.to_glib_none().0,
))
.ok_or_else(|| {
glib::glib_bool_error!("Failed to create VideoTimeCodeInterval from string")
})

2
gstreamer/src/caps.rs
View file

@ -161,7 +161,7 @@ impl Caps {
impl str::FromStr for Caps {
type Err = glib::BoolError;
fn from_str(s: &str) -> Result<Self, glib::BoolError> {
fn from_str(s: &str) -> Result<Self, Self::Err> {
assert_initialized_main_thread!();
unsafe {
Option::<_>::from_glib_full(ffi::gst_caps_from_string(s.to_glib_none().0))

4
gstreamer/src/caps_features.rs
View file

@ -123,7 +123,7 @@ impl fmt::Display for CapsFeatures {
impl str::FromStr for CapsFeatures {
type Err = glib::BoolError;
fn from_str(s: &str) -> Result<Self, glib::BoolError> {
fn from_str(s: &str) -> Result<Self, Self::Err> {
assert_initialized_main_thread!();
unsafe {
let ptr = ffi::gst_caps_features_from_string(s.to_glib_none().0);
@ -133,7 +133,7 @@ impl str::FromStr for CapsFeatures {
));
}
Ok(CapsFeatures(ptr::NonNull::new_unchecked(
Ok(Self(ptr::NonNull::new_unchecked(
ptr as *mut CapsFeaturesRef,
)))
}

4
gstreamer/src/structure.rs
View file

@ -181,7 +181,7 @@ impl Eq for Structure {}
impl str::FromStr for Structure {
type Err = glib::BoolError;
fn from_str(s: &str) -> Result<Self, glib::BoolError> {
fn from_str(s: &str) -> Result<Self, Self::Err> {
assert_initialized_main_thread!();
unsafe {
let structure = ffi::gst_structure_from_string(s.to_glib_none().0, ptr::null_mut());
@ -190,7 +190,7 @@ impl str::FromStr for Structure {
"Failed to parse structure from string"
))
} else {
Ok(Structure(ptr::NonNull::new_unchecked(
Ok(Self(ptr::NonNull::new_unchecked(
structure as *mut StructureRef,
)))
}