mirrors/gstreamer-rs
mirrors/gstreamer-rs
1
1
Fork 1
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git synced 2024-12-23 08:36:31 +00:00
Code Issues Projects Releases Wiki Activity

Rename FormattedValue::from_glib/to_glib to from_raw/to_raw_value

Browse source 
Otherwise we conflict with GLib translation traits, which causes some
annoyances.
This commit is contained in:
Sebastian Dröge 2017-12-10 12:10:25 +02:00
parent d55e08a6a4
commit 5065bc76ee
6 changed files with 67 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gstreamer-audio/src/audio_info.rs
View file

@ -167,11 +167,11 @@ impl AudioInfo {
if from_glib(ffi::gst_audio_info_convert( if from_glib(ffi::gst_audio_info_convert(
&self.0, &self.0,
src_val.get_format().to_glib(), src_val.get_format().to_glib(),
src_val.to_glib(), src_val.to_raw_value(),
U::get_default_format().to_glib(), U::get_default_format().to_glib(),
&mut dest_val, &mut dest_val,
)) { )) {
Some(U::from_glib(U::get_default_format(), dest_val)) Some(U::from_raw(U::get_default_format(), dest_val))
} else { } else {
None None
} }
@ -191,7 +191,7 @@ impl AudioInfo {
if from_glib(ffi::gst_audio_info_convert( if from_glib(ffi::gst_audio_info_convert(
&self.0, &self.0,
src_val.get_format().to_glib(), src_val.get_format().to_glib(),
src_val.to_glib(), src_val.to_raw_value(),
dest_fmt.to_glib(), dest_fmt.to_glib(),
&mut dest_val, &mut dest_val,
)) { )) {

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

@ -557,11 +557,11 @@ impl VideoInfo {
if from_glib(ffi::gst_video_info_convert( if from_glib(ffi::gst_video_info_convert(
&self.0 as *const _ as *mut _, &self.0 as *const _ as *mut _,
src_val.get_format().to_glib(), src_val.get_format().to_glib(),
src_val.to_glib(), src_val.to_raw_value(),
U::get_default_format().to_glib(), U::get_default_format().to_glib(),
&mut dest_val, &mut dest_val,
)) { )) {
Some(U::from_glib(U::get_default_format(), dest_val)) Some(U::from_raw(U::get_default_format(), dest_val))
} else { } else {
None None
} }
@ -581,7 +581,7 @@ impl VideoInfo {
if from_glib(ffi::gst_video_info_convert( if from_glib(ffi::gst_video_info_convert(
&self.0 as *const _ as *mut _, &self.0 as *const _ as *mut _,
src_val.get_format().to_glib(), src_val.get_format().to_glib(),
src_val.to_glib(), src_val.to_raw_value(),
dest_fmt.to_glib(), dest_fmt.to_glib(),
&mut dest_val, &mut dest_val,
)) { )) {

8
gstreamer/src/element.rs
View file

@ -385,12 +385,12 @@ impl<O: IsA<Element>> ElementExtManual for O {
let ret = from_glib(ffi::gst_element_query_convert( let ret = from_glib(ffi::gst_element_query_convert(
self.to_glib_none().0, self.to_glib_none().0,
src_val.get_format().to_glib(), src_val.get_format().to_glib(),
src_val.to_glib(), src_val.to_raw_value(),
U::get_default_format().to_glib(), U::get_default_format().to_glib(),
&mut dest_val, &mut dest_val,
)); ));
if ret { if ret {
Some(U::from_glib(U::get_default_format(), dest_val)) Some(U::from_raw(U::get_default_format(), dest_val))
} else { } else {
None None
} }
@ -429,7 +429,7 @@ impl<O: IsA<Element>> ElementExtManual for O {
&mut duration, &mut duration,
)); ));
if ret { if ret {
Some(T::from_glib(T::get_default_format(), duration)) Some(T::from_raw(T::get_default_format(), duration))
} else { } else {
None None
} }
@ -461,7 +461,7 @@ impl<O: IsA<Element>> ElementExtManual for O {
&mut cur, &mut cur,
)); ));
if ret { if ret {
Some(T::from_glib(T::get_default_format(), cur)) Some(T::from_raw(T::get_default_format(), cur))
} else { } else {
None None
} }

16
gstreamer/src/format.rs
View file

@ -36,8 +36,8 @@ pub trait FormattedValue: Copy + Clone + Sized + 'static {
fn get_format(&self) -> Format; fn get_format(&self) -> Format;
unsafe fn from_glib(format: Format, value: i64) -> Self; unsafe fn from_raw(format: Format, value: i64) -> Self;
unsafe fn to_glib(&self) -> i64; unsafe fn to_raw_value(&self) -> i64;
} }
pub trait SpecificFormattedValue: FormattedValue {} pub trait SpecificFormattedValue: FormattedValue {}
@ -55,11 +55,11 @@ impl FormattedValue for GenericFormattedValue {
self.get_format() self.get_format()
} }
unsafe fn from_glib(format: Format, value: i64) -> Self { unsafe fn from_raw(format: Format, value: i64) -> Self {
GenericFormattedValue::new(format, value) GenericFormattedValue::new(format, value)
} }
unsafe fn to_glib(&self) -> i64 { unsafe fn to_raw_value(&self) -> i64 {
self.get_value() self.get_value()
} }
} }
@ -153,7 +153,9 @@ impl GenericFormattedValue {
if F::get_default_format() == self.get_format() if F::get_default_format() == self.get_format()
|| F::get_default_format() == Format::Undefined || F::get_default_format() == Format::Undefined
{ {
Ok(unsafe { F::from_glib(self.get_format(), self.to_glib()) }) Ok(unsafe {
F::from_raw(self.get_format(), self.to_raw_value())
})
} else { } else {
Err(self) Err(self)
} }
@ -317,7 +319,7 @@ macro_rules! impl_format_value_traits(
Format::$format Format::$format
} }
unsafe fn from_glib(format: Format, value: i64) -> Self { unsafe fn from_raw(format: Format, value: i64) -> Self {
debug_assert_eq!(format, Format::$format); debug_assert_eq!(format, Format::$format);
if value == -1 { if value == -1 {
$name(None) $name(None)
@ -326,7 +328,7 @@ macro_rules! impl_format_value_traits(
} }
} }
unsafe fn to_glib(&self) -> i64 { unsafe fn to_raw_value(&self) -> i64 {
self.0.map(|v| v as i64).unwrap_or(-1) self.0.map(|v| v as i64).unwrap_or(-1)
} }
} }

