From 82157700769858f90cf384812a334384bea4cd70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Thu, 10 Aug 2017 11:24:16 +0300 Subject: [PATCH] Move AudioFormat manual impls to new file --- gstreamer-audio/src/audio_format.rs | 122 +++++++++++++++++++++++ gstreamer-audio/src/audio_format_info.rs | 107 -------------------- gstreamer-audio/src/lib.rs | 2 + 3 files changed, 124 insertions(+), 107 deletions(-) create mode 100644 gstreamer-audio/src/audio_format.rs diff --git a/gstreamer-audio/src/audio_format.rs b/gstreamer-audio/src/audio_format.rs new file mode 100644 index 000000000..5521d7828 --- /dev/null +++ b/gstreamer-audio/src/audio_format.rs @@ -0,0 +1,122 @@ +// Copyright (C) 2017 Sebastian Dröge +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +use ffi; + +use std::ffi::CStr; +use std::fmt; +use std::str; + +use glib::translate::{from_glib, ToGlib, ToGlibPtr}; + +impl ::AudioFormat { + pub fn build_integer( + sign: bool, + endianness: ::AudioEndianness, + width: i32, + depth: i32, + ) -> ::AudioFormat { + unsafe { + from_glib(ffi::gst_audio_format_build_integer( + sign.to_glib(), + endianness.to_glib(), + width, + depth, + )) + } + } + + pub fn from_string(s: &str) -> ::AudioFormat { + unsafe { from_glib(ffi::gst_audio_format_from_string(s.to_glib_none().0)) } + } + + pub fn to_string(&self) -> &'static str { + unsafe { + CStr::from_ptr(ffi::gst_audio_format_to_string(self.to_glib())) + .to_str() + .unwrap() + } + } +} + +impl str::FromStr for ::AudioFormat { + type Err = (); + + fn from_str(s: &str) -> Result { + let format = Self::from_string(s); + if format == ::AudioFormat::Unknown { + Err(()) + } else { + Ok(format) + } + } +} + +impl fmt::Display for ::AudioFormat { + fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> { + f.write_str(self.to_string()) + } +} + +#[cfg(target_endian = "big")] +pub const AUDIO_FORMAT_S16: ::AudioFormat = ::AudioFormat::S16be; +#[cfg(target_endian = "big")] +pub const AUDIO_FORMAT_U16: ::AudioFormat = ::AudioFormat::U16be; +#[cfg(target_endian = "big")] +pub const AUDIO_FORMAT_S2432: ::AudioFormat = ::AudioFormat::S2432be; +#[cfg(target_endian = "big")] +pub const AUDIO_FORMAT_U2432: ::AudioFormat = ::AudioFormat::U2432be; +#[cfg(target_endian = "big")] +pub const AUDIO_FORMAT_S32: ::AudioFormat = ::AudioFormat::S32be; +#[cfg(target_endian = "big")] +pub const AUDIO_FORMAT_U32: ::AudioFormat = ::AudioFormat::U32be; +#[cfg(target_endian = "big")] +pub const AUDIO_FORMAT_S24: ::AudioFormat = ::AudioFormat::S24be; +#[cfg(target_endian = "big")] +pub const AUDIO_FORMAT_U24: ::AudioFormat = ::AudioFormat::U24be; +#[cfg(target_endian = "big")] +pub const AUDIO_FORMAT_S20: ::AudioFormat = ::AudioFormat::S20be; +#[cfg(target_endian = "big")] +pub const AUDIO_FORMAT_U20: ::AudioFormat = ::AudioFormat::U20be; +#[cfg(target_endian = "big")] +pub const AUDIO_FORMAT_S18: ::AudioFormat = ::AudioFormat::S18be; +#[cfg(target_endian = "big")] +pub const AUDIO_FORMAT_U18: ::AudioFormat = ::AudioFormat::U18be; +#[cfg(target_endian = "big")] +pub const AUDIO_FORMAT_F32: ::AudioFormat = ::AudioFormat::F32be; +#[cfg(target_endian = "big")] +pub const AUDIO_FORMAT_F64: ::AudioFormat = ::AudioFormat::F64be; + +#[cfg(target_endian = "little")] +pub const AUDIO_FORMAT_S16: ::AudioFormat = ::AudioFormat::S16le; +#[cfg(target_endian = "little")] +pub const AUDIO_FORMAT_U16: ::AudioFormat = ::AudioFormat::U16le; +#[cfg(target_endian = "little")] +pub const AUDIO_FORMAT_S2432: ::AudioFormat = ::AudioFormat::S2432le; +#[cfg(target_endian = "little")] +pub const AUDIO_FORMAT_U2432: ::AudioFormat = ::AudioFormat::U2432le; +#[cfg(target_endian = "little")] +pub const AUDIO_FORMAT_S32: ::AudioFormat = ::AudioFormat::S32le; +#[cfg(target_endian = "little")] +pub const AUDIO_FORMAT_U32: ::AudioFormat = ::AudioFormat::U32le; +#[cfg(target_endian = "little")] +pub const AUDIO_FORMAT_S24: ::AudioFormat = ::AudioFormat::S24le; +#[cfg(target_endian = "little")] +pub const AUDIO_FORMAT_U24: ::AudioFormat = ::AudioFormat::U24le; +#[cfg(target_endian = "little")] +pub const AUDIO_FORMAT_S20: ::AudioFormat = ::AudioFormat::S20le; +#[cfg(target_endian = "little")] +pub const AUDIO_FORMAT_U20: ::AudioFormat = ::AudioFormat::U20le; +#[cfg(target_endian = "little")] +pub const AUDIO_FORMAT_S18: ::AudioFormat = ::AudioFormat::S18le; +#[cfg(target_endian = "little")] +pub const AUDIO_FORMAT_U18: ::AudioFormat = ::AudioFormat::U18le; +#[cfg(target_endian = "little")] +pub const AUDIO_FORMAT_F32: ::AudioFormat = ::AudioFormat::F32le; +#[cfg(target_endian = "little")] +pub const AUDIO_FORMAT_F64: ::AudioFormat = ::AudioFormat::F64le; diff --git a/gstreamer-audio/src/audio_format_info.rs b/gstreamer-audio/src/audio_format_info.rs index 2ffbf10a2..ec5c0bd24 100644 --- a/gstreamer-audio/src/audio_format_info.rs +++ b/gstreamer-audio/src/audio_format_info.rs @@ -46,113 +46,6 @@ impl ToGlib for AudioEndianness { } } -impl ::AudioFormat { - pub fn build_integer( - sign: bool, - endianness: AudioEndianness, - width: i32, - depth: i32, - ) -> ::AudioFormat { - unsafe { - from_glib(ffi::gst_audio_format_build_integer( - sign.to_glib(), - endianness.to_glib(), - width, - depth, - )) - } - } - - pub fn from_string(s: &str) -> ::AudioFormat { - unsafe { from_glib(ffi::gst_audio_format_from_string(s.to_glib_none().0)) } - } - - pub fn to_string(&self) -> &'static str { - unsafe { - CStr::from_ptr(ffi::gst_audio_format_to_string(self.to_glib())) - .to_str() - .unwrap() - } - } -} - -impl str::FromStr for ::AudioFormat { - type Err = (); - - fn from_str(s: &str) -> Result { - let format = Self::from_string(s); - if format == ::AudioFormat::Unknown { - Err(()) - } else { - Ok(format) - } - } -} - -impl fmt::Display for ::AudioFormat { - fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> { - f.write_str(self.to_string()) - } -} - -#[cfg(target_endian = "big")] -pub const AUDIO_FORMAT_S16: ::AudioFormat = ::AudioFormat::S16be; -#[cfg(target_endian = "big")] -pub const AUDIO_FORMAT_U16: ::AudioFormat = ::AudioFormat::U16be; -#[cfg(target_endian = "big")] -pub const AUDIO_FORMAT_S2432: ::AudioFormat = ::AudioFormat::S2432be; -#[cfg(target_endian = "big")] -pub const AUDIO_FORMAT_U2432: ::AudioFormat = ::AudioFormat::U2432be; -#[cfg(target_endian = "big")] -pub const AUDIO_FORMAT_S32: ::AudioFormat = ::AudioFormat::S32be; -#[cfg(target_endian = "big")] -pub const AUDIO_FORMAT_U32: ::AudioFormat = ::AudioFormat::U32be; -#[cfg(target_endian = "big")] -pub const AUDIO_FORMAT_S24: ::AudioFormat = ::AudioFormat::S24be; -#[cfg(target_endian = "big")] -pub const AUDIO_FORMAT_U24: ::AudioFormat = ::AudioFormat::U24be; -#[cfg(target_endian = "big")] -pub const AUDIO_FORMAT_S20: ::AudioFormat = ::AudioFormat::S20be; -#[cfg(target_endian = "big")] -pub const AUDIO_FORMAT_U20: ::AudioFormat = ::AudioFormat::U20be; -#[cfg(target_endian = "big")] -pub const AUDIO_FORMAT_S18: ::AudioFormat = ::AudioFormat::S18be; -#[cfg(target_endian = "big")] -pub const AUDIO_FORMAT_U18: ::AudioFormat = ::AudioFormat::U18be; -#[cfg(target_endian = "big")] -pub const AUDIO_FORMAT_F32: ::AudioFormat = ::AudioFormat::F32be; -#[cfg(target_endian = "big")] -pub const AUDIO_FORMAT_F64: ::AudioFormat = ::AudioFormat::F64be; - -#[cfg(target_endian = "little")] -pub const AUDIO_FORMAT_S16: ::AudioFormat = ::AudioFormat::S16le; -#[cfg(target_endian = "little")] -pub const AUDIO_FORMAT_U16: ::AudioFormat = ::AudioFormat::U16le; -#[cfg(target_endian = "little")] -pub const AUDIO_FORMAT_S2432: ::AudioFormat = ::AudioFormat::S2432le; -#[cfg(target_endian = "little")] -pub const AUDIO_FORMAT_U2432: ::AudioFormat = ::AudioFormat::U2432le; -#[cfg(target_endian = "little")] -pub const AUDIO_FORMAT_S32: ::AudioFormat = ::AudioFormat::S32le; -#[cfg(target_endian = "little")] -pub const AUDIO_FORMAT_U32: ::AudioFormat = ::AudioFormat::U32le; -#[cfg(target_endian = "little")] -pub const AUDIO_FORMAT_S24: ::AudioFormat = ::AudioFormat::S24le; -#[cfg(target_endian = "little")] -pub const AUDIO_FORMAT_U24: ::AudioFormat = ::AudioFormat::U24le; -#[cfg(target_endian = "little")] -pub const AUDIO_FORMAT_S20: ::AudioFormat = ::AudioFormat::S20le; -#[cfg(target_endian = "little")] -pub const AUDIO_FORMAT_U20: ::AudioFormat = ::AudioFormat::U20le; -#[cfg(target_endian = "little")] -pub const AUDIO_FORMAT_S18: ::AudioFormat = ::AudioFormat::S18le; -#[cfg(target_endian = "little")] -pub const AUDIO_FORMAT_U18: ::AudioFormat = ::AudioFormat::U18le; -#[cfg(target_endian = "little")] -pub const AUDIO_FORMAT_F32: ::AudioFormat = ::AudioFormat::F32le; -#[cfg(target_endian = "little")] -pub const AUDIO_FORMAT_F64: ::AudioFormat = ::AudioFormat::F64le; - pub struct AudioFormatInfo(&'static ffi::GstAudioFormatInfo); impl AudioFormatInfo { diff --git a/gstreamer-audio/src/lib.rs b/gstreamer-audio/src/lib.rs index 95a62ef7f..780c2394c 100644 --- a/gstreamer-audio/src/lib.rs +++ b/gstreamer-audio/src/lib.rs @@ -40,6 +40,8 @@ mod auto; pub use auto::*; pub use auto::traits::*; +mod audio_format; +pub use audio_format::*; mod audio_format_info; pub use audio_format_info::*; mod audio_info;