18
gstreamer/src/pad.rs
View file

@ -641,12 +641,12 @@ impl<O: IsA<Pad>> PadExtManual for O {
let ret = from_glib(ffi::gst_pad_peer_query_convert( let ret = from_glib(ffi::gst_pad_peer_query_convert(
self.to_glib_none().0, self.to_glib_none().0,
src_val.get_format().to_glib(), src_val.get_format().to_glib(),
src_val.to_glib(), src_val.to_raw_value(),
U::get_default_format().to_glib(), U::get_default_format().to_glib(),
&mut dest_val, &mut dest_val,
)); ));
if ret { if ret {
Some(U::from_glib(U::get_default_format(), dest_val)) Some(U::from_raw(U::get_default_format(), dest_val))
} else { } else {
None None
} }
@ -664,7 +664,7 @@ impl<O: IsA<Pad>> PadExtManual for O {
let ret = from_glib(ffi::gst_pad_peer_query_convert( let ret = from_glib(ffi::gst_pad_peer_query_convert(
self.to_glib_none().0, self.to_glib_none().0,
src_val.get_format().to_glib(), src_val.get_format().to_glib(),
src_val.to_glib(), src_val.to_raw_value(),
dest_format.to_glib(), dest_format.to_glib(),
&mut dest_val, &mut dest_val,
)); ));
@ -685,7 +685,7 @@ impl<O: IsA<Pad>> PadExtManual for O {
&mut duration, &mut duration,
)); ));
if ret { if ret {
Some(T::from_glib(T::get_default_format(), duration)) Some(T::from_raw(T::get_default_format(), duration))
} else { } else {
None None
} }
@ -717,7 +717,7 @@ impl<O: IsA<Pad>> PadExtManual for O {
&mut cur, &mut cur,
)); ));
if ret { if ret {
Some(T::from_glib(T::get_default_format(), cur)) Some(T::from_raw(T::get_default_format(), cur))
} else { } else {
None None
} }
@ -751,12 +751,12 @@ impl<O: IsA<Pad>> PadExtManual for O {
let ret = from_glib(ffi::gst_pad_query_convert( let ret = from_glib(ffi::gst_pad_query_convert(
self.to_glib_none().0, self.to_glib_none().0,
src_val.get_format().to_glib(), src_val.get_format().to_glib(),
src_val.to_glib(), src_val.to_raw_value(),
U::get_default_format().to_glib(), U::get_default_format().to_glib(),
&mut dest_val, &mut dest_val,
)); ));
if ret { if ret {
Some(U::from_glib(U::get_default_format(), dest_val)) Some(U::from_raw(U::get_default_format(), dest_val))
} else { } else {
None None
} }
@ -796,7 +796,7 @@ impl<O: IsA<Pad>> PadExtManual for O {
&mut duration, &mut duration,
)); ));
if ret { if ret {
Some(T::from_glib(T::get_default_format(), duration)) Some(T::from_raw(T::get_default_format(), duration))
} else { } else {
None None
} }
@ -828,7 +828,7 @@ impl<O: IsA<Pad>> PadExtManual for O {
&mut cur, &mut cur,
)); ));
if ret { if ret {
Some(T::from_glib(T::get_default_format(), cur)) Some(T::from_raw(T::get_default_format(), cur))
} else { } else {
None None
} }

78
gstreamer/src/segment.rs
View file

@ -106,15 +106,15 @@ impl<T: FormattedValue> FormattedSegment<T> {
let ret = from_glib(ffi::gst_segment_clip( let ret = from_glib(ffi::gst_segment_clip(
&self.0, &self.0,
start.get_format().to_glib(), start.get_format().to_glib(),
start.to_glib() as u64, start.to_raw_value() as u64,
stop.to_glib() as u64, stop.to_raw_value() as u64,
&mut clip_start, &mut clip_start,
&mut clip_stop, &mut clip_stop,
)); ));
if ret { if ret {
Some(( Some((
T::from_glib(self.get_format(), clip_start as i64), T::from_raw(self.get_format(), clip_start as i64),
T::from_glib(self.get_format(), clip_stop as i64), T::from_raw(self.get_format(), clip_stop as i64),
)) ))
} else { } else {
None None
@ -149,9 +149,9 @@ impl<T: FormattedValue> FormattedSegment<T> {
self.get_format().to_glib(), self.get_format().to_glib(),
flags.to_glib(), flags.to_glib(),
start_type.to_glib(), start_type.to_glib(),
start.to_glib() as u64, start.to_raw_value() as u64,
stop_type.to_glib(), stop_type.to_glib(),
stop.to_glib() as u64, stop.to_raw_value() as u64,
&mut update, &mut update,
)); ));
if ret { if ret {
@ -180,12 +180,12 @@ impl<T: FormattedValue> FormattedSegment<T> {
} }
unsafe { unsafe {
T::from_glib( T::from_raw(
self.get_format(), self.get_format(),
ffi::gst_segment_position_from_running_time( ffi::gst_segment_position_from_running_time(
&self.0, &self.0,
self.get_format().to_glib(), self.get_format().to_glib(),
running_time.to_glib() as u64, running_time.to_raw_value() as u64,
) as i64, ) as i64,
) )
} }
@ -203,10 +203,10 @@ impl<T: FormattedValue> FormattedSegment<T> {
let ret = ffi::gst_segment_position_from_running_time_full( let ret = ffi::gst_segment_position_from_running_time_full(
&self.0, &self.0,
self.get_format().to_glib(), self.get_format().to_glib(),
running_time.to_glib() as u64, running_time.to_raw_value() as u64,
&mut position, &mut position,
); );
(ret, T::from_glib(self.get_format(), position as i64)) (ret, T::from_raw(self.get_format(), position as i64))
} }
} }
@ -218,12 +218,12 @@ impl<T: FormattedValue> FormattedSegment<T> {
} }
unsafe { unsafe {
T::from_glib( T::from_raw(
self.get_format(), self.get_format(),
ffi::gst_segment_position_from_stream_time( ffi::gst_segment_position_from_stream_time(
&self.0, &self.0,
self.get_format().to_glib(), self.get_format().to_glib(),
stream_time.to_glib() as u64, stream_time.to_raw_value() as u64,
) as i64, ) as i64,
) )
} }
@ -241,10 +241,10 @@ impl<T: FormattedValue> FormattedSegment<T> {
let ret = ffi::gst_segment_position_from_stream_time_full( let ret = ffi::gst_segment_position_from_stream_time_full(
&self.0, &self.0,
self.get_format().to_glib(), self.get_format().to_glib(),
stream_time.to_glib() as u64, stream_time.to_raw_value() as u64,
&mut position, &mut position,
); );
(ret, T::from_glib(self.get_format(), position as i64)) (ret, T::from_raw(self.get_format(), position as i64))
} }
} }
@ -259,7 +259,7 @@ impl<T: FormattedValue> FormattedSegment<T> {
from_glib(ffi::gst_segment_set_running_time( from_glib(ffi::gst_segment_set_running_time(
&mut self.0, &mut self.0,
self.get_format().to_glib(), self.get_format().to_glib(),
running_time.to_glib() as u64, running_time.to_raw_value() as u64,
)) ))
} }
} }
@ -272,12 +272,12 @@ impl<T: FormattedValue> FormattedSegment<T> {
} }
unsafe { unsafe {
T::from_glib( T::from_raw(
self.get_format(), self.get_format(),
ffi::gst_segment_to_position( ffi::gst_segment_to_position(
&self.0, &self.0,
self.get_format().to_glib(), self.get_format().to_glib(),
running_time.to_glib() as u64, running_time.to_raw_value() as u64,
) as i64, ) as i64,
) )
} }
@ -291,12 +291,12 @@ impl<T: FormattedValue> FormattedSegment<T> {
} }
unsafe { unsafe {
T::from_glib( T::from_raw(
self.get_format(), self.get_format(),
ffi::gst_segment_to_running_time( ffi::gst_segment_to_running_time(
&self.0, &self.0,
self.get_format().to_glib(), self.get_format().to_glib(),
position.to_glib() as u64, position.to_raw_value() as u64,
) as i64, ) as i64,
) )
} }
@ -314,10 +314,10 @@ impl<T: FormattedValue> FormattedSegment<T> {
let ret = ffi::gst_segment_to_running_time_full( let ret = ffi::gst_segment_to_running_time_full(
&self.0, &self.0,
self.get_format().to_glib(), self.get_format().to_glib(),
position.to_glib() as u64, position.to_raw_value() as u64,
&mut running_time, &mut running_time,
); );
(ret, T::from_glib(self.get_format(), running_time as i64)) (ret, T::from_raw(self.get_format(), running_time as i64))
} }
} }
@ -329,12 +329,12 @@ impl<T: FormattedValue> FormattedSegment<T> {
} }
unsafe { unsafe {
T::from_glib( T::from_raw(
self.get_format(), self.get_format(),
ffi::gst_segment_to_stream_time( ffi::gst_segment_to_stream_time(
&self.0, &self.0,
self.get_format().to_glib(), self.get_format().to_glib(),
position.to_glib() as u64, position.to_raw_value() as u64,
) as i64, ) as i64,
) )
} }
@ -352,10 +352,10 @@ impl<T: FormattedValue> FormattedSegment<T> {
let ret = ffi::gst_segment_to_stream_time_full( let ret = ffi::gst_segment_to_stream_time_full(
&self.0, &self.0,
self.get_format().to_glib(), self.get_format().to_glib(),
position.to_glib() as u64, position.to_raw_value() as u64,
&mut stream_time, &mut stream_time,
); );
(ret, T::from_glib(self.get_format(), stream_time as i64)) (ret, T::from_raw(self.get_format(), stream_time as i64))
} }
} }
@ -390,7 +390,7 @@ impl<T: FormattedValue> FormattedSegment<T> {
} }
pub fn get_base(&self) -> T { pub fn get_base(&self) -> T {
unsafe { T::from_glib(self.get_format(), self.0.base as i64) } unsafe { T::from_raw(self.get_format(), self.0.base as i64) }
} }
pub fn set_base<V: Into<T>>(&mut self, base: V) { pub fn set_base<V: Into<T>>(&mut self, base: V) {
@ -400,11 +400,11 @@ impl<T: FormattedValue> FormattedSegment<T> {
assert_eq!(self.get_format(), base.get_format()); assert_eq!(self.get_format(), base.get_format());
} }
self.0.base = unsafe { base.to_glib() } as u64; self.0.base = unsafe { base.to_raw_value() } as u64;
} }
pub fn get_offset(&self) -> T { pub fn get_offset(&self) -> T {
unsafe { T::from_glib(self.get_format(), self.0.offset as i64) } unsafe { T::from_raw(self.get_format(), self.0.offset as i64) }
} }
pub fn set_offset<V: Into<T>>(&mut self, offset: V) { pub fn set_offset<V: Into<T>>(&mut self, offset: V) {
@ -414,11 +414,11 @@ impl<T: FormattedValue> FormattedSegment<T> {
assert_eq!(self.get_format(), offset.get_format()); assert_eq!(self.get_format(), offset.get_format());
} }
self.0.offset = unsafe { offset.to_glib() } as u64; self.0.offset = unsafe { offset.to_raw_value() } as u64;
} }
pub fn get_start(&self) -> T { pub fn get_start(&self) -> T {
unsafe { T::from_glib(self.get_format(), self.0.start as i64) } unsafe { T::from_raw(self.get_format(), self.0.start as i64) }
} }
pub fn set_start<V: Into<T>>(&mut self, start: V) { pub fn set_start<V: Into<T>>(&mut self, start: V) {
@ -428,11 +428,11 @@ impl<T: FormattedValue> FormattedSegment<T> {
assert_eq!(self.get_format(), start.get_format()); assert_eq!(self.get_format(), start.get_format());
} }
self.0.start = unsafe { start.to_glib() } as u64; self.0.start = unsafe { start.to_raw_value() } as u64;
} }
pub fn get_stop(&self) -> T { pub fn get_stop(&self) -> T {
unsafe { T::from_glib(self.get_format(), self.0.stop as i64) } unsafe { T::from_raw(self.get_format(), self.0.stop as i64) }
} }
pub fn set_stop<V: Into<T>>(&mut self, stop: V) { pub fn set_stop<V: Into<T>>(&mut self, stop: V) {
@ -442,11 +442,11 @@ impl<T: FormattedValue> FormattedSegment<T> {
assert_eq!(self.get_format(), stop.get_format()); assert_eq!(self.get_format(), stop.get_format());
} }
self.0.stop = unsafe { stop.to_glib() } as u64; self.0.stop = unsafe { stop.to_raw_value() } as u64;
} }
pub fn get_time(&self) -> T { pub fn get_time(&self) -> T {
unsafe { T::from_glib(self.get_format(), self.0.time as i64) } unsafe { T::from_raw(self.get_format(), self.0.time as i64) }
} }
pub fn set_time<V: Into<T>>(&mut self, time: V) { pub fn set_time<V: Into<T>>(&mut self, time: V) {
@ -456,11 +456,11 @@ impl<T: FormattedValue> FormattedSegment<T> {
assert_eq!(self.get_format(), time.get_format()); assert_eq!(self.get_format(), time.get_format());
} }
self.0.time = unsafe { time.to_glib() } as u64; self.0.time = unsafe { time.to_raw_value() } as u64;
} }
pub fn get_position(&self) -> T { pub fn get_position(&self) -> T {
unsafe { T::from_glib(self.get_format(), self.0.position as i64) } unsafe { T::from_raw(self.get_format(), self.0.position as i64) }
} }
pub fn set_position<V: Into<T>>(&mut self, position: V) { pub fn set_position<V: Into<T>>(&mut self, position: V) {
@ -470,11 +470,11 @@ impl<T: FormattedValue> FormattedSegment<T> {
assert_eq!(self.get_format(), position.get_format()); assert_eq!(self.get_format(), position.get_format());
} }
self.0.position = unsafe { position.to_glib() } as u64; self.0.position = unsafe { position.to_raw_value() } as u64;
} }
pub fn get_duration(&self) -> T { pub fn get_duration(&self) -> T {
unsafe { T::from_glib(self.get_format(), self.0.duration as i64) } unsafe { T::from_raw(self.get_format(), self.0.duration as i64) }
} }
pub fn set_duration<V: Into<T>>(&mut self, duration: V) { pub fn set_duration<V: Into<T>>(&mut self, duration: V) {
@ -484,7 +484,7 @@ impl<T: FormattedValue> FormattedSegment<T> {
assert_eq!(self.get_format(), duration.get_format()); assert_eq!(self.get_format(), duration.get_format());
} }
self.0.duration = unsafe { duration.to_glib() } as u64; self.0.duration = unsafe { duration.to_raw_value() } as u64;
} }
} }