diff --git a/gir b/gir index 4144cf953..1a0921b55 160000 --- a/gir +++ b/gir @@ -1 +1 @@ -Subproject commit 4144cf953ff0424a9c10e505cdfd5f4ee5eee268 +Subproject commit 1a0921b553383ab0e5a34bdab15ebc8844ec3b46 diff --git a/gstreamer-app/src/auto/app_sink.rs b/gstreamer-app/src/auto/app_sink.rs index 518a3dd77..30b3ac14d 100644 --- a/gstreamer-app/src/auto/app_sink.rs +++ b/gstreamer-app/src/auto/app_sink.rs @@ -85,7 +85,7 @@ impl AppSink { unsafe { ffi::gst_app_sink_set_buffer_list_support( self.to_glib_none().0, - enable_lists.to_glib(), + enable_lists.into_glib(), ); } } @@ -105,14 +105,14 @@ impl AppSink { #[doc(alias = "gst_app_sink_set_drop")] pub fn set_drop(&self, drop: bool) { unsafe { - ffi::gst_app_sink_set_drop(self.to_glib_none().0, drop.to_glib()); + ffi::gst_app_sink_set_drop(self.to_glib_none().0, drop.into_glib()); } } #[doc(alias = "gst_app_sink_set_emit_signals")] pub fn set_emit_signals(&self, emit: bool) { unsafe { - ffi::gst_app_sink_set_emit_signals(self.to_glib_none().0, emit.to_glib()); + ffi::gst_app_sink_set_emit_signals(self.to_glib_none().0, emit.into_glib()); } } @@ -126,7 +126,7 @@ impl AppSink { #[doc(alias = "gst_app_sink_set_wait_on_eos")] pub fn set_wait_on_eos(&self, wait: bool) { unsafe { - ffi::gst_app_sink_set_wait_on_eos(self.to_glib_none().0, wait.to_glib()); + ffi::gst_app_sink_set_wait_on_eos(self.to_glib_none().0, wait.into_glib()); } } @@ -137,7 +137,7 @@ impl AppSink { unsafe { from_glib_full(ffi::gst_app_sink_try_pull_preroll( self.to_glib_none().0, - timeout.to_glib(), + timeout.into_glib(), )) } } @@ -149,7 +149,7 @@ impl AppSink { unsafe { from_glib_full(ffi::gst_app_sink_try_pull_sample( self.to_glib_none().0, - timeout.to_glib(), + timeout.into_glib(), )) } } diff --git a/gstreamer-app/src/auto/app_src.rs b/gstreamer-app/src/auto/app_src.rs index 89f7e8b33..9588053ec 100644 --- a/gstreamer-app/src/auto/app_src.rs +++ b/gstreamer-app/src/auto/app_src.rs @@ -76,14 +76,14 @@ impl AppSrc { #[doc(alias = "gst_app_src_set_duration")] pub fn set_duration(&self, duration: gst::ClockTime) { unsafe { - ffi::gst_app_src_set_duration(self.to_glib_none().0, duration.to_glib()); + ffi::gst_app_src_set_duration(self.to_glib_none().0, duration.into_glib()); } } #[doc(alias = "gst_app_src_set_emit_signals")] pub fn set_emit_signals(&self, emit: bool) { unsafe { - ffi::gst_app_src_set_emit_signals(self.to_glib_none().0, emit.to_glib()); + ffi::gst_app_src_set_emit_signals(self.to_glib_none().0, emit.into_glib()); } } @@ -104,7 +104,7 @@ impl AppSrc { #[doc(alias = "gst_app_src_set_stream_type")] pub fn set_stream_type(&self, type_: AppStreamType) { unsafe { - ffi::gst_app_src_set_stream_type(self.to_glib_none().0, type_.to_glib()); + ffi::gst_app_src_set_stream_type(self.to_glib_none().0, type_.into_glib()); } } @@ -355,7 +355,7 @@ impl AppSrc { f: glib::ffi::gpointer, ) -> glib::ffi::gboolean { let f: &F = &*(f as *const F); - f(&from_glib_borrow(this), offset).to_glib() + f(&from_glib_borrow(this), offset).into_glib() } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-app/src/auto/enums.rs b/gstreamer-app/src/auto/enums.rs index 99d12c3a8..0b7cdc50a 100644 --- a/gstreamer-app/src/auto/enums.rs +++ b/gstreamer-app/src/auto/enums.rs @@ -24,11 +24,11 @@ pub enum AppStreamType { } #[doc(hidden)] -impl ToGlib for AppStreamType { +impl IntoGlib for AppStreamType { type GlibType = ffi::GstAppStreamType; - fn to_glib(&self) -> ffi::GstAppStreamType { - match *self { + fn into_glib(self) -> ffi::GstAppStreamType { + match self { AppStreamType::Stream => ffi::GST_APP_STREAM_TYPE_STREAM, AppStreamType::Seekable => ffi::GST_APP_STREAM_TYPE_SEEKABLE, AppStreamType::RandomAccess => ffi::GST_APP_STREAM_TYPE_RANDOM_ACCESS, @@ -73,7 +73,7 @@ impl ToValue for AppStreamType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } diff --git a/gstreamer-app/src/auto/versions.txt b/gstreamer-app/src/auto/versions.txt index e31790782..47c89fa9e 100644 --- a/gstreamer-app/src/auto/versions.txt +++ b/gstreamer-app/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) diff --git a/gstreamer-app/sys/build.rs b/gstreamer-app/sys/build.rs index c7e114aaa..526a151cd 100644 --- a/gstreamer-app/sys/build.rs +++ b/gstreamer-app/sys/build.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-app/sys/src/lib.rs b/gstreamer-app/sys/src/lib.rs index bb2187c26..52cbb241a 100644 --- a/gstreamer-app/sys/src/lib.rs +++ b/gstreamer-app/sys/src/lib.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-app/sys/tests/abi.rs b/gstreamer-app/sys/tests/abi.rs index 50de31254..5aa150c00 100644 --- a/gstreamer-app/sys/tests/abi.rs +++ b/gstreamer-app/sys/tests/abi.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-app/sys/tests/constant.c b/gstreamer-app/sys/tests/constant.c index 96111c443..61e8a7740 100644 --- a/gstreamer-app/sys/tests/constant.c +++ b/gstreamer-app/sys/tests/constant.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-app/sys/tests/layout.c b/gstreamer-app/sys/tests/layout.c index 41eff55d1..7dbd36bf9 100644 --- a/gstreamer-app/sys/tests/layout.c +++ b/gstreamer-app/sys/tests/layout.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-audio/src/auto/audio_base_sink.rs b/gstreamer-audio/src/auto/audio_base_sink.rs index 8b5d3cec4..2f799c2af 100644 --- a/gstreamer-audio/src/auto/audio_base_sink.rs +++ b/gstreamer-audio/src/auto/audio_base_sink.rs @@ -172,7 +172,7 @@ impl> AudioBaseSinkExt for O { unsafe { ffi::gst_audio_base_sink_set_alignment_threshold( self.as_ref().to_glib_none().0, - alignment_threshold.to_glib(), + alignment_threshold.into_glib(), ); } } @@ -185,7 +185,7 @@ impl> AudioBaseSinkExt for O { unsafe { ffi::gst_audio_base_sink_set_discont_wait( self.as_ref().to_glib_none().0, - discont_wait.to_glib(), + discont_wait.into_glib(), ); } } @@ -203,7 +203,7 @@ impl> AudioBaseSinkExt for O { unsafe { ffi::gst_audio_base_sink_set_provide_clock( self.as_ref().to_glib_none().0, - provide.to_glib(), + provide.into_glib(), ); } } diff --git a/gstreamer-audio/src/auto/audio_base_src.rs b/gstreamer-audio/src/auto/audio_base_src.rs index 60d96edd3..1d714534e 100644 --- a/gstreamer-audio/src/auto/audio_base_src.rs +++ b/gstreamer-audio/src/auto/audio_base_src.rs @@ -112,7 +112,7 @@ impl> AudioBaseSrcExt for O { unsafe { ffi::gst_audio_base_src_set_provide_clock( self.as_ref().to_glib_none().0, - provide.to_glib(), + provide.into_glib(), ); } } diff --git a/gstreamer-audio/src/auto/audio_decoder.rs b/gstreamer-audio/src/auto/audio_decoder.rs index 23eec43e5..8ac5e602f 100644 --- a/gstreamer-audio/src/auto/audio_decoder.rs +++ b/gstreamer-audio/src/auto/audio_decoder.rs @@ -240,7 +240,7 @@ impl> AudioDecoderExt for O { ffi::gst_audio_decoder_merge_tags( self.as_ref().to_glib_none().0, tags.to_glib_none().0, - mode.to_glib(), + mode.into_glib(), ); } } @@ -268,7 +268,10 @@ impl> AudioDecoderExt for O { fn set_drainable(&self, enabled: bool) { unsafe { - ffi::gst_audio_decoder_set_drainable(self.as_ref().to_glib_none().0, enabled.to_glib()); + ffi::gst_audio_decoder_set_drainable( + self.as_ref().to_glib_none().0, + enabled.into_glib(), + ); } } @@ -276,7 +279,7 @@ impl> AudioDecoderExt for O { unsafe { ffi::gst_audio_decoder_set_estimate_rate( self.as_ref().to_glib_none().0, - enabled.to_glib(), + enabled.into_glib(), ); } } @@ -285,8 +288,8 @@ impl> AudioDecoderExt for O { unsafe { ffi::gst_audio_decoder_set_latency( self.as_ref().to_glib_none().0, - min.to_glib(), - max.to_glib(), + min.into_glib(), + max.into_glib(), ); } } @@ -299,7 +302,7 @@ impl> AudioDecoderExt for O { fn set_min_latency(&self, num: gst::ClockTime) { unsafe { - ffi::gst_audio_decoder_set_min_latency(self.as_ref().to_glib_none().0, num.to_glib()); + ffi::gst_audio_decoder_set_min_latency(self.as_ref().to_glib_none().0, num.into_glib()); } } @@ -307,20 +310,20 @@ impl> AudioDecoderExt for O { unsafe { ffi::gst_audio_decoder_set_needs_format( self.as_ref().to_glib_none().0, - enabled.to_glib(), + enabled.into_glib(), ); } } fn set_plc(&self, enabled: bool) { unsafe { - ffi::gst_audio_decoder_set_plc(self.as_ref().to_glib_none().0, enabled.to_glib()); + ffi::gst_audio_decoder_set_plc(self.as_ref().to_glib_none().0, enabled.into_glib()); } } fn set_plc_aware(&self, plc: bool) { unsafe { - ffi::gst_audio_decoder_set_plc_aware(self.as_ref().to_glib_none().0, plc.to_glib()); + ffi::gst_audio_decoder_set_plc_aware(self.as_ref().to_glib_none().0, plc.into_glib()); } } @@ -328,7 +331,7 @@ impl> AudioDecoderExt for O { unsafe { ffi::gst_audio_decoder_set_tolerance( self.as_ref().to_glib_none().0, - tolerance.to_glib(), + tolerance.into_glib(), ); } } @@ -337,7 +340,7 @@ impl> AudioDecoderExt for O { unsafe { ffi::gst_audio_decoder_set_use_default_pad_acceptcaps( self.as_ref().to_glib_none().0, - use_.to_glib(), + use_.into_glib(), ); } } diff --git a/gstreamer-audio/src/auto/audio_encoder.rs b/gstreamer-audio/src/auto/audio_encoder.rs index 1595b342f..26ae344a8 100644 --- a/gstreamer-audio/src/auto/audio_encoder.rs +++ b/gstreamer-audio/src/auto/audio_encoder.rs @@ -218,7 +218,7 @@ impl> AudioEncoderExt for O { ffi::gst_audio_encoder_merge_tags( self.as_ref().to_glib_none().0, tags.to_glib_none().0, - mode.to_glib(), + mode.into_glib(), ); } } @@ -246,7 +246,10 @@ impl> AudioEncoderExt for O { fn set_drainable(&self, enabled: bool) { unsafe { - ffi::gst_audio_encoder_set_drainable(self.as_ref().to_glib_none().0, enabled.to_glib()); + ffi::gst_audio_encoder_set_drainable( + self.as_ref().to_glib_none().0, + enabled.into_glib(), + ); } } @@ -270,7 +273,10 @@ impl> AudioEncoderExt for O { fn set_hard_min(&self, enabled: bool) { unsafe { - ffi::gst_audio_encoder_set_hard_min(self.as_ref().to_glib_none().0, enabled.to_glib()); + ffi::gst_audio_encoder_set_hard_min( + self.as_ref().to_glib_none().0, + enabled.into_glib(), + ); } } @@ -278,7 +284,7 @@ impl> AudioEncoderExt for O { unsafe { ffi::gst_audio_encoder_set_hard_resync( self.as_ref().to_glib_none().0, - enabled.to_glib(), + enabled.into_glib(), ); } } @@ -296,8 +302,8 @@ impl> AudioEncoderExt for O { unsafe { ffi::gst_audio_encoder_set_latency( self.as_ref().to_glib_none().0, - min.to_glib(), - max.to_glib(), + min.into_glib(), + max.into_glib(), ); } } @@ -312,7 +318,7 @@ impl> AudioEncoderExt for O { unsafe { ffi::gst_audio_encoder_set_mark_granule( self.as_ref().to_glib_none().0, - enabled.to_glib(), + enabled.into_glib(), ); } } @@ -321,7 +327,7 @@ impl> AudioEncoderExt for O { unsafe { ffi::gst_audio_encoder_set_perfect_timestamp( self.as_ref().to_glib_none().0, - enabled.to_glib(), + enabled.into_glib(), ); } } @@ -330,7 +336,7 @@ impl> AudioEncoderExt for O { unsafe { ffi::gst_audio_encoder_set_tolerance( self.as_ref().to_glib_none().0, - tolerance.to_glib(), + tolerance.into_glib(), ); } } diff --git a/gstreamer-audio/src/auto/audio_stream_align.rs b/gstreamer-audio/src/auto/audio_stream_align.rs index 59b9e3c63..98c67086a 100644 --- a/gstreamer-audio/src/auto/audio_stream_align.rs +++ b/gstreamer-audio/src/auto/audio_stream_align.rs @@ -27,8 +27,8 @@ impl AudioStreamAlign { unsafe { from_glib_full(ffi::gst_audio_stream_align_new( rate, - alignment_threshold.to_glib(), - discont_wait.to_glib(), + alignment_threshold.into_glib(), + discont_wait.into_glib(), )) } } @@ -86,7 +86,7 @@ impl AudioStreamAlign { unsafe { ffi::gst_audio_stream_align_set_alignment_threshold( self.to_glib_none_mut().0, - alignment_threshold.to_glib(), + alignment_threshold.into_glib(), ); } } @@ -96,7 +96,7 @@ impl AudioStreamAlign { unsafe { ffi::gst_audio_stream_align_set_discont_wait( self.to_glib_none_mut().0, - discont_wait.to_glib(), + discont_wait.into_glib(), ); } } diff --git a/gstreamer-audio/src/auto/enums.rs b/gstreamer-audio/src/auto/enums.rs index e6a1eca46..bf643adac 100644 --- a/gstreamer-audio/src/auto/enums.rs +++ b/gstreamer-audio/src/auto/enums.rs @@ -81,11 +81,11 @@ pub enum AudioChannelPosition { } #[doc(hidden)] -impl ToGlib for AudioChannelPosition { +impl IntoGlib for AudioChannelPosition { type GlibType = ffi::GstAudioChannelPosition; - fn to_glib(&self) -> ffi::GstAudioChannelPosition { - match *self { + fn into_glib(self) -> ffi::GstAudioChannelPosition { + match self { AudioChannelPosition::None => ffi::GST_AUDIO_CHANNEL_POSITION_NONE, AudioChannelPosition::Mono => ffi::GST_AUDIO_CHANNEL_POSITION_MONO, AudioChannelPosition::Invalid => ffi::GST_AUDIO_CHANNEL_POSITION_INVALID, @@ -198,7 +198,7 @@ impl ToValue for AudioChannelPosition { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -225,11 +225,11 @@ pub enum AudioDitherMethod { } #[doc(hidden)] -impl ToGlib for AudioDitherMethod { +impl IntoGlib for AudioDitherMethod { type GlibType = ffi::GstAudioDitherMethod; - fn to_glib(&self) -> ffi::GstAudioDitherMethod { - match *self { + fn into_glib(self) -> ffi::GstAudioDitherMethod { + match self { AudioDitherMethod::None => ffi::GST_AUDIO_DITHER_NONE, AudioDitherMethod::Rpdf => ffi::GST_AUDIO_DITHER_RPDF, AudioDitherMethod::Tpdf => ffi::GST_AUDIO_DITHER_TPDF, @@ -276,7 +276,7 @@ impl ToValue for AudioDitherMethod { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -374,11 +374,11 @@ impl fmt::Display for AudioFormat { } #[doc(hidden)] -impl ToGlib for AudioFormat { +impl IntoGlib for AudioFormat { type GlibType = ffi::GstAudioFormat; - fn to_glib(&self) -> ffi::GstAudioFormat { - match *self { + fn into_glib(self) -> ffi::GstAudioFormat { + match self { AudioFormat::Unknown => ffi::GST_AUDIO_FORMAT_UNKNOWN, AudioFormat::Encoded => ffi::GST_AUDIO_FORMAT_ENCODED, AudioFormat::S8 => ffi::GST_AUDIO_FORMAT_S8, @@ -481,7 +481,7 @@ impl ToValue for AudioFormat { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -504,11 +504,11 @@ pub enum AudioLayout { } #[doc(hidden)] -impl ToGlib for AudioLayout { +impl IntoGlib for AudioLayout { type GlibType = ffi::GstAudioLayout; - fn to_glib(&self) -> ffi::GstAudioLayout { - match *self { + fn into_glib(self) -> ffi::GstAudioLayout { + match self { AudioLayout::Interleaved => ffi::GST_AUDIO_LAYOUT_INTERLEAVED, AudioLayout::NonInterleaved => ffi::GST_AUDIO_LAYOUT_NON_INTERLEAVED, AudioLayout::__Unknown(value) => value, @@ -551,7 +551,7 @@ impl ToValue for AudioLayout { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -580,11 +580,11 @@ pub enum AudioNoiseShapingMethod { } #[doc(hidden)] -impl ToGlib for AudioNoiseShapingMethod { +impl IntoGlib for AudioNoiseShapingMethod { type GlibType = ffi::GstAudioNoiseShapingMethod; - fn to_glib(&self) -> ffi::GstAudioNoiseShapingMethod { - match *self { + fn into_glib(self) -> ffi::GstAudioNoiseShapingMethod { + match self { AudioNoiseShapingMethod::None => ffi::GST_AUDIO_NOISE_SHAPING_NONE, AudioNoiseShapingMethod::ErrorFeedback => ffi::GST_AUDIO_NOISE_SHAPING_ERROR_FEEDBACK, AudioNoiseShapingMethod::Simple => ffi::GST_AUDIO_NOISE_SHAPING_SIMPLE, @@ -633,7 +633,7 @@ impl ToValue for AudioNoiseShapingMethod { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -666,11 +666,11 @@ pub enum AudioResamplerMethod { #[cfg(any(feature = "v1_10", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] #[doc(hidden)] -impl ToGlib for AudioResamplerMethod { +impl IntoGlib for AudioResamplerMethod { type GlibType = ffi::GstAudioResamplerMethod; - fn to_glib(&self) -> ffi::GstAudioResamplerMethod { - match *self { + fn into_glib(self) -> ffi::GstAudioResamplerMethod { + match self { AudioResamplerMethod::Nearest => ffi::GST_AUDIO_RESAMPLER_METHOD_NEAREST, AudioResamplerMethod::Linear => ffi::GST_AUDIO_RESAMPLER_METHOD_LINEAR, AudioResamplerMethod::Cubic => ffi::GST_AUDIO_RESAMPLER_METHOD_CUBIC, @@ -731,7 +731,7 @@ impl ToValue for AudioResamplerMethod { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -786,11 +786,11 @@ pub enum AudioRingBufferFormatType { } #[doc(hidden)] -impl ToGlib for AudioRingBufferFormatType { +impl IntoGlib for AudioRingBufferFormatType { type GlibType = ffi::GstAudioRingBufferFormatType; - fn to_glib(&self) -> ffi::GstAudioRingBufferFormatType { - match *self { + fn into_glib(self) -> ffi::GstAudioRingBufferFormatType { + match self { AudioRingBufferFormatType::Raw => ffi::GST_AUDIO_RING_BUFFER_FORMAT_TYPE_RAW, AudioRingBufferFormatType::MuLaw => ffi::GST_AUDIO_RING_BUFFER_FORMAT_TYPE_MU_LAW, AudioRingBufferFormatType::ALaw => ffi::GST_AUDIO_RING_BUFFER_FORMAT_TYPE_A_LAW, @@ -869,7 +869,7 @@ impl ToValue for AudioRingBufferFormatType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -894,11 +894,11 @@ pub enum StreamVolumeFormat { } #[doc(hidden)] -impl ToGlib for StreamVolumeFormat { +impl IntoGlib for StreamVolumeFormat { type GlibType = ffi::GstStreamVolumeFormat; - fn to_glib(&self) -> ffi::GstStreamVolumeFormat { - match *self { + fn into_glib(self) -> ffi::GstStreamVolumeFormat { + match self { StreamVolumeFormat::Linear => ffi::GST_STREAM_VOLUME_FORMAT_LINEAR, StreamVolumeFormat::Cubic => ffi::GST_STREAM_VOLUME_FORMAT_CUBIC, StreamVolumeFormat::Db => ffi::GST_STREAM_VOLUME_FORMAT_DB, diff --git a/gstreamer-audio/src/auto/flags.rs b/gstreamer-audio/src/auto/flags.rs index 6b1aa209e..45ab8f68a 100644 --- a/gstreamer-audio/src/auto/flags.rs +++ b/gstreamer-audio/src/auto/flags.rs @@ -17,10 +17,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for AudioFlags { +impl IntoGlib for AudioFlags { type GlibType = ffi::GstAudioFlags; - fn to_glib(&self) -> ffi::GstAudioFlags { + fn into_glib(self) -> ffi::GstAudioFlags { self.bits() } } @@ -56,7 +56,7 @@ impl ToValue for AudioFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -77,10 +77,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for AudioFormatFlags { +impl IntoGlib for AudioFormatFlags { type GlibType = ffi::GstAudioFormatFlags; - fn to_glib(&self) -> ffi::GstAudioFormatFlags { + fn into_glib(self) -> ffi::GstAudioFormatFlags { self.bits() } } @@ -116,7 +116,7 @@ impl ToValue for AudioFormatFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -133,10 +133,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for AudioPackFlags { +impl IntoGlib for AudioPackFlags { type GlibType = ffi::GstAudioPackFlags; - fn to_glib(&self) -> ffi::GstAudioPackFlags { + fn into_glib(self) -> ffi::GstAudioPackFlags { self.bits() } } @@ -172,7 +172,7 @@ impl ToValue for AudioPackFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } diff --git a/gstreamer-audio/src/auto/stream_volume.rs b/gstreamer-audio/src/auto/stream_volume.rs index 754d25e91..e444f4dd3 100644 --- a/gstreamer-audio/src/auto/stream_volume.rs +++ b/gstreamer-audio/src/auto/stream_volume.rs @@ -24,7 +24,7 @@ impl StreamVolume { #[doc(alias = "gst_stream_volume_convert_volume")] pub fn convert_volume(from: StreamVolumeFormat, to: StreamVolumeFormat, val: f64) -> f64 { assert_initialized_main_thread!(); - unsafe { ffi::gst_stream_volume_convert_volume(from.to_glib(), to.to_glib(), val) } + unsafe { ffi::gst_stream_volume_convert_volume(from.into_glib(), to.into_glib(), val) } } } @@ -68,13 +68,13 @@ impl> StreamVolumeExt for O { fn volume(&self, format: StreamVolumeFormat) -> f64 { unsafe { - ffi::gst_stream_volume_get_volume(self.as_ref().to_glib_none().0, format.to_glib()) + ffi::gst_stream_volume_get_volume(self.as_ref().to_glib_none().0, format.into_glib()) } } fn set_mute(&self, mute: bool) { unsafe { - ffi::gst_stream_volume_set_mute(self.as_ref().to_glib_none().0, mute.to_glib()); + ffi::gst_stream_volume_set_mute(self.as_ref().to_glib_none().0, mute.into_glib()); } } @@ -82,7 +82,7 @@ impl> StreamVolumeExt for O { unsafe { ffi::gst_stream_volume_set_volume( self.as_ref().to_glib_none().0, - format.to_glib(), + format.into_glib(), val, ); } diff --git a/gstreamer-audio/src/auto/versions.txt b/gstreamer-audio/src/auto/versions.txt index e31790782..47c89fa9e 100644 --- a/gstreamer-audio/src/auto/versions.txt +++ b/gstreamer-audio/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) diff --git a/gstreamer-audio/sys/build.rs b/gstreamer-audio/sys/build.rs index c7e114aaa..526a151cd 100644 --- a/gstreamer-audio/sys/build.rs +++ b/gstreamer-audio/sys/build.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-audio/sys/src/lib.rs b/gstreamer-audio/sys/src/lib.rs index 735763162..224858394 100644 --- a/gstreamer-audio/sys/src/lib.rs +++ b/gstreamer-audio/sys/src/lib.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-audio/sys/tests/abi.rs b/gstreamer-audio/sys/tests/abi.rs index 0dff27982..04cda99a7 100644 --- a/gstreamer-audio/sys/tests/abi.rs +++ b/gstreamer-audio/sys/tests/abi.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-audio/sys/tests/constant.c b/gstreamer-audio/sys/tests/constant.c index 13b42cb84..0e8d770cd 100644 --- a/gstreamer-audio/sys/tests/constant.c +++ b/gstreamer-audio/sys/tests/constant.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-audio/sys/tests/layout.c b/gstreamer-audio/sys/tests/layout.c index 580bfacf7..fe000e13c 100644 --- a/gstreamer-audio/sys/tests/layout.c +++ b/gstreamer-audio/sys/tests/layout.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-base/src/auto/aggregator.rs b/gstreamer-base/src/auto/aggregator.rs index 19653ec2e..5d187eadf 100644 --- a/gstreamer-base/src/auto/aggregator.rs +++ b/gstreamer-base/src/auto/aggregator.rs @@ -171,8 +171,8 @@ impl> AggregatorExt for O { unsafe { ffi::gst_aggregator_set_latency( self.as_ref().to_glib_none().0, - min_latency.to_glib(), - max_latency.to_glib(), + min_latency.into_glib(), + max_latency.into_glib(), ); } } diff --git a/gstreamer-base/src/auto/base_parse.rs b/gstreamer-base/src/auto/base_parse.rs index a8f31ba09..8e9776428 100644 --- a/gstreamer-base/src/auto/base_parse.rs +++ b/gstreamer-base/src/auto/base_parse.rs @@ -83,9 +83,9 @@ impl> BaseParseExt for O { from_glib(ffi::gst_base_parse_add_index_entry( self.as_ref().to_glib_none().0, offset, - ts.to_glib(), - key.to_glib(), - force.to_glib(), + ts.into_glib(), + key.into_glib(), + force.into_glib(), )) } } @@ -103,7 +103,7 @@ impl> BaseParseExt for O { ffi::gst_base_parse_merge_tags( self.as_ref().to_glib_none().0, tags.to_glib_none().0, - mode.to_glib(), + mode.into_glib(), ); } } @@ -118,14 +118,14 @@ impl> BaseParseExt for O { unsafe { ffi::gst_base_parse_set_has_timing_info( self.as_ref().to_glib_none().0, - has_timing.to_glib(), + has_timing.into_glib(), ); } } fn set_infer_ts(&self, infer_ts: bool) { unsafe { - ffi::gst_base_parse_set_infer_ts(self.as_ref().to_glib_none().0, infer_ts.to_glib()); + ffi::gst_base_parse_set_infer_ts(self.as_ref().to_glib_none().0, infer_ts.into_glib()); } } @@ -133,8 +133,8 @@ impl> BaseParseExt for O { unsafe { ffi::gst_base_parse_set_latency( self.as_ref().to_glib_none().0, - min_latency.to_glib(), - max_latency.to_glib(), + min_latency.into_glib(), + max_latency.into_glib(), ); } } @@ -149,7 +149,7 @@ impl> BaseParseExt for O { unsafe { ffi::gst_base_parse_set_passthrough( self.as_ref().to_glib_none().0, - passthrough.to_glib(), + passthrough.into_glib(), ); } } @@ -158,14 +158,14 @@ impl> BaseParseExt for O { unsafe { ffi::gst_base_parse_set_pts_interpolation( self.as_ref().to_glib_none().0, - pts_interpolate.to_glib(), + pts_interpolate.into_glib(), ); } } fn set_syncable(&self, syncable: bool) { unsafe { - ffi::gst_base_parse_set_syncable(self.as_ref().to_glib_none().0, syncable.to_glib()); + ffi::gst_base_parse_set_syncable(self.as_ref().to_glib_none().0, syncable.into_glib()); } } diff --git a/gstreamer-base/src/auto/base_sink.rs b/gstreamer-base/src/auto/base_sink.rs index 70ebeb903..930dac35e 100644 --- a/gstreamer-base/src/auto/base_sink.rs +++ b/gstreamer-base/src/auto/base_sink.rs @@ -314,7 +314,10 @@ impl> BaseSinkExt for O { fn set_async_enabled(&self, enabled: bool) { unsafe { - ffi::gst_base_sink_set_async_enabled(self.as_ref().to_glib_none().0, enabled.to_glib()); + ffi::gst_base_sink_set_async_enabled( + self.as_ref().to_glib_none().0, + enabled.into_glib(), + ); } } @@ -330,7 +333,7 @@ impl> BaseSinkExt for O { unsafe { ffi::gst_base_sink_set_drop_out_of_segment( self.as_ref().to_glib_none().0, - drop_out_of_segment.to_glib(), + drop_out_of_segment.into_glib(), ); } } @@ -339,7 +342,7 @@ impl> BaseSinkExt for O { unsafe { ffi::gst_base_sink_set_last_sample_enabled( self.as_ref().to_glib_none().0, - enabled.to_glib(), + enabled.into_glib(), ); } } @@ -362,26 +365,26 @@ impl> BaseSinkExt for O { unsafe { ffi::gst_base_sink_set_processing_deadline( self.as_ref().to_glib_none().0, - processing_deadline.to_glib(), + processing_deadline.into_glib(), ); } } fn set_qos_enabled(&self, enabled: bool) { unsafe { - ffi::gst_base_sink_set_qos_enabled(self.as_ref().to_glib_none().0, enabled.to_glib()); + ffi::gst_base_sink_set_qos_enabled(self.as_ref().to_glib_none().0, enabled.into_glib()); } } fn set_render_delay(&self, delay: gst::ClockTime) { unsafe { - ffi::gst_base_sink_set_render_delay(self.as_ref().to_glib_none().0, delay.to_glib()); + ffi::gst_base_sink_set_render_delay(self.as_ref().to_glib_none().0, delay.into_glib()); } } fn set_sync(&self, sync: bool) { unsafe { - ffi::gst_base_sink_set_sync(self.as_ref().to_glib_none().0, sync.to_glib()); + ffi::gst_base_sink_set_sync(self.as_ref().to_glib_none().0, sync.into_glib()); } } diff --git a/gstreamer-base/src/auto/base_src.rs b/gstreamer-base/src/auto/base_src.rs index e32af7e59..7c573124e 100644 --- a/gstreamer-base/src/auto/base_src.rs +++ b/gstreamer-base/src/auto/base_src.rs @@ -163,7 +163,7 @@ impl> BaseSrcExt for O { fn set_async(&self, async_: bool) { unsafe { - ffi::gst_base_src_set_async(self.as_ref().to_glib_none().0, async_.to_glib()); + ffi::gst_base_src_set_async(self.as_ref().to_glib_none().0, async_.into_glib()); } } @@ -171,7 +171,7 @@ impl> BaseSrcExt for O { unsafe { ffi::gst_base_src_set_automatic_eos( self.as_ref().to_glib_none().0, - automatic_eos.to_glib(), + automatic_eos.into_glib(), ); } } @@ -193,25 +193,28 @@ impl> BaseSrcExt for O { fn set_do_timestamp(&self, timestamp: bool) { unsafe { - ffi::gst_base_src_set_do_timestamp(self.as_ref().to_glib_none().0, timestamp.to_glib()); + ffi::gst_base_src_set_do_timestamp( + self.as_ref().to_glib_none().0, + timestamp.into_glib(), + ); } } fn set_dynamic_size(&self, dynamic: bool) { unsafe { - ffi::gst_base_src_set_dynamic_size(self.as_ref().to_glib_none().0, dynamic.to_glib()); + ffi::gst_base_src_set_dynamic_size(self.as_ref().to_glib_none().0, dynamic.into_glib()); } } fn set_format(&self, format: gst::Format) { unsafe { - ffi::gst_base_src_set_format(self.as_ref().to_glib_none().0, format.to_glib()); + ffi::gst_base_src_set_format(self.as_ref().to_glib_none().0, format.into_glib()); } } fn set_live(&self, live: bool) { unsafe { - ffi::gst_base_src_set_live(self.as_ref().to_glib_none().0, live.to_glib()); + ffi::gst_base_src_set_live(self.as_ref().to_glib_none().0, live.into_glib()); } } diff --git a/gstreamer-base/src/auto/base_transform.rs b/gstreamer-base/src/auto/base_transform.rs index 809850289..3b6e10931 100644 --- a/gstreamer-base/src/auto/base_transform.rs +++ b/gstreamer-base/src/auto/base_transform.rs @@ -149,7 +149,7 @@ impl> BaseTransformExt for O { unsafe { ffi::gst_base_transform_set_gap_aware( self.as_ref().to_glib_none().0, - gap_aware.to_glib(), + gap_aware.into_glib(), ); } } @@ -158,7 +158,7 @@ impl> BaseTransformExt for O { unsafe { ffi::gst_base_transform_set_in_place( self.as_ref().to_glib_none().0, - in_place.to_glib(), + in_place.into_glib(), ); } } @@ -167,7 +167,7 @@ impl> BaseTransformExt for O { unsafe { ffi::gst_base_transform_set_passthrough( self.as_ref().to_glib_none().0, - passthrough.to_glib(), + passthrough.into_glib(), ); } } @@ -176,7 +176,7 @@ impl> BaseTransformExt for O { unsafe { ffi::gst_base_transform_set_prefer_passthrough( self.as_ref().to_glib_none().0, - prefer_passthrough.to_glib(), + prefer_passthrough.into_glib(), ); } } @@ -185,7 +185,7 @@ impl> BaseTransformExt for O { unsafe { ffi::gst_base_transform_set_qos_enabled( self.as_ref().to_glib_none().0, - enabled.to_glib(), + enabled.into_glib(), ); } } @@ -196,7 +196,7 @@ impl> BaseTransformExt for O { self.as_ref().to_glib_none().0, proportion, diff, - timestamp.to_glib(), + timestamp.into_glib(), ); } } diff --git a/gstreamer-base/src/auto/enums.rs b/gstreamer-base/src/auto/enums.rs index 4745ed0db..1cc9d98c7 100644 --- a/gstreamer-base/src/auto/enums.rs +++ b/gstreamer-base/src/auto/enums.rs @@ -38,11 +38,11 @@ pub enum AggregatorStartTimeSelection { #[cfg(any(feature = "v1_18", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] #[doc(hidden)] -impl ToGlib for AggregatorStartTimeSelection { +impl IntoGlib for AggregatorStartTimeSelection { type GlibType = ffi::GstAggregatorStartTimeSelection; - fn to_glib(&self) -> ffi::GstAggregatorStartTimeSelection { - match *self { + fn into_glib(self) -> ffi::GstAggregatorStartTimeSelection { + match self { AggregatorStartTimeSelection::Zero => ffi::GST_AGGREGATOR_START_TIME_SELECTION_ZERO, AggregatorStartTimeSelection::First => ffi::GST_AGGREGATOR_START_TIME_SELECTION_FIRST, AggregatorStartTimeSelection::Set => ffi::GST_AGGREGATOR_START_TIME_SELECTION_SET, @@ -97,7 +97,7 @@ impl ToValue for AggregatorStartTimeSelection { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } diff --git a/gstreamer-base/src/auto/flags.rs b/gstreamer-base/src/auto/flags.rs index 4c1780acf..a9b9085ac 100644 --- a/gstreamer-base/src/auto/flags.rs +++ b/gstreamer-base/src/auto/flags.rs @@ -17,10 +17,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for BaseParseFrameFlags { +impl IntoGlib for BaseParseFrameFlags { type GlibType = ffi::GstBaseParseFrameFlags; - fn to_glib(&self) -> ffi::GstBaseParseFrameFlags { + fn into_glib(self) -> ffi::GstBaseParseFrameFlags { self.bits() } } diff --git a/gstreamer-base/src/auto/versions.txt b/gstreamer-base/src/auto/versions.txt index e31790782..47c89fa9e 100644 --- a/gstreamer-base/src/auto/versions.txt +++ b/gstreamer-base/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) diff --git a/gstreamer-base/sys/build.rs b/gstreamer-base/sys/build.rs index c7e114aaa..526a151cd 100644 --- a/gstreamer-base/sys/build.rs +++ b/gstreamer-base/sys/build.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-base/sys/src/lib.rs b/gstreamer-base/sys/src/lib.rs index cdb40a824..861c23a11 100644 --- a/gstreamer-base/sys/src/lib.rs +++ b/gstreamer-base/sys/src/lib.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-base/sys/tests/abi.rs b/gstreamer-base/sys/tests/abi.rs index b83a132d6..fc06d9500 100644 --- a/gstreamer-base/sys/tests/abi.rs +++ b/gstreamer-base/sys/tests/abi.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-base/sys/tests/constant.c b/gstreamer-base/sys/tests/constant.c index fc8c0f6a1..d7b4c4e07 100644 --- a/gstreamer-base/sys/tests/constant.c +++ b/gstreamer-base/sys/tests/constant.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-base/sys/tests/layout.c b/gstreamer-base/sys/tests/layout.c index ebbd598dc..432921aaa 100644 --- a/gstreamer-base/sys/tests/layout.c +++ b/gstreamer-base/sys/tests/layout.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-check/src/auto/test_clock.rs b/gstreamer-check/src/auto/test_clock.rs index db5d370fb..1dc13003d 100644 --- a/gstreamer-check/src/auto/test_clock.rs +++ b/gstreamer-check/src/auto/test_clock.rs @@ -33,7 +33,7 @@ impl TestClock { assert_initialized_main_thread!(); unsafe { gst::Clock::from_glib_full(ffi::gst_test_clock_new_with_start_time( - start_time.to_glib(), + start_time.into_glib(), )) .unsafe_cast() } @@ -95,7 +95,7 @@ impl TestClock { #[doc(alias = "gst_test_clock_set_time")] pub fn set_time(&self, new_time: gst::ClockTime) { unsafe { - ffi::gst_test_clock_set_time(self.to_glib_none().0, new_time.to_glib()); + ffi::gst_test_clock_set_time(self.to_glib_none().0, new_time.into_glib()); } } diff --git a/gstreamer-check/src/auto/versions.txt b/gstreamer-check/src/auto/versions.txt index e31790782..47c89fa9e 100644 --- a/gstreamer-check/src/auto/versions.txt +++ b/gstreamer-check/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) diff --git a/gstreamer-check/sys/build.rs b/gstreamer-check/sys/build.rs index c7e114aaa..526a151cd 100644 --- a/gstreamer-check/sys/build.rs +++ b/gstreamer-check/sys/build.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-check/sys/src/lib.rs b/gstreamer-check/sys/src/lib.rs index b72e01cf2..b274e71e9 100644 --- a/gstreamer-check/sys/src/lib.rs +++ b/gstreamer-check/sys/src/lib.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-check/sys/tests/abi.rs b/gstreamer-check/sys/tests/abi.rs index 0b55e78bc..a083c2cf0 100644 --- a/gstreamer-check/sys/tests/abi.rs +++ b/gstreamer-check/sys/tests/abi.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-check/sys/tests/constant.c b/gstreamer-check/sys/tests/constant.c index f5dc66833..4a57f2659 100644 --- a/gstreamer-check/sys/tests/constant.c +++ b/gstreamer-check/sys/tests/constant.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-check/sys/tests/layout.c b/gstreamer-check/sys/tests/layout.c index 8bfc91631..044028c6a 100644 --- a/gstreamer-check/sys/tests/layout.c +++ b/gstreamer-check/sys/tests/layout.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-controller/src/auto/enums.rs b/gstreamer-controller/src/auto/enums.rs index d0cc17e2f..c59ac70a2 100644 --- a/gstreamer-controller/src/auto/enums.rs +++ b/gstreamer-controller/src/auto/enums.rs @@ -26,11 +26,11 @@ pub enum InterpolationMode { } #[doc(hidden)] -impl ToGlib for InterpolationMode { +impl IntoGlib for InterpolationMode { type GlibType = ffi::GstInterpolationMode; - fn to_glib(&self) -> ffi::GstInterpolationMode { - match *self { + fn into_glib(self) -> ffi::GstInterpolationMode { + match self { InterpolationMode::None => ffi::GST_INTERPOLATION_MODE_NONE, InterpolationMode::Linear => ffi::GST_INTERPOLATION_MODE_LINEAR, InterpolationMode::Cubic => ffi::GST_INTERPOLATION_MODE_CUBIC, @@ -77,7 +77,7 @@ impl ToValue for InterpolationMode { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -106,11 +106,11 @@ pub enum LFOWaveform { } #[doc(hidden)] -impl ToGlib for LFOWaveform { +impl IntoGlib for LFOWaveform { type GlibType = ffi::GstLFOWaveform; - fn to_glib(&self) -> ffi::GstLFOWaveform { - match *self { + fn into_glib(self) -> ffi::GstLFOWaveform { + match self { LFOWaveform::Sine => ffi::GST_LFO_WAVEFORM_SINE, LFOWaveform::Square => ffi::GST_LFO_WAVEFORM_SQUARE, LFOWaveform::Saw => ffi::GST_LFO_WAVEFORM_SAW, @@ -159,7 +159,7 @@ impl ToValue for LFOWaveform { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } diff --git a/gstreamer-controller/src/auto/timed_value_control_source.rs b/gstreamer-controller/src/auto/timed_value_control_source.rs index cb6b581af..545c0390d 100644 --- a/gstreamer-controller/src/auto/timed_value_control_source.rs +++ b/gstreamer-controller/src/auto/timed_value_control_source.rs @@ -80,7 +80,7 @@ impl> TimedValueControlSourceExt for O { unsafe { from_glib(ffi::gst_timed_value_control_source_set( self.as_ref().to_glib_none().0, - timestamp.to_glib(), + timestamp.into_glib(), value, )) } @@ -94,7 +94,7 @@ impl> TimedValueControlSourceExt for O { unsafe { from_glib(ffi::gst_timed_value_control_source_unset( self.as_ref().to_glib_none().0, - timestamp.to_glib(), + timestamp.into_glib(), )) } } diff --git a/gstreamer-controller/src/auto/versions.txt b/gstreamer-controller/src/auto/versions.txt index e31790782..47c89fa9e 100644 --- a/gstreamer-controller/src/auto/versions.txt +++ b/gstreamer-controller/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) diff --git a/gstreamer-controller/sys/build.rs b/gstreamer-controller/sys/build.rs index c7e114aaa..526a151cd 100644 --- a/gstreamer-controller/sys/build.rs +++ b/gstreamer-controller/sys/build.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-controller/sys/src/lib.rs b/gstreamer-controller/sys/src/lib.rs index a8b7d34a8..f0b12196e 100644 --- a/gstreamer-controller/sys/src/lib.rs +++ b/gstreamer-controller/sys/src/lib.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-controller/sys/tests/abi.rs b/gstreamer-controller/sys/tests/abi.rs index c0905780d..6f8c28f5e 100644 --- a/gstreamer-controller/sys/tests/abi.rs +++ b/gstreamer-controller/sys/tests/abi.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-controller/sys/tests/constant.c b/gstreamer-controller/sys/tests/constant.c index 1ef8603b8..cf32ef1a8 100644 --- a/gstreamer-controller/sys/tests/constant.c +++ b/gstreamer-controller/sys/tests/constant.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-controller/sys/tests/layout.c b/gstreamer-controller/sys/tests/layout.c index ecad92ae7..93afe2607 100644 --- a/gstreamer-controller/sys/tests/layout.c +++ b/gstreamer-controller/sys/tests/layout.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-editing-services/src/auto/asset.rs b/gstreamer-editing-services/src/auto/asset.rs index 8b16a6456..b9bf1e692 100644 --- a/gstreamer-editing-services/src/auto/asset.rs +++ b/gstreamer-editing-services/src/auto/asset.rs @@ -28,7 +28,7 @@ impl Asset { assert_initialized_main_thread!(); unsafe { from_glib(ffi::ges_asset_needs_reload( - extractable_type.to_glib(), + extractable_type.into_glib(), id.to_glib_none().0, )) } @@ -42,8 +42,11 @@ impl Asset { assert_initialized_main_thread!(); unsafe { let mut error = ptr::null_mut(); - let ret = - ffi::ges_asset_request(extractable_type.to_glib(), id.to_glib_none().0, &mut error); + let ret = ffi::ges_asset_request( + extractable_type.into_glib(), + id.to_glib_none().0, + &mut error, + ); if error.is_null() { Ok(from_glib_full(ret)) } else { @@ -84,7 +87,7 @@ impl Asset { let callback = request_async_trampoline::; unsafe { ffi::ges_asset_request_async( - extractable_type.to_glib(), + extractable_type.into_glib(), id.to_glib_none().0, cancellable.map(|p| p.as_ref()).to_glib_none().0, Some(callback), diff --git a/gstreamer-editing-services/src/auto/clip.rs b/gstreamer-editing-services/src/auto/clip.rs index da1df602e..6231f6c9b 100644 --- a/gstreamer-editing-services/src/auto/clip.rs +++ b/gstreamer-editing-services/src/auto/clip.rs @@ -244,7 +244,7 @@ impl> ClipExt for O { from_glib_full(ffi::ges_clip_find_track_element( self.as_ref().to_glib_none().0, track.map(|p| p.as_ref()).to_glib_none().0, - type_.to_glib(), + type_.into_glib(), )) } } @@ -259,8 +259,8 @@ impl> ClipExt for O { FromGlibPtrContainer::from_glib_full(ffi::ges_clip_find_track_elements( self.as_ref().to_glib_none().0, track.map(|p| p.as_ref()).to_glib_none().0, - track_type.to_glib(), - type_.to_glib(), + track_type.into_glib(), + type_.into_glib(), )) } } @@ -287,7 +287,7 @@ impl> ClipExt for O { let ret = ffi::ges_clip_get_internal_time_from_timeline_time( self.as_ref().to_glib_none().0, child.as_ref().to_glib_none().0, - timeline_time.to_glib(), + timeline_time.into_glib(), &mut error, ); if error.is_null() { @@ -322,7 +322,7 @@ impl> ClipExt for O { let ret = ffi::ges_clip_get_timeline_time_from_internal_time( self.as_ref().to_glib_none().0, child.as_ref().to_glib_none().0, - internal_time.to_glib(), + internal_time.into_glib(), &mut error, ); if error.is_null() { @@ -432,7 +432,7 @@ impl> ClipExt for O { unsafe { ffi::ges_clip_set_supported_formats( self.as_ref().to_glib_none().0, - supportedformats.to_glib(), + supportedformats.into_glib(), ); } } diff --git a/gstreamer-editing-services/src/auto/container.rs b/gstreamer-editing-services/src/auto/container.rs index 6803933ae..dd064788b 100644 --- a/gstreamer-editing-services/src/auto/container.rs +++ b/gstreamer-editing-services/src/auto/container.rs @@ -102,8 +102,8 @@ impl> GESContainerExt for O { self.as_ref().to_glib_none().0, layers.to_glib_none().0, new_layer_priority, - mode.to_glib(), - edge.to_glib(), + mode.into_glib(), + edge.into_glib(), position ), "Failed to edit container" @@ -115,7 +115,7 @@ impl> GESContainerExt for O { unsafe { FromGlibPtrContainer::from_glib_full(ffi::ges_container_get_children( self.as_ref().to_glib_none().0, - recursive.to_glib(), + recursive.into_glib(), )) } } @@ -136,7 +136,7 @@ impl> GESContainerExt for O { unsafe { FromGlibPtrContainer::from_glib_full(ffi::ges_container_ungroup( self.as_ref().to_glib_full(), - recursive.to_glib(), + recursive.into_glib(), )) } } diff --git a/gstreamer-editing-services/src/auto/enums.rs b/gstreamer-editing-services/src/auto/enums.rs index 909fb33d1..554eeaf52 100644 --- a/gstreamer-editing-services/src/auto/enums.rs +++ b/gstreamer-editing-services/src/auto/enums.rs @@ -35,7 +35,7 @@ impl Edge { pub fn name<'a>(self) -> &'a str { unsafe { CStr::from_ptr( - ffi::ges_edge_name(self.to_glib()) + ffi::ges_edge_name(self.into_glib()) .as_ref() .expect("ges_edge_name returned NULL"), ) @@ -55,11 +55,11 @@ impl fmt::Display for Edge { } #[doc(hidden)] -impl ToGlib for Edge { +impl IntoGlib for Edge { type GlibType = ffi::GESEdge; - fn to_glib(&self) -> ffi::GESEdge { - match *self { + fn into_glib(self) -> ffi::GESEdge { + match self { Edge::Start => ffi::GES_EDGE_START, Edge::End => ffi::GES_EDGE_END, Edge::None => ffi::GES_EDGE_NONE, @@ -104,7 +104,7 @@ impl ToValue for Edge { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -138,7 +138,7 @@ impl EditMode { pub fn name<'a>(self) -> &'a str { unsafe { CStr::from_ptr( - ffi::ges_edit_mode_name(self.to_glib()) + ffi::ges_edit_mode_name(self.into_glib()) .as_ref() .expect("ges_edit_mode_name returned NULL"), ) @@ -158,11 +158,11 @@ impl fmt::Display for EditMode { } #[doc(hidden)] -impl ToGlib for EditMode { +impl IntoGlib for EditMode { type GlibType = ffi::GESEditMode; - fn to_glib(&self) -> ffi::GESEditMode { - match *self { + fn into_glib(self) -> ffi::GESEditMode { + match self { EditMode::Normal => ffi::GES_EDIT_MODE_NORMAL, EditMode::Ripple => ffi::GES_EDIT_MODE_RIPPLE, EditMode::Roll => ffi::GES_EDIT_MODE_ROLL, @@ -211,7 +211,7 @@ impl ToValue for EditMode { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -374,11 +374,11 @@ pub enum VideoStandardTransitionType { } #[doc(hidden)] -impl ToGlib for VideoStandardTransitionType { +impl IntoGlib for VideoStandardTransitionType { type GlibType = ffi::GESVideoStandardTransitionType; - fn to_glib(&self) -> ffi::GESVideoStandardTransitionType { - match *self { + fn into_glib(self) -> ffi::GESVideoStandardTransitionType { + match self { VideoStandardTransitionType::None => ffi::GES_VIDEO_STANDARD_TRANSITION_TYPE_NONE, VideoStandardTransitionType::BarWipeLr => { ffi::GES_VIDEO_STANDARD_TRANSITION_TYPE_BAR_WIPE_LR @@ -683,7 +683,7 @@ impl ToValue for VideoStandardTransitionType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } diff --git a/gstreamer-editing-services/src/auto/flags.rs b/gstreamer-editing-services/src/auto/flags.rs index 134a944ff..88ea00e10 100644 --- a/gstreamer-editing-services/src/auto/flags.rs +++ b/gstreamer-editing-services/src/auto/flags.rs @@ -23,10 +23,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for PipelineFlags { +impl IntoGlib for PipelineFlags { type GlibType = ffi::GESPipelineFlags; - fn to_glib(&self) -> ffi::GESPipelineFlags { + fn into_glib(self) -> ffi::GESPipelineFlags { self.bits() } } @@ -62,7 +62,7 @@ impl ToValue for PipelineFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -86,7 +86,7 @@ impl TrackType { pub fn name<'a>(self) -> &'a str { unsafe { CStr::from_ptr( - ffi::ges_track_type_name(self.to_glib()) + ffi::ges_track_type_name(self.into_glib()) .as_ref() .expect("ges_track_type_name returned NULL"), ) @@ -104,10 +104,10 @@ impl fmt::Display for TrackType { } #[doc(hidden)] -impl ToGlib for TrackType { +impl IntoGlib for TrackType { type GlibType = ffi::GESTrackType; - fn to_glib(&self) -> ffi::GESTrackType { + fn into_glib(self) -> ffi::GESTrackType { self.bits() } } @@ -143,7 +143,7 @@ impl ToValue for TrackType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } diff --git a/gstreamer-editing-services/src/auto/layer.rs b/gstreamer-editing-services/src/auto/layer.rs index 8895fa0d7..a9c2af9c4 100644 --- a/gstreamer-editing-services/src/auto/layer.rs +++ b/gstreamer-editing-services/src/auto/layer.rs @@ -151,10 +151,10 @@ impl> LayerExt for O { Option::<_>::from_glib_none(ffi::ges_layer_add_asset( self.as_ref().to_glib_none().0, asset.as_ref().to_glib_none().0, - start.to_glib(), - inpoint.to_glib(), - duration.to_glib(), - track_types.to_glib(), + start.into_glib(), + inpoint.into_glib(), + duration.into_glib(), + track_types.into_glib(), )) .ok_or_else(|| glib::bool_error!("Failed to add asset")) } @@ -175,10 +175,10 @@ impl> LayerExt for O { let ret = ffi::ges_layer_add_asset_full( self.as_ref().to_glib_none().0, asset.as_ref().to_glib_none().0, - start.to_glib(), - inpoint.to_glib(), - duration.to_glib(), - track_types.to_glib(), + start.into_glib(), + inpoint.into_glib(), + duration.into_glib(), + track_types.into_glib(), &mut error, ); if error.is_null() { @@ -250,8 +250,8 @@ impl> LayerExt for O { unsafe { FromGlibPtrContainer::from_glib_full(ffi::ges_layer_get_clips_in_interval( self.as_ref().to_glib_none().0, - start.to_glib(), - end.to_glib(), + start.into_glib(), + end.into_glib(), )) } } @@ -290,7 +290,7 @@ impl> LayerExt for O { unsafe { from_glib(ffi::ges_layer_set_active_for_tracks( self.as_ref().to_glib_none().0, - active.to_glib(), + active.into_glib(), tracks.to_glib_none().0, )) } @@ -300,7 +300,7 @@ impl> LayerExt for O { unsafe { ffi::ges_layer_set_auto_transition( self.as_ref().to_glib_none().0, - auto_transition.to_glib(), + auto_transition.into_glib(), ); } } diff --git a/gstreamer-editing-services/src/auto/pipeline.rs b/gstreamer-editing-services/src/auto/pipeline.rs index acc5b8ead..f216ec117 100644 --- a/gstreamer-editing-services/src/auto/pipeline.rs +++ b/gstreamer-editing-services/src/auto/pipeline.rs @@ -212,7 +212,7 @@ impl> GESPipelineExt for O { fn set_mode(&self, mode: PipelineFlags) -> Result<(), glib::error::BoolError> { unsafe { glib::result_from_gboolean!( - ffi::ges_pipeline_set_mode(self.as_ref().to_glib_none().0, mode.to_glib()), + ffi::ges_pipeline_set_mode(self.as_ref().to_glib_none().0, mode.into_glib()), "Failed to set mode" ) } diff --git a/gstreamer-editing-services/src/auto/project.rs b/gstreamer-editing-services/src/auto/project.rs index 30756900b..83932bced 100644 --- a/gstreamer-editing-services/src/auto/project.rs +++ b/gstreamer-editing-services/src/auto/project.rs @@ -153,7 +153,7 @@ impl> ProjectExt for O { from_glib(ffi::ges_project_create_asset( self.as_ref().to_glib_none().0, id.to_glib_none().0, - extractable_type.to_glib(), + extractable_type.into_glib(), )) } } @@ -168,7 +168,7 @@ impl> ProjectExt for O { let ret = ffi::ges_project_create_asset_sync( self.as_ref().to_glib_none().0, id.to_glib_none().0, - extractable_type.to_glib(), + extractable_type.into_glib(), &mut error, ); if error.is_null() { @@ -184,7 +184,7 @@ impl> ProjectExt for O { from_glib_full(ffi::ges_project_get_asset( self.as_ref().to_glib_none().0, id.to_glib_none().0, - extractable_type.to_glib(), + extractable_type.into_glib(), )) } } @@ -205,7 +205,7 @@ impl> ProjectExt for O { unsafe { FromGlibPtrContainer::from_glib_full(ffi::ges_project_list_assets( self.as_ref().to_glib_none().0, - filter.to_glib(), + filter.into_glib(), )) } } @@ -260,7 +260,7 @@ impl> ProjectExt for O { timeline.as_ref().to_glib_none().0, uri.to_glib_none().0, formatter_asset.map(|p| p.as_ref()).to_glib_full(), - overwrite.to_glib(), + overwrite.into_glib(), &mut error, ); if error.is_null() { diff --git a/gstreamer-editing-services/src/auto/timeline.rs b/gstreamer-editing-services/src/auto/timeline.rs index 019ece671..762f4b589 100644 --- a/gstreamer-editing-services/src/auto/timeline.rs +++ b/gstreamer-editing-services/src/auto/timeline.rs @@ -289,7 +289,7 @@ impl> TimelineExt for O { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] fn frame_at(&self, timestamp: gst::ClockTime) -> FrameNumber { unsafe { - ffi::ges_timeline_get_frame_at(self.as_ref().to_glib_none().0, timestamp.to_glib()) + ffi::ges_timeline_get_frame_at(self.as_ref().to_glib_none().0, timestamp.into_glib()) } } @@ -412,7 +412,7 @@ impl> TimelineExt for O { from_glib_full(ffi::ges_timeline_paste_element( self.as_ref().to_glib_none().0, element.as_ref().to_glib_none().0, - position.to_glib(), + position.into_glib(), layer_priority, )) } @@ -454,7 +454,7 @@ impl> TimelineExt for O { self.as_ref().to_glib_none().0, uri.to_glib_none().0, formatter_asset.map(|p| p.as_ref()).to_glib_none().0, - overwrite.to_glib(), + overwrite.into_glib(), &mut error, ); if error.is_null() { @@ -469,7 +469,7 @@ impl> TimelineExt for O { unsafe { ffi::ges_timeline_set_auto_transition( self.as_ref().to_glib_none().0, - auto_transition.to_glib(), + auto_transition.into_glib(), ); } } @@ -478,7 +478,7 @@ impl> TimelineExt for O { unsafe { ffi::ges_timeline_set_snapping_distance( self.as_ref().to_glib_none().0, - snapping_distance.to_glib(), + snapping_distance.into_glib(), ); } } diff --git a/gstreamer-editing-services/src/auto/timeline_element.rs b/gstreamer-editing-services/src/auto/timeline_element.rs index 4d20ab7e0..b3a70e451 100644 --- a/gstreamer-editing-services/src/auto/timeline_element.rs +++ b/gstreamer-editing-services/src/auto/timeline_element.rs @@ -245,7 +245,7 @@ impl> TimelineElementExt for O { unsafe { Option::<_>::from_glib_none(ffi::ges_timeline_element_copy( self.as_ref().to_glib_none().0, - deep.to_glib(), + deep.into_glib(), )) .ok_or_else(|| glib::bool_error!("Failed to copy timeline element")) } @@ -266,8 +266,8 @@ impl> TimelineElementExt for O { self.as_ref().to_glib_none().0, layers.to_glib_none().0, new_layer_priority, - mode.to_glib(), - edge.to_glib(), + mode.into_glib(), + edge.into_glib(), position, )) } @@ -287,8 +287,8 @@ impl> TimelineElementExt for O { let _ = ffi::ges_timeline_element_edit_full( self.as_ref().to_glib_none().0, new_layer_priority, - mode.to_glib(), - edge.to_glib(), + mode.into_glib(), + edge.into_glib(), position, &mut error, ); @@ -431,7 +431,7 @@ impl> TimelineElementExt for O { unsafe { Option::<_>::from_glib_full(ffi::ges_timeline_element_paste( self.as_ref().to_glib_none().0, - paste_position.to_glib(), + paste_position.into_glib(), )) .ok_or_else(|| glib::bool_error!("Failed to paste timeline element")) } @@ -444,7 +444,7 @@ impl> TimelineElementExt for O { fn ripple(&self, start: gst::ClockTime) -> Result<(), glib::error::BoolError> { unsafe { glib::result_from_gboolean!( - ffi::ges_timeline_element_ripple(self.as_ref().to_glib_none().0, start.to_glib()), + ffi::ges_timeline_element_ripple(self.as_ref().to_glib_none().0, start.into_glib()), "Failed to ripple" ) } @@ -453,7 +453,10 @@ impl> TimelineElementExt for O { fn ripple_end(&self, end: gst::ClockTime) -> Result<(), glib::error::BoolError> { unsafe { glib::result_from_gboolean!( - ffi::ges_timeline_element_ripple_end(self.as_ref().to_glib_none().0, end.to_glib()), + ffi::ges_timeline_element_ripple_end( + self.as_ref().to_glib_none().0, + end.into_glib() + ), "Failed to ripple" ) } @@ -462,7 +465,7 @@ impl> TimelineElementExt for O { fn roll_end(&self, end: gst::ClockTime) -> Result<(), glib::error::BoolError> { unsafe { glib::result_from_gboolean!( - ffi::ges_timeline_element_roll_end(self.as_ref().to_glib_none().0, end.to_glib()), + ffi::ges_timeline_element_roll_end(self.as_ref().to_glib_none().0, end.into_glib()), "Failed to roll" ) } @@ -473,7 +476,7 @@ impl> TimelineElementExt for O { glib::result_from_gboolean!( ffi::ges_timeline_element_roll_start( self.as_ref().to_glib_none().0, - start.to_glib() + start.into_glib() ), "Failed to roll" ) @@ -506,7 +509,7 @@ impl> TimelineElementExt for O { unsafe { from_glib(ffi::ges_timeline_element_set_duration( self.as_ref().to_glib_none().0, - duration.to_glib(), + duration.into_glib(), )) } } @@ -515,7 +518,7 @@ impl> TimelineElementExt for O { unsafe { from_glib(ffi::ges_timeline_element_set_inpoint( self.as_ref().to_glib_none().0, - inpoint.to_glib(), + inpoint.into_glib(), )) } } @@ -524,7 +527,7 @@ impl> TimelineElementExt for O { unsafe { from_glib(ffi::ges_timeline_element_set_max_duration( self.as_ref().to_glib_none().0, - maxduration.to_glib(), + maxduration.into_glib(), )) } } @@ -569,7 +572,7 @@ impl> TimelineElementExt for O { unsafe { from_glib(ffi::ges_timeline_element_set_start( self.as_ref().to_glib_none().0, - start.to_glib(), + start.into_glib(), )) } } @@ -589,7 +592,7 @@ impl> TimelineElementExt for O { fn trim(&self, start: gst::ClockTime) -> Result<(), glib::error::BoolError> { unsafe { glib::result_from_gboolean!( - ffi::ges_timeline_element_trim(self.as_ref().to_glib_none().0, start.to_glib()), + ffi::ges_timeline_element_trim(self.as_ref().to_glib_none().0, start.into_glib()), "Failed to trim" ) } diff --git a/gstreamer-editing-services/src/auto/track.rs b/gstreamer-editing-services/src/auto/track.rs index 2baef2dec..c02db6599 100644 --- a/gstreamer-editing-services/src/auto/track.rs +++ b/gstreamer-editing-services/src/auto/track.rs @@ -33,7 +33,7 @@ impl Track { #[doc(alias = "ges_track_new")] pub fn new(type_: TrackType, caps: &gst::Caps) -> Track { assert_initialized_main_thread!(); - unsafe { from_glib_none(ffi::ges_track_new(type_.to_glib(), caps.to_glib_full())) } + unsafe { from_glib_none(ffi::ges_track_new(type_.into_glib(), caps.to_glib_full())) } } } @@ -242,7 +242,7 @@ impl> GESTrackExt for O { fn set_mixing(&self, mixing: bool) { unsafe { - ffi::ges_track_set_mixing(self.as_ref().to_glib_none().0, mixing.to_glib()); + ffi::ges_track_set_mixing(self.as_ref().to_glib_none().0, mixing.into_glib()); } } diff --git a/gstreamer-editing-services/src/auto/track_element.rs b/gstreamer-editing-services/src/auto/track_element.rs index a9ef01290..0778396e4 100644 --- a/gstreamer-editing-services/src/auto/track_element.rs +++ b/gstreamer-editing-services/src/auto/track_element.rs @@ -184,8 +184,8 @@ impl> TrackElementExt for O { ffi::ges_track_element_edit( self.as_ref().to_glib_none().0, layers.to_glib_none().0, - mode.to_glib(), - edge.to_glib(), + mode.into_glib(), + edge.into_glib(), position ), "Failed to edit" @@ -299,7 +299,7 @@ impl> TrackElementExt for O { unsafe { from_glib(ffi::ges_track_element_set_active( self.as_ref().to_glib_none().0, - active.to_glib(), + active.into_glib(), )) } } @@ -310,7 +310,7 @@ impl> TrackElementExt for O { unsafe { ffi::ges_track_element_set_auto_clamp_control_sources( self.as_ref().to_glib_none().0, - auto_clamp.to_glib(), + auto_clamp.into_glib(), ); } } @@ -325,14 +325,17 @@ impl> TrackElementExt for O { unsafe { from_glib(ffi::ges_track_element_set_has_internal_source( self.as_ref().to_glib_none().0, - has_internal_source.to_glib(), + has_internal_source.into_glib(), )) } } fn set_track_type(&self, type_: TrackType) { unsafe { - ffi::ges_track_element_set_track_type(self.as_ref().to_glib_none().0, type_.to_glib()); + ffi::ges_track_element_set_track_type( + self.as_ref().to_glib_none().0, + type_.into_glib(), + ); } } diff --git a/gstreamer-editing-services/src/auto/transition_clip.rs b/gstreamer-editing-services/src/auto/transition_clip.rs index 6f7118662..533daafaf 100644 --- a/gstreamer-editing-services/src/auto/transition_clip.rs +++ b/gstreamer-editing-services/src/auto/transition_clip.rs @@ -32,7 +32,7 @@ impl TransitionClip { #[doc(alias = "ges_transition_clip_new")] pub fn new(vtype: VideoStandardTransitionType) -> Option { assert_initialized_main_thread!(); - unsafe { from_glib_none(ffi::ges_transition_clip_new(vtype.to_glib())) } + unsafe { from_glib_none(ffi::ges_transition_clip_new(vtype.into_glib())) } } #[doc(alias = "ges_transition_clip_new_for_nick")] diff --git a/gstreamer-editing-services/src/auto/uri_clip.rs b/gstreamer-editing-services/src/auto/uri_clip.rs index 4c34ffe4e..e4da7a1ba 100644 --- a/gstreamer-editing-services/src/auto/uri_clip.rs +++ b/gstreamer-editing-services/src/auto/uri_clip.rs @@ -77,13 +77,13 @@ impl> UriClipExt for O { fn set_is_image(&self, is_image: bool) { unsafe { - ffi::ges_uri_clip_set_is_image(self.as_ref().to_glib_none().0, is_image.to_glib()); + ffi::ges_uri_clip_set_is_image(self.as_ref().to_glib_none().0, is_image.into_glib()); } } fn set_mute(&self, mute: bool) { unsafe { - ffi::ges_uri_clip_set_mute(self.as_ref().to_glib_none().0, mute.to_glib()); + ffi::ges_uri_clip_set_mute(self.as_ref().to_glib_none().0, mute.into_glib()); } } diff --git a/gstreamer-editing-services/src/auto/versions.txt b/gstreamer-editing-services/src/auto/versions.txt index e31790782..47c89fa9e 100644 --- a/gstreamer-editing-services/src/auto/versions.txt +++ b/gstreamer-editing-services/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) diff --git a/gstreamer-editing-services/sys/build.rs b/gstreamer-editing-services/sys/build.rs index c7e114aaa..526a151cd 100644 --- a/gstreamer-editing-services/sys/build.rs +++ b/gstreamer-editing-services/sys/build.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-editing-services/sys/src/lib.rs b/gstreamer-editing-services/sys/src/lib.rs index bd1ef6e09..5cc19635d 100644 --- a/gstreamer-editing-services/sys/src/lib.rs +++ b/gstreamer-editing-services/sys/src/lib.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-editing-services/sys/tests/abi.rs b/gstreamer-editing-services/sys/tests/abi.rs index daaf7c0c1..c24ba43c2 100644 --- a/gstreamer-editing-services/sys/tests/abi.rs +++ b/gstreamer-editing-services/sys/tests/abi.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-editing-services/sys/tests/constant.c b/gstreamer-editing-services/sys/tests/constant.c index e2f2d9ee9..c10cc94ae 100644 --- a/gstreamer-editing-services/sys/tests/constant.c +++ b/gstreamer-editing-services/sys/tests/constant.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-editing-services/sys/tests/layout.c b/gstreamer-editing-services/sys/tests/layout.c index bf3f472df..12106861b 100644 --- a/gstreamer-editing-services/sys/tests/layout.c +++ b/gstreamer-editing-services/sys/tests/layout.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-gl/egl/src/auto/versions.txt b/gstreamer-gl/egl/src/auto/versions.txt index e31790782..47c89fa9e 100644 --- a/gstreamer-gl/egl/src/auto/versions.txt +++ b/gstreamer-gl/egl/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) diff --git a/gstreamer-gl/egl/sys/build.rs b/gstreamer-gl/egl/sys/build.rs index c7e114aaa..526a151cd 100644 --- a/gstreamer-gl/egl/sys/build.rs +++ b/gstreamer-gl/egl/sys/build.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-gl/egl/sys/src/lib.rs b/gstreamer-gl/egl/sys/src/lib.rs index 07ff6e153..66b7d5afa 100644 --- a/gstreamer-gl/egl/sys/src/lib.rs +++ b/gstreamer-gl/egl/sys/src/lib.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-gl/egl/sys/tests/abi.rs b/gstreamer-gl/egl/sys/tests/abi.rs index 3739d6d18..397afb6c9 100644 --- a/gstreamer-gl/egl/sys/tests/abi.rs +++ b/gstreamer-gl/egl/sys/tests/abi.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-gl/egl/sys/tests/constant.c b/gstreamer-gl/egl/sys/tests/constant.c index ea0c78097..5f9d85dc1 100644 --- a/gstreamer-gl/egl/sys/tests/constant.c +++ b/gstreamer-gl/egl/sys/tests/constant.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-gl/egl/sys/tests/layout.c b/gstreamer-gl/egl/sys/tests/layout.c index 43e18eada..78734ebcb 100644 --- a/gstreamer-gl/egl/sys/tests/layout.c +++ b/gstreamer-gl/egl/sys/tests/layout.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-gl/src/auto/enums.rs b/gstreamer-gl/src/auto/enums.rs index 7481c9741..aacfd6013 100644 --- a/gstreamer-gl/src/auto/enums.rs +++ b/gstreamer-gl/src/auto/enums.rs @@ -36,11 +36,11 @@ pub enum GLContextError { } #[doc(hidden)] -impl ToGlib for GLContextError { +impl IntoGlib for GLContextError { type GlibType = ffi::GstGLContextError; - fn to_glib(&self) -> ffi::GstGLContextError { - match *self { + fn into_glib(self) -> ffi::GstGLContextError { + match self { GLContextError::Failed => ffi::GST_GL_CONTEXT_ERROR_FAILED, GLContextError::WrongConfig => ffi::GST_GL_CONTEXT_ERROR_WRONG_CONFIG, GLContextError::WrongApi => ffi::GST_GL_CONTEXT_ERROR_WRONG_API, @@ -76,7 +76,7 @@ impl ErrorDomain for GLContextError { } fn code(self) -> i32 { - self.to_glib() + self.into_glib() } fn from(code: i32) -> Option { @@ -116,7 +116,7 @@ impl ToValue for GLContextError { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -197,7 +197,7 @@ impl GLFormat { unsafe { from_glib(ffi::gst_gl_format_is_supported( context.as_ref().to_glib_none().0, - format.to_glib(), + format.into_glib(), )) } } @@ -211,7 +211,7 @@ impl GLFormat { let mut unsized_format = mem::MaybeUninit::uninit(); let mut gl_type = mem::MaybeUninit::uninit(); ffi::gst_gl_format_type_from_sized_gl_format( - self.to_glib(), + self.into_glib(), unsized_format.as_mut_ptr(), gl_type.as_mut_ptr(), ); @@ -229,11 +229,11 @@ impl GLFormat { } #[doc(hidden)] -impl ToGlib for GLFormat { +impl IntoGlib for GLFormat { type GlibType = ffi::GstGLFormat; - fn to_glib(&self) -> ffi::GstGLFormat { - match *self { + fn into_glib(self) -> ffi::GstGLFormat { + match self { GLFormat::Luminance => ffi::GST_GL_LUMINANCE, GLFormat::Alpha => ffi::GST_GL_ALPHA, GLFormat::LuminanceAlpha => ffi::GST_GL_LUMINANCE_ALPHA, @@ -310,7 +310,7 @@ impl ToValue for GLFormat { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -335,11 +335,11 @@ pub enum GLQueryType { } #[doc(hidden)] -impl ToGlib for GLQueryType { +impl IntoGlib for GLQueryType { type GlibType = ffi::GstGLQueryType; - fn to_glib(&self) -> ffi::GstGLQueryType { - match *self { + fn into_glib(self) -> ffi::GstGLQueryType { + match self { GLQueryType::None => ffi::GST_GL_QUERY_NONE, GLQueryType::TimeElapsed => ffi::GST_GL_QUERY_TIME_ELAPSED, GLQueryType::Timestamp => ffi::GST_GL_QUERY_TIMESTAMP, @@ -384,7 +384,7 @@ impl ToValue for GLQueryType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -409,11 +409,11 @@ pub enum GLSLError { } #[doc(hidden)] -impl ToGlib for GLSLError { +impl IntoGlib for GLSLError { type GlibType = ffi::GstGLSLError; - fn to_glib(&self) -> ffi::GstGLSLError { - match *self { + fn into_glib(self) -> ffi::GstGLSLError { + match self { GLSLError::Compile => ffi::GST_GLSL_ERROR_COMPILE, GLSLError::Link => ffi::GST_GLSL_ERROR_LINK, GLSLError::Program => ffi::GST_GLSL_ERROR_PROGRAM, @@ -443,7 +443,7 @@ impl ErrorDomain for GLSLError { } fn code(self) -> i32 { - self.to_glib() + self.into_glib() } fn from(code: i32) -> Option { @@ -480,7 +480,7 @@ impl ToValue for GLSLError { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -565,8 +565,8 @@ impl GLSLVersion { assert_initialized_main_thread!(); unsafe { from_glib_full(ffi::gst_glsl_version_profile_to_string( - self.to_glib(), - profile.to_glib(), + self.into_glib(), + profile.into_glib(), )) } } @@ -574,16 +574,16 @@ impl GLSLVersion { #[doc(alias = "gst_glsl_version_to_string")] pub fn to_str(self) -> Option { assert_initialized_main_thread!(); - unsafe { from_glib_none(ffi::gst_glsl_version_to_string(self.to_glib())) } + unsafe { from_glib_none(ffi::gst_glsl_version_to_string(self.into_glib())) } } } #[doc(hidden)] -impl ToGlib for GLSLVersion { +impl IntoGlib for GLSLVersion { type GlibType = ffi::GstGLSLVersion; - fn to_glib(&self) -> ffi::GstGLSLVersion { - match *self { + fn into_glib(self) -> ffi::GstGLSLVersion { + match self { GLSLVersion::None => ffi::GST_GLSL_VERSION_NONE, GLSLVersion::_100 => ffi::GST_GLSL_VERSION_100, GLSLVersion::_110 => ffi::GST_GLSL_VERSION_110, @@ -656,7 +656,7 @@ impl ToValue for GLSLVersion { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -681,11 +681,11 @@ pub enum GLStereoDownmix { } #[doc(hidden)] -impl ToGlib for GLStereoDownmix { +impl IntoGlib for GLStereoDownmix { type GlibType = ffi::GstGLStereoDownmix; - fn to_glib(&self) -> ffi::GstGLStereoDownmix { - match *self { + fn into_glib(self) -> ffi::GstGLStereoDownmix { + match self { GLStereoDownmix::GreenMagentaDubois => { ffi::GST_GL_STEREO_DOWNMIX_ANAGLYPH_GREEN_MAGENTA_DUBOIS } @@ -734,7 +734,7 @@ impl ToValue for GLStereoDownmix { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -778,7 +778,7 @@ impl GLTextureTarget { assert_initialized_main_thread!(); unsafe { from_glib_none(ffi::gst_gl_texture_target_to_buffer_pool_option( - self.to_glib(), + self.into_glib(), )) } } @@ -786,22 +786,22 @@ impl GLTextureTarget { #[doc(alias = "gst_gl_texture_target_to_gl")] pub fn to_gl(self) -> u32 { assert_initialized_main_thread!(); - unsafe { ffi::gst_gl_texture_target_to_gl(self.to_glib()) } + unsafe { ffi::gst_gl_texture_target_to_gl(self.into_glib()) } } #[doc(alias = "gst_gl_texture_target_to_string")] pub fn to_str(self) -> Option { assert_initialized_main_thread!(); - unsafe { from_glib_none(ffi::gst_gl_texture_target_to_string(self.to_glib())) } + unsafe { from_glib_none(ffi::gst_gl_texture_target_to_string(self.into_glib())) } } } #[doc(hidden)] -impl ToGlib for GLTextureTarget { +impl IntoGlib for GLTextureTarget { type GlibType = ffi::GstGLTextureTarget; - fn to_glib(&self) -> ffi::GstGLTextureTarget { - match *self { + fn into_glib(self) -> ffi::GstGLTextureTarget { + match self { GLTextureTarget::None => ffi::GST_GL_TEXTURE_TARGET_NONE, GLTextureTarget::_2d => ffi::GST_GL_TEXTURE_TARGET_2D, GLTextureTarget::Rectangle => ffi::GST_GL_TEXTURE_TARGET_RECTANGLE, @@ -848,7 +848,7 @@ impl ToValue for GLTextureTarget { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -877,11 +877,11 @@ pub enum GLUploadReturn { } #[doc(hidden)] -impl ToGlib for GLUploadReturn { +impl IntoGlib for GLUploadReturn { type GlibType = ffi::GstGLUploadReturn; - fn to_glib(&self) -> ffi::GstGLUploadReturn { - match *self { + fn into_glib(self) -> ffi::GstGLUploadReturn { + match self { GLUploadReturn::Done => ffi::GST_GL_UPLOAD_DONE, GLUploadReturn::Error => ffi::GST_GL_UPLOAD_ERROR, GLUploadReturn::Unsupported => ffi::GST_GL_UPLOAD_UNSUPPORTED, @@ -930,7 +930,7 @@ impl ToValue for GLUploadReturn { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -955,11 +955,11 @@ pub enum GLWindowError { } #[doc(hidden)] -impl ToGlib for GLWindowError { +impl IntoGlib for GLWindowError { type GlibType = ffi::GstGLWindowError; - fn to_glib(&self) -> ffi::GstGLWindowError { - match *self { + fn into_glib(self) -> ffi::GstGLWindowError { + match self { GLWindowError::Failed => ffi::GST_GL_WINDOW_ERROR_FAILED, GLWindowError::OldLibs => ffi::GST_GL_WINDOW_ERROR_OLD_LIBS, GLWindowError::ResourceUnavailable => ffi::GST_GL_WINDOW_ERROR_RESOURCE_UNAVAILABLE, @@ -989,7 +989,7 @@ impl ErrorDomain for GLWindowError { } fn code(self) -> i32 { - self.to_glib() + self.into_glib() } fn from(code: i32) -> Option { @@ -1026,7 +1026,7 @@ impl ToValue for GLWindowError { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } diff --git a/gstreamer-gl/src/auto/flags.rs b/gstreamer-gl/src/auto/flags.rs index 474dcedd8..4bfa07a01 100644 --- a/gstreamer-gl/src/auto/flags.rs +++ b/gstreamer-gl/src/auto/flags.rs @@ -30,7 +30,7 @@ impl GLAPI { #[doc(alias = "gst_gl_api_to_string")] pub fn to_str(self) -> glib::GString { assert_initialized_main_thread!(); - unsafe { from_glib_full(ffi::gst_gl_api_to_string(self.to_glib())) } + unsafe { from_glib_full(ffi::gst_gl_api_to_string(self.into_glib())) } } } @@ -42,10 +42,10 @@ impl fmt::Display for GLAPI { } #[doc(hidden)] -impl ToGlib for GLAPI { +impl IntoGlib for GLAPI { type GlibType = ffi::GstGLAPI; - fn to_glib(&self) -> ffi::GstGLAPI { + fn into_glib(self) -> ffi::GstGLAPI { self.bits() } } @@ -81,7 +81,7 @@ impl ToValue for GLAPI { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -108,10 +108,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for GLDisplayType { +impl IntoGlib for GLDisplayType { type GlibType = ffi::GstGLDisplayType; - fn to_glib(&self) -> ffi::GstGLDisplayType { + fn into_glib(self) -> ffi::GstGLDisplayType { self.bits() } } @@ -147,7 +147,7 @@ impl ToValue for GLDisplayType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -181,7 +181,7 @@ impl GLPlatform { #[doc(alias = "gst_gl_platform_to_string")] pub fn to_str(self) -> glib::GString { assert_initialized_main_thread!(); - unsafe { from_glib_full(ffi::gst_gl_platform_to_string(self.to_glib())) } + unsafe { from_glib_full(ffi::gst_gl_platform_to_string(self.into_glib())) } } } @@ -193,10 +193,10 @@ impl fmt::Display for GLPlatform { } #[doc(hidden)] -impl ToGlib for GLPlatform { +impl IntoGlib for GLPlatform { type GlibType = ffi::GstGLPlatform; - fn to_glib(&self) -> ffi::GstGLPlatform { + fn into_glib(self) -> ffi::GstGLPlatform { self.bits() } } @@ -232,7 +232,7 @@ impl ToValue for GLPlatform { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -260,15 +260,15 @@ impl GLSLProfile { #[doc(alias = "gst_glsl_profile_to_string")] pub fn to_str(self) -> Option { assert_initialized_main_thread!(); - unsafe { from_glib_none(ffi::gst_glsl_profile_to_string(self.to_glib())) } + unsafe { from_glib_none(ffi::gst_glsl_profile_to_string(self.into_glib())) } } } #[doc(hidden)] -impl ToGlib for GLSLProfile { +impl IntoGlib for GLSLProfile { type GlibType = ffi::GstGLSLProfile; - fn to_glib(&self) -> ffi::GstGLSLProfile { + fn into_glib(self) -> ffi::GstGLSLProfile { self.bits() } } @@ -304,7 +304,7 @@ impl ToValue for GLSLProfile { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } diff --git a/gstreamer-gl/src/auto/gl_color_convert.rs b/gstreamer-gl/src/auto/gl_color_convert.rs index 988ff2472..90c61ce4f 100644 --- a/gstreamer-gl/src/auto/gl_color_convert.rs +++ b/gstreamer-gl/src/auto/gl_color_convert.rs @@ -55,7 +55,7 @@ impl GLColorConvert { unsafe { from_glib_full(ffi::gst_gl_color_convert_transform_caps( context.as_ref().to_glib_none().0, - direction.to_glib(), + direction.into_glib(), caps.to_glib_none().0, filter.to_glib_none().0, )) diff --git a/gstreamer-gl/src/auto/gl_context.rs b/gstreamer-gl/src/auto/gl_context.rs index 1cc72a2ac..713347f38 100644 --- a/gstreamer-gl/src/auto/gl_context.rs +++ b/gstreamer-gl/src/auto/gl_context.rs @@ -42,7 +42,7 @@ impl GLContext { let mut major = mem::MaybeUninit::uninit(); let mut minor = mem::MaybeUninit::uninit(); let ret = from_glib(ffi::gst_gl_context_get_current_gl_api( - platform.to_glib(), + platform.into_glib(), major.as_mut_ptr(), minor.as_mut_ptr(), )); @@ -137,7 +137,7 @@ impl> GLContextExt for O { fn activate(&self, activate: bool) -> Result<(), glib::error::BoolError> { unsafe { glib::result_from_gboolean!( - ffi::gst_gl_context_activate(self.as_ref().to_glib_none().0, activate.to_glib()), + ffi::gst_gl_context_activate(self.as_ref().to_glib_none().0, activate.into_glib()), "Failed to activate OpenGL context" ) } @@ -174,7 +174,7 @@ impl> GLContextExt for O { unsafe { from_glib(ffi::gst_gl_context_check_gl_version( self.as_ref().to_glib_none().0, - api.to_glib(), + api.into_glib(), maj, min, )) @@ -322,8 +322,8 @@ impl> GLContextExt for O { unsafe { from_glib(ffi::gst_gl_context_supports_glsl_profile_version( self.as_ref().to_glib_none().0, - version.to_glib(), - profile.to_glib(), + version.into_glib(), + profile.into_glib(), )) } } @@ -334,8 +334,8 @@ impl> GLContextExt for O { unsafe { from_glib(ffi::gst_gl_context_supports_precision( self.as_ref().to_glib_none().0, - version.to_glib(), - profile.to_glib(), + version.into_glib(), + profile.into_glib(), )) } } @@ -346,8 +346,8 @@ impl> GLContextExt for O { unsafe { from_glib(ffi::gst_gl_context_supports_precision_highp( self.as_ref().to_glib_none().0, - version.to_glib(), - profile.to_glib(), + version.into_glib(), + profile.into_glib(), )) } } diff --git a/gstreamer-gl/src/auto/gl_display.rs b/gstreamer-gl/src/auto/gl_display.rs index fcc5d0514..28637e28c 100644 --- a/gstreamer-gl/src/auto/gl_display.rs +++ b/gstreamer-gl/src/auto/gl_display.rs @@ -132,7 +132,7 @@ impl> GLDisplayExt for O { fn filter_gl_api(&self, gl_api: GLAPI) { unsafe { - ffi::gst_gl_display_filter_gl_api(self.as_ref().to_glib_none().0, gl_api.to_glib()); + ffi::gst_gl_display_filter_gl_api(self.as_ref().to_glib_none().0, gl_api.into_glib()); } } diff --git a/gstreamer-gl/src/auto/gl_filter.rs b/gstreamer-gl/src/auto/gl_filter.rs index f6c87d9cf..a352d410e 100644 --- a/gstreamer-gl/src/auto/gl_filter.rs +++ b/gstreamer-gl/src/auto/gl_filter.rs @@ -85,7 +85,7 @@ impl> GLFilterExt for O { let in_tex = from_glib_borrow(in_tex); let callback: *mut P = user_data as *const _ as usize as *mut P; let res = (*callback)(&filter, &in_tex); - res.to_glib() + res.into_glib() } let func = Some(func_func::

as _); let super_callback0: &P = &func_data; diff --git a/gstreamer-gl/src/auto/gl_shader.rs b/gstreamer-gl/src/auto/gl_shader.rs index 63e4e7aa5..3a7d03780 100644 --- a/gstreamer-gl/src/auto/gl_shader.rs +++ b/gstreamer-gl/src/auto/gl_shader.rs @@ -381,8 +381,8 @@ impl GLShader { unsafe { from_glib_full(ffi::gst_gl_shader_string_fragment_external_oes_get_default( context.as_ref().to_glib_none().0, - version.to_glib(), - profile.to_glib(), + version.into_glib(), + profile.into_glib(), )) } } @@ -399,8 +399,8 @@ impl GLShader { unsafe { from_glib_full(ffi::gst_gl_shader_string_fragment_get_default( context.as_ref().to_glib_none().0, - version.to_glib(), - profile.to_glib(), + version.into_glib(), + profile.into_glib(), )) } } @@ -417,8 +417,8 @@ impl GLShader { unsafe { from_glib_none(ffi::gst_gl_shader_string_get_highest_precision( context.as_ref().to_glib_none().0, - version.to_glib(), - profile.to_glib(), + version.into_glib(), + profile.into_glib(), )) } } diff --git a/gstreamer-gl/src/auto/gl_upload.rs b/gstreamer-gl/src/auto/gl_upload.rs index 4cafeb172..2d616f238 100644 --- a/gstreamer-gl/src/auto/gl_upload.rs +++ b/gstreamer-gl/src/auto/gl_upload.rs @@ -73,7 +73,7 @@ impl GLUpload { from_glib_full(ffi::gst_gl_upload_transform_caps( self.to_glib_none().0, context.as_ref().to_glib_none().0, - direction.to_glib(), + direction.into_glib(), caps.to_glib_none().0, filter.to_glib_none().0, )) diff --git a/gstreamer-gl/src/auto/gl_video_allocation_params.rs b/gstreamer-gl/src/auto/gl_video_allocation_params.rs index a06de82f3..b1eeb0c76 100644 --- a/gstreamer-gl/src/auto/gl_video_allocation_params.rs +++ b/gstreamer-gl/src/auto/gl_video_allocation_params.rs @@ -39,8 +39,8 @@ impl GLVideoAllocationParams { mut_override(v_info.to_glib_none().0), plane, mut_override(valign.to_glib_none().0), - target.to_glib(), - tex_format.to_glib(), + target.into_glib(), + tex_format.into_glib(), )) } } diff --git a/gstreamer-gl/src/auto/gl_view_convert.rs b/gstreamer-gl/src/auto/gl_view_convert.rs index 3a6cc8dcf..f99a3587c 100644 --- a/gstreamer-gl/src/auto/gl_view_convert.rs +++ b/gstreamer-gl/src/auto/gl_view_convert.rs @@ -85,7 +85,7 @@ impl GLViewConvert { unsafe { from_glib_full(ffi::gst_gl_view_convert_transform_caps( self.to_glib_none().0, - direction.to_glib(), + direction.into_glib(), caps.to_glib_none().0, filter.to_glib_none().0, )) diff --git a/gstreamer-gl/src/auto/gl_window.rs b/gstreamer-gl/src/auto/gl_window.rs index 8dfd3f5c5..0c7332ec8 100644 --- a/gstreamer-gl/src/auto/gl_window.rs +++ b/gstreamer-gl/src/auto/gl_window.rs @@ -158,7 +158,7 @@ impl> GLWindowExt for O { unsafe { ffi::gst_gl_window_handle_events( self.as_ref().to_glib_none().0, - handle_events.to_glib(), + handle_events.into_glib(), ); } } diff --git a/gstreamer-gl/src/auto/glsl_stage.rs b/gstreamer-gl/src/auto/glsl_stage.rs index e894006fd..30e7233ea 100644 --- a/gstreamer-gl/src/auto/glsl_stage.rs +++ b/gstreamer-gl/src/auto/glsl_stage.rs @@ -63,8 +63,8 @@ impl GLSLStage { from_glib_none(ffi::gst_glsl_stage_new_with_string( context.as_ref().to_glib_none().0, type_, - version.to_glib(), - profile.to_glib(), + version.into_glib(), + profile.into_glib(), str.to_glib_none().0, )) } @@ -84,8 +84,8 @@ impl GLSLStage { from_glib_none(ffi::gst_glsl_stage_new_with_strings( context.as_ref().to_glib_none().0, type_, - version.to_glib(), - profile.to_glib(), + version.into_glib(), + profile.into_glib(), n_strings, str.to_glib_none().0, )) @@ -137,8 +137,8 @@ impl GLSLStage { glib::result_from_gboolean!( ffi::gst_glsl_stage_set_strings( self.to_glib_none().0, - version.to_glib(), - profile.to_glib(), + version.into_glib(), + profile.into_glib(), n_strings, str.to_glib_none().0 ), diff --git a/gstreamer-gl/src/auto/versions.txt b/gstreamer-gl/src/auto/versions.txt index e31790782..47c89fa9e 100644 --- a/gstreamer-gl/src/auto/versions.txt +++ b/gstreamer-gl/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) diff --git a/gstreamer-gl/sys/build.rs b/gstreamer-gl/sys/build.rs index c7e114aaa..526a151cd 100644 --- a/gstreamer-gl/sys/build.rs +++ b/gstreamer-gl/sys/build.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-gl/sys/src/lib.rs b/gstreamer-gl/sys/src/lib.rs index 6959822c6..c7be92a39 100644 --- a/gstreamer-gl/sys/src/lib.rs +++ b/gstreamer-gl/sys/src/lib.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-gl/sys/tests/abi.rs b/gstreamer-gl/sys/tests/abi.rs index f4193eb7c..192581783 100644 --- a/gstreamer-gl/sys/tests/abi.rs +++ b/gstreamer-gl/sys/tests/abi.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-gl/sys/tests/constant.c b/gstreamer-gl/sys/tests/constant.c index c64a55f33..9ab38b847 100644 --- a/gstreamer-gl/sys/tests/constant.c +++ b/gstreamer-gl/sys/tests/constant.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-gl/sys/tests/layout.c b/gstreamer-gl/sys/tests/layout.c index 548a4d08d..c754fb69e 100644 --- a/gstreamer-gl/sys/tests/layout.c +++ b/gstreamer-gl/sys/tests/layout.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-gl/wayland/src/auto/versions.txt b/gstreamer-gl/wayland/src/auto/versions.txt index e31790782..47c89fa9e 100644 --- a/gstreamer-gl/wayland/src/auto/versions.txt +++ b/gstreamer-gl/wayland/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) diff --git a/gstreamer-gl/wayland/sys/build.rs b/gstreamer-gl/wayland/sys/build.rs index c7e114aaa..526a151cd 100644 --- a/gstreamer-gl/wayland/sys/build.rs +++ b/gstreamer-gl/wayland/sys/build.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-gl/wayland/sys/src/lib.rs b/gstreamer-gl/wayland/sys/src/lib.rs index 40d132879..17d5e4c02 100644 --- a/gstreamer-gl/wayland/sys/src/lib.rs +++ b/gstreamer-gl/wayland/sys/src/lib.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-gl/wayland/sys/tests/abi.rs b/gstreamer-gl/wayland/sys/tests/abi.rs index 55de18fab..6f4172175 100644 --- a/gstreamer-gl/wayland/sys/tests/abi.rs +++ b/gstreamer-gl/wayland/sys/tests/abi.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-gl/wayland/sys/tests/constant.c b/gstreamer-gl/wayland/sys/tests/constant.c index f5dc66833..4a57f2659 100644 --- a/gstreamer-gl/wayland/sys/tests/constant.c +++ b/gstreamer-gl/wayland/sys/tests/constant.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-gl/wayland/sys/tests/layout.c b/gstreamer-gl/wayland/sys/tests/layout.c index 0f40e0a52..56cbe8d28 100644 --- a/gstreamer-gl/wayland/sys/tests/layout.c +++ b/gstreamer-gl/wayland/sys/tests/layout.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-gl/x11/src/auto/versions.txt b/gstreamer-gl/x11/src/auto/versions.txt index e31790782..47c89fa9e 100644 --- a/gstreamer-gl/x11/src/auto/versions.txt +++ b/gstreamer-gl/x11/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) diff --git a/gstreamer-gl/x11/sys/build.rs b/gstreamer-gl/x11/sys/build.rs index c7e114aaa..526a151cd 100644 --- a/gstreamer-gl/x11/sys/build.rs +++ b/gstreamer-gl/x11/sys/build.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-gl/x11/sys/src/lib.rs b/gstreamer-gl/x11/sys/src/lib.rs index 4094fb2f1..4c375444c 100644 --- a/gstreamer-gl/x11/sys/src/lib.rs +++ b/gstreamer-gl/x11/sys/src/lib.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-gl/x11/sys/tests/abi.rs b/gstreamer-gl/x11/sys/tests/abi.rs index a6e2bbf5e..edd5d8ac0 100644 --- a/gstreamer-gl/x11/sys/tests/abi.rs +++ b/gstreamer-gl/x11/sys/tests/abi.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-gl/x11/sys/tests/constant.c b/gstreamer-gl/x11/sys/tests/constant.c index f5dc66833..4a57f2659 100644 --- a/gstreamer-gl/x11/sys/tests/constant.c +++ b/gstreamer-gl/x11/sys/tests/constant.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-gl/x11/sys/tests/layout.c b/gstreamer-gl/x11/sys/tests/layout.c index e22eebe1f..7284d593d 100644 --- a/gstreamer-gl/x11/sys/tests/layout.c +++ b/gstreamer-gl/x11/sys/tests/layout.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-mpegts/sys/build.rs b/gstreamer-mpegts/sys/build.rs index c7e114aaa..526a151cd 100644 --- a/gstreamer-mpegts/sys/build.rs +++ b/gstreamer-mpegts/sys/build.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-mpegts/sys/src/lib.rs b/gstreamer-mpegts/sys/src/lib.rs index edcf590c6..82f41cbe3 100644 --- a/gstreamer-mpegts/sys/src/lib.rs +++ b/gstreamer-mpegts/sys/src/lib.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-mpegts/sys/tests/abi.rs b/gstreamer-mpegts/sys/tests/abi.rs index 59335ad0c..dc3075e75 100644 --- a/gstreamer-mpegts/sys/tests/abi.rs +++ b/gstreamer-mpegts/sys/tests/abi.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-mpegts/sys/tests/constant.c b/gstreamer-mpegts/sys/tests/constant.c index 3ffb3aed3..aa34a098a 100644 --- a/gstreamer-mpegts/sys/tests/constant.c +++ b/gstreamer-mpegts/sys/tests/constant.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-mpegts/sys/tests/layout.c b/gstreamer-mpegts/sys/tests/layout.c index 3ca139cfb..ecd9453b2 100644 --- a/gstreamer-mpegts/sys/tests/layout.c +++ b/gstreamer-mpegts/sys/tests/layout.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-net/src/auto/versions.txt b/gstreamer-net/src/auto/versions.txt index e31790782..47c89fa9e 100644 --- a/gstreamer-net/src/auto/versions.txt +++ b/gstreamer-net/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) diff --git a/gstreamer-net/sys/build.rs b/gstreamer-net/sys/build.rs index c7e114aaa..526a151cd 100644 --- a/gstreamer-net/sys/build.rs +++ b/gstreamer-net/sys/build.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-net/sys/src/lib.rs b/gstreamer-net/sys/src/lib.rs index cd7d36386..905c08a4e 100644 --- a/gstreamer-net/sys/src/lib.rs +++ b/gstreamer-net/sys/src/lib.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-net/sys/tests/abi.rs b/gstreamer-net/sys/tests/abi.rs index f0cea84ef..49f5e1c61 100644 --- a/gstreamer-net/sys/tests/abi.rs +++ b/gstreamer-net/sys/tests/abi.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-net/sys/tests/constant.c b/gstreamer-net/sys/tests/constant.c index dbb5d6e53..0857f37ca 100644 --- a/gstreamer-net/sys/tests/constant.c +++ b/gstreamer-net/sys/tests/constant.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-net/sys/tests/layout.c b/gstreamer-net/sys/tests/layout.c index 7fa85faee..f3734943d 100644 --- a/gstreamer-net/sys/tests/layout.c +++ b/gstreamer-net/sys/tests/layout.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-pbutils/src/auto/discoverer.rs b/gstreamer-pbutils/src/auto/discoverer.rs index a2edd6495..49d4d69f1 100644 --- a/gstreamer-pbutils/src/auto/discoverer.rs +++ b/gstreamer-pbutils/src/auto/discoverer.rs @@ -32,7 +32,7 @@ impl Discoverer { assert_initialized_main_thread!(); unsafe { let mut error = ptr::null_mut(); - let ret = ffi::gst_discoverer_new(timeout.to_glib(), &mut error); + let ret = ffi::gst_discoverer_new(timeout.into_glib(), &mut error); if error.is_null() { Ok(from_glib_full(ret)) } else { diff --git a/gstreamer-pbutils/src/auto/discoverer_info.rs b/gstreamer-pbutils/src/auto/discoverer_info.rs index 8e050c3ad..e421552b6 100644 --- a/gstreamer-pbutils/src/auto/discoverer_info.rs +++ b/gstreamer-pbutils/src/auto/discoverer_info.rs @@ -101,7 +101,7 @@ impl DiscovererInfo { unsafe { FromGlibPtrContainer::from_glib_full(ffi::gst_discoverer_info_get_streams( self.to_glib_none().0, - streamtype.to_glib(), + streamtype.into_glib(), )) } } @@ -147,7 +147,7 @@ impl DiscovererInfo { unsafe { Option::<_>::from_glib_full(ffi::gst_discoverer_info_to_variant( self.to_glib_none().0, - flags.to_glib(), + flags.into_glib(), )) .ok_or_else(|| glib::bool_error!("Failed to serialize DiscovererInfo to Variant")) } diff --git a/gstreamer-pbutils/src/auto/enums.rs b/gstreamer-pbutils/src/auto/enums.rs index af28e1bc8..c9e9e3bb9 100644 --- a/gstreamer-pbutils/src/auto/enums.rs +++ b/gstreamer-pbutils/src/auto/enums.rs @@ -30,11 +30,11 @@ pub enum DiscovererResult { } #[doc(hidden)] -impl ToGlib for DiscovererResult { +impl IntoGlib for DiscovererResult { type GlibType = ffi::GstDiscovererResult; - fn to_glib(&self) -> ffi::GstDiscovererResult { - match *self { + fn into_glib(self) -> ffi::GstDiscovererResult { + match self { DiscovererResult::Ok => ffi::GST_DISCOVERER_OK, DiscovererResult::UriInvalid => ffi::GST_DISCOVERER_URI_INVALID, DiscovererResult::Error => ffi::GST_DISCOVERER_ERROR, @@ -85,7 +85,7 @@ impl ToValue for DiscovererResult { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } diff --git a/gstreamer-pbutils/src/auto/flags.rs b/gstreamer-pbutils/src/auto/flags.rs index 74d4f56c2..c568b93e0 100644 --- a/gstreamer-pbutils/src/auto/flags.rs +++ b/gstreamer-pbutils/src/auto/flags.rs @@ -19,10 +19,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for DiscovererSerializeFlags { +impl IntoGlib for DiscovererSerializeFlags { type GlibType = ffi::GstDiscovererSerializeFlags; - fn to_glib(&self) -> ffi::GstDiscovererSerializeFlags { + fn into_glib(self) -> ffi::GstDiscovererSerializeFlags { self.bits() } } @@ -58,7 +58,7 @@ impl ToValue for DiscovererSerializeFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } diff --git a/gstreamer-pbutils/src/auto/versions.txt b/gstreamer-pbutils/src/auto/versions.txt index e31790782..47c89fa9e 100644 --- a/gstreamer-pbutils/src/auto/versions.txt +++ b/gstreamer-pbutils/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) diff --git a/gstreamer-pbutils/sys/build.rs b/gstreamer-pbutils/sys/build.rs index c7e114aaa..526a151cd 100644 --- a/gstreamer-pbutils/sys/build.rs +++ b/gstreamer-pbutils/sys/build.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-pbutils/sys/src/lib.rs b/gstreamer-pbutils/sys/src/lib.rs index 9f54dc6e8..4b3f10c0d 100644 --- a/gstreamer-pbutils/sys/src/lib.rs +++ b/gstreamer-pbutils/sys/src/lib.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-pbutils/sys/tests/abi.rs b/gstreamer-pbutils/sys/tests/abi.rs index bbe4b8112..ea3f294bd 100644 --- a/gstreamer-pbutils/sys/tests/abi.rs +++ b/gstreamer-pbutils/sys/tests/abi.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-pbutils/sys/tests/constant.c b/gstreamer-pbutils/sys/tests/constant.c index 5790a121c..136154866 100644 --- a/gstreamer-pbutils/sys/tests/constant.c +++ b/gstreamer-pbutils/sys/tests/constant.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-pbutils/sys/tests/layout.c b/gstreamer-pbutils/sys/tests/layout.c index 8a4adf5eb..c6ea3b49e 100644 --- a/gstreamer-pbutils/sys/tests/layout.c +++ b/gstreamer-pbutils/sys/tests/layout.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-player/src/auto/enums.rs b/gstreamer-player/src/auto/enums.rs index aaa7fe456..dccd8238e 100644 --- a/gstreamer-player/src/auto/enums.rs +++ b/gstreamer-player/src/auto/enums.rs @@ -31,16 +31,20 @@ impl PlayerColorBalanceType { #[doc(alias = "gst_player_color_balance_type_get_name")] pub fn name(self) -> Option { assert_initialized_main_thread!(); - unsafe { from_glib_none(ffi::gst_player_color_balance_type_get_name(self.to_glib())) } + unsafe { + from_glib_none(ffi::gst_player_color_balance_type_get_name( + self.into_glib(), + )) + } } } #[doc(hidden)] -impl ToGlib for PlayerColorBalanceType { +impl IntoGlib for PlayerColorBalanceType { type GlibType = ffi::GstPlayerColorBalanceType; - fn to_glib(&self) -> ffi::GstPlayerColorBalanceType { - match *self { + fn into_glib(self) -> ffi::GstPlayerColorBalanceType { + match self { PlayerColorBalanceType::Hue => ffi::GST_PLAYER_COLOR_BALANCE_HUE, PlayerColorBalanceType::Brightness => ffi::GST_PLAYER_COLOR_BALANCE_BRIGHTNESS, PlayerColorBalanceType::Saturation => ffi::GST_PLAYER_COLOR_BALANCE_SATURATION, @@ -87,7 +91,7 @@ impl ToValue for PlayerColorBalanceType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -111,16 +115,16 @@ impl PlayerError { #[doc(alias = "gst_player_error_get_name")] pub fn name(self) -> Option { assert_initialized_main_thread!(); - unsafe { from_glib_none(ffi::gst_player_error_get_name(self.to_glib())) } + unsafe { from_glib_none(ffi::gst_player_error_get_name(self.into_glib())) } } } #[doc(hidden)] -impl ToGlib for PlayerError { +impl IntoGlib for PlayerError { type GlibType = ffi::GstPlayerError; - fn to_glib(&self) -> ffi::GstPlayerError { - match *self { + fn into_glib(self) -> ffi::GstPlayerError { + match self { PlayerError::Failed => ffi::GST_PLAYER_ERROR_FAILED, PlayerError::__Unknown(value) => value, } @@ -146,7 +150,7 @@ impl ErrorDomain for PlayerError { } fn code(self) -> i32 { - self.to_glib() + self.into_glib() } fn from(code: i32) -> Option { @@ -181,7 +185,7 @@ impl ToValue for PlayerError { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -210,11 +214,11 @@ pub enum PlayerSnapshotFormat { } #[doc(hidden)] -impl ToGlib for PlayerSnapshotFormat { +impl IntoGlib for PlayerSnapshotFormat { type GlibType = ffi::GstPlayerSnapshotFormat; - fn to_glib(&self) -> ffi::GstPlayerSnapshotFormat { - match *self { + fn into_glib(self) -> ffi::GstPlayerSnapshotFormat { + match self { PlayerSnapshotFormat::RawNative => ffi::GST_PLAYER_THUMBNAIL_RAW_NATIVE, PlayerSnapshotFormat::RawXrgb => ffi::GST_PLAYER_THUMBNAIL_RAW_xRGB, PlayerSnapshotFormat::RawBgrx => ffi::GST_PLAYER_THUMBNAIL_RAW_BGRx, @@ -260,16 +264,16 @@ impl PlayerState { #[doc(alias = "gst_player_state_get_name")] pub fn name(self) -> Option { assert_initialized_main_thread!(); - unsafe { from_glib_none(ffi::gst_player_state_get_name(self.to_glib())) } + unsafe { from_glib_none(ffi::gst_player_state_get_name(self.into_glib())) } } } #[doc(hidden)] -impl ToGlib for PlayerState { +impl IntoGlib for PlayerState { type GlibType = ffi::GstPlayerState; - fn to_glib(&self) -> ffi::GstPlayerState { - match *self { + fn into_glib(self) -> ffi::GstPlayerState { + match self { PlayerState::Stopped => ffi::GST_PLAYER_STATE_STOPPED, PlayerState::Buffering => ffi::GST_PLAYER_STATE_BUFFERING, PlayerState::Paused => ffi::GST_PLAYER_STATE_PAUSED, @@ -316,7 +320,7 @@ impl ToValue for PlayerState { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } diff --git a/gstreamer-player/src/auto/player.rs b/gstreamer-player/src/auto/player.rs index 86b77bbeb..073fc8115 100644 --- a/gstreamer-player/src/auto/player.rs +++ b/gstreamer-player/src/auto/player.rs @@ -36,7 +36,7 @@ impl Player { #[doc(alias = "gst_player_get_color_balance")] pub fn color_balance(&self, type_: PlayerColorBalanceType) -> f64 { - unsafe { ffi::gst_player_get_color_balance(self.to_glib_none().0, type_.to_glib()) } + unsafe { ffi::gst_player_get_color_balance(self.to_glib_none().0, type_.into_glib()) } } #[doc(alias = "gst_player_get_current_audio_track")] @@ -141,7 +141,7 @@ impl Player { unsafe { from_glib_full(ffi::gst_player_get_video_snapshot( self.to_glib_none().0, - format.to_glib(), + format.into_glib(), config.to_glib_none().0, )) } @@ -174,7 +174,7 @@ impl Player { #[doc(alias = "gst_player_seek")] pub fn seek(&self, position: gst::ClockTime) { unsafe { - ffi::gst_player_seek(self.to_glib_none().0, position.to_glib()); + ffi::gst_player_seek(self.to_glib_none().0, position.into_glib()); } } @@ -191,7 +191,7 @@ impl Player { #[doc(alias = "gst_player_set_audio_track_enabled")] pub fn set_audio_track_enabled(&self, enabled: bool) { unsafe { - ffi::gst_player_set_audio_track_enabled(self.to_glib_none().0, enabled.to_glib()); + ffi::gst_player_set_audio_track_enabled(self.to_glib_none().0, enabled.into_glib()); } } @@ -205,28 +205,28 @@ impl Player { #[doc(alias = "gst_player_set_color_balance")] pub fn set_color_balance(&self, type_: PlayerColorBalanceType, value: f64) { unsafe { - ffi::gst_player_set_color_balance(self.to_glib_none().0, type_.to_glib(), value); + ffi::gst_player_set_color_balance(self.to_glib_none().0, type_.into_glib(), value); } } #[doc(alias = "gst_player_set_multiview_flags")] pub fn set_multiview_flags(&self, flags: gst_video::VideoMultiviewFlags) { unsafe { - ffi::gst_player_set_multiview_flags(self.to_glib_none().0, flags.to_glib()); + ffi::gst_player_set_multiview_flags(self.to_glib_none().0, flags.into_glib()); } } #[doc(alias = "gst_player_set_multiview_mode")] pub fn set_multiview_mode(&self, mode: gst_video::VideoMultiviewFramePacking) { unsafe { - ffi::gst_player_set_multiview_mode(self.to_glib_none().0, mode.to_glib()); + ffi::gst_player_set_multiview_mode(self.to_glib_none().0, mode.into_glib()); } } #[doc(alias = "gst_player_set_mute")] pub fn set_mute(&self, val: bool) { unsafe { - ffi::gst_player_set_mute(self.to_glib_none().0, val.to_glib()); + ffi::gst_player_set_mute(self.to_glib_none().0, val.into_glib()); } } @@ -250,7 +250,7 @@ impl Player { #[doc(alias = "gst_player_set_subtitle_track_enabled")] pub fn set_subtitle_track_enabled(&self, enabled: bool) { unsafe { - ffi::gst_player_set_subtitle_track_enabled(self.to_glib_none().0, enabled.to_glib()); + ffi::gst_player_set_subtitle_track_enabled(self.to_glib_none().0, enabled.into_glib()); } } @@ -290,7 +290,7 @@ impl Player { #[doc(alias = "gst_player_set_video_track_enabled")] pub fn set_video_track_enabled(&self, enabled: bool) { unsafe { - ffi::gst_player_set_video_track_enabled(self.to_glib_none().0, enabled.to_glib()); + ffi::gst_player_set_video_track_enabled(self.to_glib_none().0, enabled.into_glib()); } } @@ -307,7 +307,7 @@ impl Player { #[doc(alias = "gst_player_set_visualization_enabled")] pub fn set_visualization_enabled(&self, enabled: bool) { unsafe { - ffi::gst_player_set_visualization_enabled(self.to_glib_none().0, enabled.to_glib()); + ffi::gst_player_set_visualization_enabled(self.to_glib_none().0, enabled.into_glib()); } } diff --git a/gstreamer-player/src/auto/versions.txt b/gstreamer-player/src/auto/versions.txt index e31790782..47c89fa9e 100644 --- a/gstreamer-player/src/auto/versions.txt +++ b/gstreamer-player/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) diff --git a/gstreamer-player/sys/build.rs b/gstreamer-player/sys/build.rs index c7e114aaa..526a151cd 100644 --- a/gstreamer-player/sys/build.rs +++ b/gstreamer-player/sys/build.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-player/sys/src/lib.rs b/gstreamer-player/sys/src/lib.rs index 275245370..992e78192 100644 --- a/gstreamer-player/sys/src/lib.rs +++ b/gstreamer-player/sys/src/lib.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-player/sys/tests/abi.rs b/gstreamer-player/sys/tests/abi.rs index 9db3e0b55..9018c3fed 100644 --- a/gstreamer-player/sys/tests/abi.rs +++ b/gstreamer-player/sys/tests/abi.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-player/sys/tests/constant.c b/gstreamer-player/sys/tests/constant.c index 270066160..fafbed18b 100644 --- a/gstreamer-player/sys/tests/constant.c +++ b/gstreamer-player/sys/tests/constant.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-player/sys/tests/layout.c b/gstreamer-player/sys/tests/layout.c index fe582e906..b12cd2598 100644 --- a/gstreamer-player/sys/tests/layout.c +++ b/gstreamer-player/sys/tests/layout.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-rtp/src/auto/enums.rs b/gstreamer-rtp/src/auto/enums.rs index 21d54908c..4d9f8b0c2 100644 --- a/gstreamer-rtp/src/auto/enums.rs +++ b/gstreamer-rtp/src/auto/enums.rs @@ -36,11 +36,11 @@ pub enum RTCPFBType { } #[doc(hidden)] -impl ToGlib for RTCPFBType { +impl IntoGlib for RTCPFBType { type GlibType = ffi::GstRTCPFBType; - fn to_glib(&self) -> ffi::GstRTCPFBType { - match *self { + fn into_glib(self) -> ffi::GstRTCPFBType { + match self { RTCPFBType::FbTypeInvalid => ffi::GST_RTCP_FB_TYPE_INVALID, RTCPFBType::RtpfbTypeNack => ffi::GST_RTCP_RTPFB_TYPE_NACK, RTCPFBType::RtpfbTypeTmmbr => ffi::GST_RTCP_RTPFB_TYPE_TMMBR, @@ -97,7 +97,7 @@ impl ToValue for RTCPFBType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -136,11 +136,11 @@ pub enum RTCPSDESType { } #[doc(hidden)] -impl ToGlib for RTCPSDESType { +impl IntoGlib for RTCPSDESType { type GlibType = ffi::GstRTCPSDESType; - fn to_glib(&self) -> ffi::GstRTCPSDESType { - match *self { + fn into_glib(self) -> ffi::GstRTCPSDESType { + match self { RTCPSDESType::Invalid => ffi::GST_RTCP_SDES_INVALID, RTCPSDESType::End => ffi::GST_RTCP_SDES_END, RTCPSDESType::Cname => ffi::GST_RTCP_SDES_CNAME, @@ -199,7 +199,7 @@ impl ToValue for RTCPSDESType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -236,11 +236,11 @@ pub enum RTCPType { } #[doc(hidden)] -impl ToGlib for RTCPType { +impl IntoGlib for RTCPType { type GlibType = ffi::GstRTCPType; - fn to_glib(&self) -> ffi::GstRTCPType { - match *self { + fn into_glib(self) -> ffi::GstRTCPType { + match self { RTCPType::Invalid => ffi::GST_RTCP_TYPE_INVALID, RTCPType::Sr => ffi::GST_RTCP_TYPE_SR, RTCPType::Rr => ffi::GST_RTCP_TYPE_RR, @@ -297,7 +297,7 @@ impl ToValue for RTCPType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -336,11 +336,11 @@ pub enum RTCPXRType { #[cfg(any(feature = "v1_16", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))] #[doc(hidden)] -impl ToGlib for RTCPXRType { +impl IntoGlib for RTCPXRType { type GlibType = ffi::GstRTCPXRType; - fn to_glib(&self) -> ffi::GstRTCPXRType { - match *self { + fn into_glib(self) -> ffi::GstRTCPXRType { + match self { RTCPXRType::Invalid => ffi::GST_RTCP_XR_TYPE_INVALID, RTCPXRType::Lrle => ffi::GST_RTCP_XR_TYPE_LRLE, RTCPXRType::Drle => ffi::GST_RTCP_XR_TYPE_DRLE, @@ -405,7 +405,7 @@ impl ToValue for RTCPXRType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -476,11 +476,11 @@ pub enum RTPPayload { } #[doc(hidden)] -impl ToGlib for RTPPayload { +impl IntoGlib for RTPPayload { type GlibType = ffi::GstRTPPayload; - fn to_glib(&self) -> ffi::GstRTPPayload { - match *self { + fn into_glib(self) -> ffi::GstRTPPayload { + match self { RTPPayload::Pcmu => ffi::GST_RTP_PAYLOAD_PCMU, RTPPayload::_1016 => ffi::GST_RTP_PAYLOAD_1016, RTPPayload::G721 => ffi::GST_RTP_PAYLOAD_G721, @@ -571,7 +571,7 @@ impl ToValue for RTPPayload { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -600,11 +600,11 @@ pub enum RTPProfile { } #[doc(hidden)] -impl ToGlib for RTPProfile { +impl IntoGlib for RTPProfile { type GlibType = ffi::GstRTPProfile; - fn to_glib(&self) -> ffi::GstRTPProfile { - match *self { + fn into_glib(self) -> ffi::GstRTPProfile { + match self { RTPProfile::Unknown => ffi::GST_RTP_PROFILE_UNKNOWN, RTPProfile::Avp => ffi::GST_RTP_PROFILE_AVP, RTPProfile::Savp => ffi::GST_RTP_PROFILE_SAVP, @@ -653,7 +653,7 @@ impl ToValue for RTPProfile { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } diff --git a/gstreamer-rtp/src/auto/flags.rs b/gstreamer-rtp/src/auto/flags.rs index 31c65f622..c82fb70cd 100644 --- a/gstreamer-rtp/src/auto/flags.rs +++ b/gstreamer-rtp/src/auto/flags.rs @@ -22,10 +22,10 @@ bitflags! { #[cfg(any(feature = "v1_10", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] #[doc(hidden)] -impl ToGlib for RTPBufferFlags { +impl IntoGlib for RTPBufferFlags { type GlibType = ffi::GstRTPBufferFlags; - fn to_glib(&self) -> ffi::GstRTPBufferFlags { + fn into_glib(self) -> ffi::GstRTPBufferFlags { self.bits() } } @@ -71,7 +71,7 @@ impl ToValue for RTPBufferFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -88,10 +88,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for RTPBufferMapFlags { +impl IntoGlib for RTPBufferMapFlags { type GlibType = ffi::GstRTPBufferMapFlags; - fn to_glib(&self) -> ffi::GstRTPBufferMapFlags { + fn into_glib(self) -> ffi::GstRTPBufferMapFlags { self.bits() } } @@ -127,7 +127,7 @@ impl ToValue for RTPBufferMapFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } diff --git a/gstreamer-rtp/src/auto/functions.rs b/gstreamer-rtp/src/auto/functions.rs index af4be1940..7b8b87701 100644 --- a/gstreamer-rtp/src/auto/functions.rs +++ b/gstreamer-rtp/src/auto/functions.rs @@ -35,7 +35,7 @@ pub fn rtcp_sdes_name_to_type(name: &str) -> RTCPSDESType { #[doc(alias = "gst_rtcp_sdes_type_to_name")] pub fn rtcp_sdes_type_to_name(type_: RTCPSDESType) -> Option { assert_initialized_main_thread!(); - unsafe { from_glib_none(ffi::gst_rtcp_sdes_type_to_name(type_.to_glib())) } + unsafe { from_glib_none(ffi::gst_rtcp_sdes_type_to_name(type_.into_glib())) } } #[doc(alias = "gst_rtcp_unix_to_ntp")] diff --git a/gstreamer-rtp/src/auto/versions.txt b/gstreamer-rtp/src/auto/versions.txt index e31790782..47c89fa9e 100644 --- a/gstreamer-rtp/src/auto/versions.txt +++ b/gstreamer-rtp/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) diff --git a/gstreamer-rtp/sys/build.rs b/gstreamer-rtp/sys/build.rs index c7e114aaa..526a151cd 100644 --- a/gstreamer-rtp/sys/build.rs +++ b/gstreamer-rtp/sys/build.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-rtp/sys/src/lib.rs b/gstreamer-rtp/sys/src/lib.rs index 5991172d5..7ee48c27c 100644 --- a/gstreamer-rtp/sys/src/lib.rs +++ b/gstreamer-rtp/sys/src/lib.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-rtp/sys/tests/abi.rs b/gstreamer-rtp/sys/tests/abi.rs index e86321df4..3f3cdd78a 100644 --- a/gstreamer-rtp/sys/tests/abi.rs +++ b/gstreamer-rtp/sys/tests/abi.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-rtp/sys/tests/constant.c b/gstreamer-rtp/sys/tests/constant.c index 0d37fe0bb..8f61166bb 100644 --- a/gstreamer-rtp/sys/tests/constant.c +++ b/gstreamer-rtp/sys/tests/constant.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-rtp/sys/tests/layout.c b/gstreamer-rtp/sys/tests/layout.c index 3c9ae73f0..e1907742a 100644 --- a/gstreamer-rtp/sys/tests/layout.c +++ b/gstreamer-rtp/sys/tests/layout.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-rtsp-server/src/auto/enums.rs b/gstreamer-rtsp-server/src/auto/enums.rs index f25a5065b..878d09cf9 100644 --- a/gstreamer-rtsp-server/src/auto/enums.rs +++ b/gstreamer-rtsp-server/src/auto/enums.rs @@ -28,11 +28,11 @@ pub enum RTSPAddressPoolResult { } #[doc(hidden)] -impl ToGlib for RTSPAddressPoolResult { +impl IntoGlib for RTSPAddressPoolResult { type GlibType = ffi::GstRTSPAddressPoolResult; - fn to_glib(&self) -> ffi::GstRTSPAddressPoolResult { - match *self { + fn into_glib(self) -> ffi::GstRTSPAddressPoolResult { + match self { RTSPAddressPoolResult::Ok => ffi::GST_RTSP_ADDRESS_POOL_OK, RTSPAddressPoolResult::Einval => ffi::GST_RTSP_ADDRESS_POOL_EINVAL, RTSPAddressPoolResult::Ereserved => ffi::GST_RTSP_ADDRESS_POOL_ERESERVED, @@ -73,11 +73,11 @@ pub enum RTSPFilterResult { } #[doc(hidden)] -impl ToGlib for RTSPFilterResult { +impl IntoGlib for RTSPFilterResult { type GlibType = ffi::GstRTSPFilterResult; - fn to_glib(&self) -> ffi::GstRTSPFilterResult { - match *self { + fn into_glib(self) -> ffi::GstRTSPFilterResult { + match self { RTSPFilterResult::Remove => ffi::GST_RTSP_FILTER_REMOVE, RTSPFilterResult::Keep => ffi::GST_RTSP_FILTER_KEEP, RTSPFilterResult::Ref => ffi::GST_RTSP_FILTER_REF, @@ -120,11 +120,11 @@ pub enum RTSPMediaStatus { } #[doc(hidden)] -impl ToGlib for RTSPMediaStatus { +impl IntoGlib for RTSPMediaStatus { type GlibType = ffi::GstRTSPMediaStatus; - fn to_glib(&self) -> ffi::GstRTSPMediaStatus { - match *self { + fn into_glib(self) -> ffi::GstRTSPMediaStatus { + match self { RTSPMediaStatus::Unprepared => ffi::GST_RTSP_MEDIA_STATUS_UNPREPARED, RTSPMediaStatus::Unpreparing => ffi::GST_RTSP_MEDIA_STATUS_UNPREPARING, RTSPMediaStatus::Preparing => ffi::GST_RTSP_MEDIA_STATUS_PREPARING, @@ -167,11 +167,11 @@ pub enum RTSPPublishClockMode { } #[doc(hidden)] -impl ToGlib for RTSPPublishClockMode { +impl IntoGlib for RTSPPublishClockMode { type GlibType = ffi::GstRTSPPublishClockMode; - fn to_glib(&self) -> ffi::GstRTSPPublishClockMode { - match *self { + fn into_glib(self) -> ffi::GstRTSPPublishClockMode { + match self { RTSPPublishClockMode::None => ffi::GST_RTSP_PUBLISH_CLOCK_MODE_NONE, RTSPPublishClockMode::Clock => ffi::GST_RTSP_PUBLISH_CLOCK_MODE_CLOCK, RTSPPublishClockMode::ClockAndOffset => { @@ -218,7 +218,7 @@ impl ToValue for RTSPPublishClockMode { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -243,11 +243,11 @@ pub enum RTSPSuspendMode { } #[doc(hidden)] -impl ToGlib for RTSPSuspendMode { +impl IntoGlib for RTSPSuspendMode { type GlibType = ffi::GstRTSPSuspendMode; - fn to_glib(&self) -> ffi::GstRTSPSuspendMode { - match *self { + fn into_glib(self) -> ffi::GstRTSPSuspendMode { + match self { RTSPSuspendMode::None => ffi::GST_RTSP_SUSPEND_MODE_NONE, RTSPSuspendMode::Pause => ffi::GST_RTSP_SUSPEND_MODE_PAUSE, RTSPSuspendMode::Reset => ffi::GST_RTSP_SUSPEND_MODE_RESET, @@ -292,7 +292,7 @@ impl ToValue for RTSPSuspendMode { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -315,11 +315,11 @@ pub enum RTSPThreadType { } #[doc(hidden)] -impl ToGlib for RTSPThreadType { +impl IntoGlib for RTSPThreadType { type GlibType = ffi::GstRTSPThreadType; - fn to_glib(&self) -> ffi::GstRTSPThreadType { - match *self { + fn into_glib(self) -> ffi::GstRTSPThreadType { + match self { RTSPThreadType::Client => ffi::GST_RTSP_THREAD_TYPE_CLIENT, RTSPThreadType::Media => ffi::GST_RTSP_THREAD_TYPE_MEDIA, RTSPThreadType::__Unknown(value) => value, diff --git a/gstreamer-rtsp-server/src/auto/flags.rs b/gstreamer-rtsp-server/src/auto/flags.rs index 3b54f83af..680384b47 100644 --- a/gstreamer-rtsp-server/src/auto/flags.rs +++ b/gstreamer-rtsp-server/src/auto/flags.rs @@ -21,10 +21,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for RTSPAddressFlags { +impl IntoGlib for RTSPAddressFlags { type GlibType = ffi::GstRTSPAddressFlags; - fn to_glib(&self) -> ffi::GstRTSPAddressFlags { + fn into_glib(self) -> ffi::GstRTSPAddressFlags { self.bits() } } @@ -45,10 +45,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for RTSPTransportMode { +impl IntoGlib for RTSPTransportMode { type GlibType = ffi::GstRTSPTransportMode; - fn to_glib(&self) -> ffi::GstRTSPTransportMode { + fn into_glib(self) -> ffi::GstRTSPTransportMode { self.bits() } } @@ -84,7 +84,7 @@ impl ToValue for RTSPTransportMode { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } diff --git a/gstreamer-rtsp-server/src/auto/rtsp_address_pool.rs b/gstreamer-rtsp-server/src/auto/rtsp_address_pool.rs index 7f18a6ca9..dfbf8cefc 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_address_pool.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_address_pool.rs @@ -72,7 +72,7 @@ impl> RTSPAddressPoolExt for O { unsafe { Option::<_>::from_glib_full(ffi::gst_rtsp_address_pool_acquire_address( self.as_ref().to_glib_none().0, - flags.to_glib(), + flags.into_glib(), n_ports, )) .ok_or_else(|| glib::bool_error!("Failed to acquire address")) diff --git a/gstreamer-rtsp-server/src/auto/rtsp_auth.rs b/gstreamer-rtsp-server/src/auto/rtsp_auth.rs index aca13ea52..f8220e6fd 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_auth.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_auth.rs @@ -247,7 +247,7 @@ impl> RTSPAuthExt for O { unsafe { ffi::gst_rtsp_auth_set_supported_methods( self.as_ref().to_glib_none().0, - methods.to_glib(), + methods.into_glib(), ); } } @@ -256,7 +256,7 @@ impl> RTSPAuthExt for O { unsafe { ffi::gst_rtsp_auth_set_tls_authentication_mode( self.as_ref().to_glib_none().0, - mode.to_glib(), + mode.into_glib(), ); } } @@ -311,7 +311,7 @@ impl> RTSPAuthExt for O { &from_glib_borrow(peer_cert), from_glib(errors), ) - .to_glib() + .into_glib() } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-rtsp-server/src/auto/rtsp_client.rs b/gstreamer-rtsp-server/src/auto/rtsp_client.rs index 51d128f27..0c0b31445 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_client.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_client.rs @@ -398,7 +398,7 @@ impl> RTSPClientExt for O { } else { panic!("cannot get closure...") }; - res.to_glib() + res.into_glib() } let func = if func_data.is_some() { Some(func_func as _) @@ -838,7 +838,7 @@ impl> RTSPClientExt for O { &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) - .to_glib() + .into_glib() } unsafe { let f: Box_ = Box_::new(f); @@ -877,7 +877,7 @@ impl> RTSPClientExt for O { &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) - .to_glib() + .into_glib() } unsafe { let f: Box_ = Box_::new(f); @@ -916,7 +916,7 @@ impl> RTSPClientExt for O { &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) - .to_glib() + .into_glib() } unsafe { let f: Box_ = Box_::new(f); @@ -955,7 +955,7 @@ impl> RTSPClientExt for O { &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) - .to_glib() + .into_glib() } unsafe { let f: Box_ = Box_::new(f); @@ -994,7 +994,7 @@ impl> RTSPClientExt for O { &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) - .to_glib() + .into_glib() } unsafe { let f: Box_ = Box_::new(f); @@ -1033,7 +1033,7 @@ impl> RTSPClientExt for O { &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) - .to_glib() + .into_glib() } unsafe { let f: Box_ = Box_::new(f); @@ -1072,7 +1072,7 @@ impl> RTSPClientExt for O { &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) - .to_glib() + .into_glib() } unsafe { let f: Box_ = Box_::new(f); @@ -1111,7 +1111,7 @@ impl> RTSPClientExt for O { &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) - .to_glib() + .into_glib() } unsafe { let f: Box_ = Box_::new(f); @@ -1150,7 +1150,7 @@ impl> RTSPClientExt for O { &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) - .to_glib() + .into_glib() } unsafe { let f: Box_ = Box_::new(f); @@ -1189,7 +1189,7 @@ impl> RTSPClientExt for O { &RTSPClient::from_glib_borrow(this).unsafe_cast_ref(), &from_glib_borrow(ctx), ) - .to_glib() + .into_glib() } unsafe { let f: Box_ = Box_::new(f); diff --git a/gstreamer-rtsp-server/src/auto/rtsp_media.rs b/gstreamer-rtsp-server/src/auto/rtsp_media.rs index c6536ae78..3ba84a317 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_media.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_media.rs @@ -555,8 +555,8 @@ impl> RTSPMediaExt for O { unsafe { from_glib_full(ffi::gst_rtsp_media_get_range_string( self.as_ref().to_glib_none().0, - play.to_glib(), - unit.to_glib(), + play.into_glib(), + unit.into_glib(), )) } } @@ -769,7 +769,7 @@ impl> RTSPMediaExt for O { unsafe { ffi::gst_rtsp_media_set_bind_mcast_address( self.as_ref().to_glib_none().0, - bind_mcast_addr.to_glib(), + bind_mcast_addr.into_glib(), ); } } @@ -795,7 +795,7 @@ impl> RTSPMediaExt for O { unsafe { ffi::gst_rtsp_media_set_do_retransmission( self.as_ref().to_glib_none().0, - do_retransmission.to_glib(), + do_retransmission.into_glib(), ); } } @@ -812,7 +812,7 @@ impl> RTSPMediaExt for O { unsafe { ffi::gst_rtsp_media_set_eos_shutdown( self.as_ref().to_glib_none().0, - eos_shutdown.to_glib(), + eos_shutdown.into_glib(), ); } } @@ -849,19 +849,25 @@ impl> RTSPMediaExt for O { fn set_pipeline_state(&self, state: gst::State) { unsafe { - ffi::gst_rtsp_media_set_pipeline_state(self.as_ref().to_glib_none().0, state.to_glib()); + ffi::gst_rtsp_media_set_pipeline_state( + self.as_ref().to_glib_none().0, + state.into_glib(), + ); } } fn set_profiles(&self, profiles: gst_rtsp::RTSPProfile) { unsafe { - ffi::gst_rtsp_media_set_profiles(self.as_ref().to_glib_none().0, profiles.to_glib()); + ffi::gst_rtsp_media_set_profiles(self.as_ref().to_glib_none().0, profiles.into_glib()); } } fn set_protocols(&self, protocols: gst_rtsp::RTSPLowerTrans) { unsafe { - ffi::gst_rtsp_media_set_protocols(self.as_ref().to_glib_none().0, protocols.to_glib()); + ffi::gst_rtsp_media_set_protocols( + self.as_ref().to_glib_none().0, + protocols.into_glib(), + ); } } @@ -869,7 +875,7 @@ impl> RTSPMediaExt for O { unsafe { ffi::gst_rtsp_media_set_publish_clock_mode( self.as_ref().to_glib_none().0, - mode.to_glib(), + mode.into_glib(), ); } } @@ -878,7 +884,10 @@ impl> RTSPMediaExt for O { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] fn set_rate_control(&self, enabled: bool) { unsafe { - ffi::gst_rtsp_media_set_rate_control(self.as_ref().to_glib_none().0, enabled.to_glib()); + ffi::gst_rtsp_media_set_rate_control( + self.as_ref().to_glib_none().0, + enabled.into_glib(), + ); } } @@ -886,20 +895,20 @@ impl> RTSPMediaExt for O { unsafe { ffi::gst_rtsp_media_set_retransmission_time( self.as_ref().to_glib_none().0, - time.to_glib(), + time.into_glib(), ); } } fn set_reusable(&self, reusable: bool) { unsafe { - ffi::gst_rtsp_media_set_reusable(self.as_ref().to_glib_none().0, reusable.to_glib()); + ffi::gst_rtsp_media_set_reusable(self.as_ref().to_glib_none().0, reusable.into_glib()); } } fn set_shared(&self, shared: bool) { unsafe { - ffi::gst_rtsp_media_set_shared(self.as_ref().to_glib_none().0, shared.to_glib()); + ffi::gst_rtsp_media_set_shared(self.as_ref().to_glib_none().0, shared.into_glib()); } } @@ -907,7 +916,7 @@ impl> RTSPMediaExt for O { unsafe { from_glib(ffi::gst_rtsp_media_set_state( self.as_ref().to_glib_none().0, - state.to_glib(), + state.into_glib(), transports.to_glib_none().0, )) } @@ -917,20 +926,23 @@ impl> RTSPMediaExt for O { unsafe { ffi::gst_rtsp_media_set_stop_on_disconnect( self.as_ref().to_glib_none().0, - stop_on_disconnect.to_glib(), + stop_on_disconnect.into_glib(), ); } } fn set_suspend_mode(&self, mode: RTSPSuspendMode) { unsafe { - ffi::gst_rtsp_media_set_suspend_mode(self.as_ref().to_glib_none().0, mode.to_glib()); + ffi::gst_rtsp_media_set_suspend_mode(self.as_ref().to_glib_none().0, mode.into_glib()); } } fn set_transport_mode(&self, mode: RTSPTransportMode) { unsafe { - ffi::gst_rtsp_media_set_transport_mode(self.as_ref().to_glib_none().0, mode.to_glib()); + ffi::gst_rtsp_media_set_transport_mode( + self.as_ref().to_glib_none().0, + mode.into_glib(), + ); } } @@ -977,7 +989,7 @@ impl> RTSPMediaExt for O { unsafe { ffi::gst_rtsp_media_use_time_provider( self.as_ref().to_glib_none().0, - time_provider.to_glib(), + time_provider.into_glib(), ); } } diff --git a/gstreamer-rtsp-server/src/auto/rtsp_media_factory.rs b/gstreamer-rtsp-server/src/auto/rtsp_media_factory.rs index 083595558..65cda552d 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_media_factory.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_media_factory.rs @@ -489,7 +489,7 @@ impl> RTSPMediaFactoryExt for O { unsafe { ffi::gst_rtsp_media_factory_set_bind_mcast_address( self.as_ref().to_glib_none().0, - bind_mcast_addr.to_glib(), + bind_mcast_addr.into_glib(), ); } } @@ -515,7 +515,7 @@ impl> RTSPMediaFactoryExt for O { unsafe { ffi::gst_rtsp_media_factory_set_do_retransmission( self.as_ref().to_glib_none().0, - do_retransmission.to_glib(), + do_retransmission.into_glib(), ); } } @@ -532,7 +532,7 @@ impl> RTSPMediaFactoryExt for O { unsafe { ffi::gst_rtsp_media_factory_set_eos_shutdown( self.as_ref().to_glib_none().0, - eos_shutdown.to_glib(), + eos_shutdown.into_glib(), ); } } @@ -567,7 +567,7 @@ impl> RTSPMediaFactoryExt for O { unsafe { ffi::gst_rtsp_media_factory_set_media_gtype( self.as_ref().to_glib_none().0, - media_gtype.to_glib(), + media_gtype.into_glib(), ); } } @@ -589,7 +589,7 @@ impl> RTSPMediaFactoryExt for O { unsafe { ffi::gst_rtsp_media_factory_set_profiles( self.as_ref().to_glib_none().0, - profiles.to_glib(), + profiles.into_glib(), ); } } @@ -598,7 +598,7 @@ impl> RTSPMediaFactoryExt for O { unsafe { ffi::gst_rtsp_media_factory_set_protocols( self.as_ref().to_glib_none().0, - protocols.to_glib(), + protocols.into_glib(), ); } } @@ -607,7 +607,7 @@ impl> RTSPMediaFactoryExt for O { unsafe { ffi::gst_rtsp_media_factory_set_publish_clock_mode( self.as_ref().to_glib_none().0, - mode.to_glib(), + mode.into_glib(), ); } } @@ -616,7 +616,7 @@ impl> RTSPMediaFactoryExt for O { unsafe { ffi::gst_rtsp_media_factory_set_retransmission_time( self.as_ref().to_glib_none().0, - time.to_glib(), + time.into_glib(), ); } } @@ -625,7 +625,7 @@ impl> RTSPMediaFactoryExt for O { unsafe { ffi::gst_rtsp_media_factory_set_shared( self.as_ref().to_glib_none().0, - shared.to_glib(), + shared.into_glib(), ); } } @@ -634,7 +634,7 @@ impl> RTSPMediaFactoryExt for O { unsafe { ffi::gst_rtsp_media_factory_set_stop_on_disconnect( self.as_ref().to_glib_none().0, - stop_on_disconnect.to_glib(), + stop_on_disconnect.into_glib(), ); } } @@ -643,7 +643,7 @@ impl> RTSPMediaFactoryExt for O { unsafe { ffi::gst_rtsp_media_factory_set_suspend_mode( self.as_ref().to_glib_none().0, - mode.to_glib(), + mode.into_glib(), ); } } @@ -652,7 +652,7 @@ impl> RTSPMediaFactoryExt for O { unsafe { ffi::gst_rtsp_media_factory_set_transport_mode( self.as_ref().to_glib_none().0, - mode.to_glib(), + mode.into_glib(), ); } } diff --git a/gstreamer-rtsp-server/src/auto/rtsp_server.rs b/gstreamer-rtsp-server/src/auto/rtsp_server.rs index 3ef1545c6..71b67a19a 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_server.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_server.rs @@ -46,7 +46,7 @@ impl RTSPServer { glib::result_from_gboolean!( ffi::gst_rtsp_server_io_func( socket.as_ref().to_glib_none().0, - condition.to_glib(), + condition.into_glib(), server.as_ref().to_glib_none().0 ), "Failed to connect the source" @@ -217,7 +217,7 @@ impl> RTSPServerExt for O { } else { panic!("cannot get closure...") }; - res.to_glib() + res.into_glib() } let func = if func_data.is_some() { Some(func_func as _) diff --git a/gstreamer-rtsp-server/src/auto/rtsp_session.rs b/gstreamer-rtsp-server/src/auto/rtsp_session.rs index e22d8f54f..ca1efac43 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_session.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_session.rs @@ -151,7 +151,7 @@ impl> RTSPSessionExt for O { } else { panic!("cannot get closure...") }; - res.to_glib() + res.into_glib() } let func = if func_data.is_some() { Some(func_func as _) diff --git a/gstreamer-rtsp-server/src/auto/rtsp_session_media.rs b/gstreamer-rtsp-server/src/auto/rtsp_session_media.rs index 704c56252..f876a5226 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_session_media.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_session_media.rs @@ -150,7 +150,7 @@ impl> RTSPSessionMediaExt for O { glib::result_from_gboolean!( ffi::gst_rtsp_session_media_set_state( self.as_ref().to_glib_none().0, - state.to_glib() + state.into_glib() ), "Failed to set state of session media" ) diff --git a/gstreamer-rtsp-server/src/auto/rtsp_session_pool.rs b/gstreamer-rtsp-server/src/auto/rtsp_session_pool.rs index a70615935..758ec5691 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_session_pool.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_session_pool.rs @@ -118,7 +118,7 @@ impl> RTSPSessionPoolExt for O { } else { panic!("cannot get closure...") }; - res.to_glib() + res.into_glib() } let func = if func_data.is_some() { Some(func_func as _) diff --git a/gstreamer-rtsp-server/src/auto/rtsp_stream.rs b/gstreamer-rtsp-server/src/auto/rtsp_stream.rs index 3d6f64b3b..5f177dc9f 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_stream.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_stream.rs @@ -425,7 +425,7 @@ impl> RTSPStreamExt for O { destination.to_glib_none().0, rtp_port, rtcp_port, - family.to_glib(), + family.into_glib(), )) } } @@ -517,7 +517,7 @@ impl> RTSPStreamExt for O { unsafe { from_glib_full(ffi::gst_rtsp_stream_get_multicast_address( self.as_ref().to_glib_none().0, - family.to_glib(), + family.into_glib(), )) } } @@ -617,7 +617,7 @@ impl> RTSPStreamExt for O { unsafe { from_glib_full(ffi::gst_rtsp_stream_get_rtcp_multicast_socket( self.as_ref().to_glib_none().0, - family.to_glib(), + family.into_glib(), )) } } @@ -626,7 +626,7 @@ impl> RTSPStreamExt for O { unsafe { from_glib_full(ffi::gst_rtsp_stream_get_rtcp_socket( self.as_ref().to_glib_none().0, - family.to_glib(), + family.into_glib(), )) } } @@ -635,7 +635,7 @@ impl> RTSPStreamExt for O { unsafe { from_glib_full(ffi::gst_rtsp_stream_get_rtp_multicast_socket( self.as_ref().to_glib_none().0, - family.to_glib(), + family.into_glib(), )) } } @@ -644,7 +644,7 @@ impl> RTSPStreamExt for O { unsafe { from_glib_full(ffi::gst_rtsp_stream_get_rtp_socket( self.as_ref().to_glib_none().0, - family.to_glib(), + family.into_glib(), )) } } @@ -831,7 +831,7 @@ impl> RTSPStreamExt for O { self.as_ref().to_glib_none().0, bin.as_ref().to_glib_none().0, rtpbin.as_ref().to_glib_none().0, - state.to_glib() + state.into_glib() ), "Failed to join bin" ) @@ -960,7 +960,7 @@ impl> RTSPStreamExt for O { unsafe { ffi::gst_rtsp_stream_set_bind_mcast_address( self.as_ref().to_glib_none().0, - bind_mcast_addr.to_glib(), + bind_mcast_addr.into_glib(), ); } } @@ -968,7 +968,10 @@ impl> RTSPStreamExt for O { fn set_blocked(&self, blocked: bool) -> Result<(), glib::error::BoolError> { unsafe { glib::result_from_gboolean!( - ffi::gst_rtsp_stream_set_blocked(self.as_ref().to_glib_none().0, blocked.to_glib()), + ffi::gst_rtsp_stream_set_blocked( + self.as_ref().to_glib_none().0, + blocked.into_glib() + ), "Failed to block/unblock the dataflow" ) } @@ -984,7 +987,7 @@ impl> RTSPStreamExt for O { unsafe { ffi::gst_rtsp_stream_set_client_side( self.as_ref().to_glib_none().0, - client_side.to_glib(), + client_side.into_glib(), ); } } @@ -1032,13 +1035,16 @@ impl> RTSPStreamExt for O { fn set_profiles(&self, profiles: gst_rtsp::RTSPProfile) { unsafe { - ffi::gst_rtsp_stream_set_profiles(self.as_ref().to_glib_none().0, profiles.to_glib()); + ffi::gst_rtsp_stream_set_profiles(self.as_ref().to_glib_none().0, profiles.into_glib()); } } fn set_protocols(&self, protocols: gst_rtsp::RTSPLowerTrans) { unsafe { - ffi::gst_rtsp_stream_set_protocols(self.as_ref().to_glib_none().0, protocols.to_glib()); + ffi::gst_rtsp_stream_set_protocols( + self.as_ref().to_glib_none().0, + protocols.into_glib(), + ); } } @@ -1056,7 +1062,7 @@ impl> RTSPStreamExt for O { unsafe { ffi::gst_rtsp_stream_set_publish_clock_mode( self.as_ref().to_glib_none().0, - mode.to_glib(), + mode.into_glib(), ); } } @@ -1067,7 +1073,7 @@ impl> RTSPStreamExt for O { unsafe { ffi::gst_rtsp_stream_set_rate_control( self.as_ref().to_glib_none().0, - enabled.to_glib(), + enabled.into_glib(), ); } } @@ -1082,7 +1088,7 @@ impl> RTSPStreamExt for O { unsafe { ffi::gst_rtsp_stream_set_retransmission_time( self.as_ref().to_glib_none().0, - time.to_glib(), + time.into_glib(), ); } } @@ -1134,7 +1140,7 @@ impl> RTSPStreamExt for O { } else { panic!("cannot get closure...") }; - res.to_glib() + res.into_glib() } let func = if func_data.is_some() { Some(func_func as _) diff --git a/gstreamer-rtsp-server/src/auto/rtsp_stream_transport.rs b/gstreamer-rtsp-server/src/auto/rtsp_stream_transport.rs index 099569001..7aa8fd820 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_stream_transport.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_stream_transport.rs @@ -102,7 +102,7 @@ impl> RTSPStreamTransportExt for O { unsafe { from_glib_full(ffi::gst_rtsp_stream_transport_get_rtpinfo( self.as_ref().to_glib_none().0, - start_time.to_glib(), + start_time.into_glib(), )) } } @@ -190,7 +190,7 @@ impl> RTSPStreamTransportExt for O { glib::result_from_gboolean!( ffi::gst_rtsp_stream_transport_set_active( self.as_ref().to_glib_none().0, - active.to_glib() + active.into_glib() ), "Failed to set active" ) @@ -285,7 +285,7 @@ impl> RTSPStreamTransportExt for O { unsafe { ffi::gst_rtsp_stream_transport_set_timed_out( self.as_ref().to_glib_none().0, - timedout.to_glib(), + timedout.into_glib(), ); } } diff --git a/gstreamer-rtsp-server/src/auto/rtsp_thread_pool.rs b/gstreamer-rtsp-server/src/auto/rtsp_thread_pool.rs index b55066026..25d71208b 100644 --- a/gstreamer-rtsp-server/src/auto/rtsp_thread_pool.rs +++ b/gstreamer-rtsp-server/src/auto/rtsp_thread_pool.rs @@ -74,7 +74,7 @@ impl> RTSPThreadPoolExt for O { unsafe { from_glib_full(ffi::gst_rtsp_thread_pool_get_thread( self.as_ref().to_glib_none().0, - type_.to_glib(), + type_.into_glib(), ctx.to_glib_none().0, )) } diff --git a/gstreamer-rtsp-server/src/auto/versions.txt b/gstreamer-rtsp-server/src/auto/versions.txt index e31790782..47c89fa9e 100644 --- a/gstreamer-rtsp-server/src/auto/versions.txt +++ b/gstreamer-rtsp-server/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) diff --git a/gstreamer-rtsp-server/sys/build.rs b/gstreamer-rtsp-server/sys/build.rs index c7e114aaa..526a151cd 100644 --- a/gstreamer-rtsp-server/sys/build.rs +++ b/gstreamer-rtsp-server/sys/build.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-rtsp-server/sys/src/lib.rs b/gstreamer-rtsp-server/sys/src/lib.rs index 5860641b7..150246b32 100644 --- a/gstreamer-rtsp-server/sys/src/lib.rs +++ b/gstreamer-rtsp-server/sys/src/lib.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-rtsp-server/sys/tests/abi.rs b/gstreamer-rtsp-server/sys/tests/abi.rs index db0ebea4c..16cfe1818 100644 --- a/gstreamer-rtsp-server/sys/tests/abi.rs +++ b/gstreamer-rtsp-server/sys/tests/abi.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-rtsp-server/sys/tests/constant.c b/gstreamer-rtsp-server/sys/tests/constant.c index c78459570..770fdc1ea 100644 --- a/gstreamer-rtsp-server/sys/tests/constant.c +++ b/gstreamer-rtsp-server/sys/tests/constant.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-rtsp-server/sys/tests/layout.c b/gstreamer-rtsp-server/sys/tests/layout.c index 74b5ecaaa..ed3e17407 100644 --- a/gstreamer-rtsp-server/sys/tests/layout.c +++ b/gstreamer-rtsp-server/sys/tests/layout.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-rtsp/src/auto/enums.rs b/gstreamer-rtsp/src/auto/enums.rs index b08045805..124da741b 100644 --- a/gstreamer-rtsp/src/auto/enums.rs +++ b/gstreamer-rtsp/src/auto/enums.rs @@ -24,11 +24,11 @@ pub enum RTSPAuthMethod { } #[doc(hidden)] -impl ToGlib for RTSPAuthMethod { +impl IntoGlib for RTSPAuthMethod { type GlibType = ffi::GstRTSPAuthMethod; - fn to_glib(&self) -> ffi::GstRTSPAuthMethod { - match *self { + fn into_glib(self) -> ffi::GstRTSPAuthMethod { + match self { RTSPAuthMethod::None => ffi::GST_RTSP_AUTH_NONE, RTSPAuthMethod::Basic => ffi::GST_RTSP_AUTH_BASIC, RTSPAuthMethod::Digest => ffi::GST_RTSP_AUTH_DIGEST, @@ -73,7 +73,7 @@ impl ToValue for RTSPAuthMethod { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -98,11 +98,11 @@ pub enum RTSPFamily { } #[doc(hidden)] -impl ToGlib for RTSPFamily { +impl IntoGlib for RTSPFamily { type GlibType = ffi::GstRTSPFamily; - fn to_glib(&self) -> ffi::GstRTSPFamily { - match *self { + fn into_glib(self) -> ffi::GstRTSPFamily { + match self { RTSPFamily::None => ffi::GST_RTSP_FAM_NONE, RTSPFamily::Inet => ffi::GST_RTSP_FAM_INET, RTSPFamily::Inet6 => ffi::GST_RTSP_FAM_INET6, @@ -147,7 +147,7 @@ impl ToValue for RTSPFamily { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -346,11 +346,11 @@ pub enum RTSPHeaderField { } #[doc(hidden)] -impl ToGlib for RTSPHeaderField { +impl IntoGlib for RTSPHeaderField { type GlibType = ffi::GstRTSPHeaderField; - fn to_glib(&self) -> ffi::GstRTSPHeaderField { - match *self { + fn into_glib(self) -> ffi::GstRTSPHeaderField { + match self { RTSPHeaderField::Invalid => ffi::GST_RTSP_HDR_INVALID, RTSPHeaderField::Accept => ffi::GST_RTSP_HDR_ACCEPT, RTSPHeaderField::AcceptEncoding => ffi::GST_RTSP_HDR_ACCEPT_ENCODING, @@ -569,7 +569,7 @@ impl ToValue for RTSPHeaderField { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -600,11 +600,11 @@ pub enum RTSPMsgType { } #[doc(hidden)] -impl ToGlib for RTSPMsgType { +impl IntoGlib for RTSPMsgType { type GlibType = ffi::GstRTSPMsgType; - fn to_glib(&self) -> ffi::GstRTSPMsgType { - match *self { + fn into_glib(self) -> ffi::GstRTSPMsgType { + match self { RTSPMsgType::Invalid => ffi::GST_RTSP_MESSAGE_INVALID, RTSPMsgType::Request => ffi::GST_RTSP_MESSAGE_REQUEST, RTSPMsgType::Response => ffi::GST_RTSP_MESSAGE_RESPONSE, @@ -655,7 +655,7 @@ impl ToValue for RTSPMsgType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -684,11 +684,11 @@ pub enum RTSPRangeUnit { } #[doc(hidden)] -impl ToGlib for RTSPRangeUnit { +impl IntoGlib for RTSPRangeUnit { type GlibType = ffi::GstRTSPRangeUnit; - fn to_glib(&self) -> ffi::GstRTSPRangeUnit { - match *self { + fn into_glib(self) -> ffi::GstRTSPRangeUnit { + match self { RTSPRangeUnit::Smpte => ffi::GST_RTSP_RANGE_SMPTE, RTSPRangeUnit::Smpte30Drop => ffi::GST_RTSP_RANGE_SMPTE_30_DROP, RTSPRangeUnit::Smpte25 => ffi::GST_RTSP_RANGE_SMPTE_25, @@ -737,7 +737,7 @@ impl ToValue for RTSPRangeUnit { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -792,11 +792,11 @@ pub enum RTSPResult { } #[doc(hidden)] -impl ToGlib for RTSPResult { +impl IntoGlib for RTSPResult { type GlibType = ffi::GstRTSPResult; - fn to_glib(&self) -> ffi::GstRTSPResult { - match *self { + fn into_glib(self) -> ffi::GstRTSPResult { + match self { RTSPResult::Ok => ffi::GST_RTSP_OK, RTSPResult::Error => ffi::GST_RTSP_ERROR, RTSPResult::Einval => ffi::GST_RTSP_EINVAL, @@ -871,7 +871,7 @@ impl ToValue for RTSPResult { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -902,11 +902,11 @@ pub enum RTSPState { } #[doc(hidden)] -impl ToGlib for RTSPState { +impl IntoGlib for RTSPState { type GlibType = ffi::GstRTSPState; - fn to_glib(&self) -> ffi::GstRTSPState { - match *self { + fn into_glib(self) -> ffi::GstRTSPState { + match self { RTSPState::Invalid => ffi::GST_RTSP_STATE_INVALID, RTSPState::Init => ffi::GST_RTSP_STATE_INIT, RTSPState::Ready => ffi::GST_RTSP_STATE_READY, @@ -957,7 +957,7 @@ impl ToValue for RTSPState { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1068,11 +1068,11 @@ pub enum RTSPStatusCode { } #[doc(hidden)] -impl ToGlib for RTSPStatusCode { +impl IntoGlib for RTSPStatusCode { type GlibType = ffi::GstRTSPStatusCode; - fn to_glib(&self) -> ffi::GstRTSPStatusCode { - match *self { + fn into_glib(self) -> ffi::GstRTSPStatusCode { + match self { RTSPStatusCode::Invalid => ffi::GST_RTSP_STS_INVALID, RTSPStatusCode::Continue => ffi::GST_RTSP_STS_CONTINUE, RTSPStatusCode::Ok => ffi::GST_RTSP_STS_OK, @@ -1211,7 +1211,7 @@ impl ToValue for RTSPStatusCode { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1240,11 +1240,11 @@ pub enum RTSPTimeType { } #[doc(hidden)] -impl ToGlib for RTSPTimeType { +impl IntoGlib for RTSPTimeType { type GlibType = ffi::GstRTSPTimeType; - fn to_glib(&self) -> ffi::GstRTSPTimeType { - match *self { + fn into_glib(self) -> ffi::GstRTSPTimeType { + match self { RTSPTimeType::Seconds => ffi::GST_RTSP_TIME_SECONDS, RTSPTimeType::Now => ffi::GST_RTSP_TIME_NOW, RTSPTimeType::End => ffi::GST_RTSP_TIME_END, @@ -1293,7 +1293,7 @@ impl ToValue for RTSPTimeType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } diff --git a/gstreamer-rtsp/src/auto/flags.rs b/gstreamer-rtsp/src/auto/flags.rs index b18445079..e4db0f043 100644 --- a/gstreamer-rtsp/src/auto/flags.rs +++ b/gstreamer-rtsp/src/auto/flags.rs @@ -18,10 +18,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for RTSPEvent { +impl IntoGlib for RTSPEvent { type GlibType = ffi::GstRTSPEvent; - fn to_glib(&self) -> ffi::GstRTSPEvent { + fn into_glib(self) -> ffi::GstRTSPEvent { self.bits() } } @@ -57,7 +57,7 @@ impl ToValue for RTSPEvent { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -78,10 +78,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for RTSPLowerTrans { +impl IntoGlib for RTSPLowerTrans { type GlibType = ffi::GstRTSPLowerTrans; - fn to_glib(&self) -> ffi::GstRTSPLowerTrans { + fn into_glib(self) -> ffi::GstRTSPLowerTrans { self.bits() } } @@ -117,7 +117,7 @@ impl ToValue for RTSPLowerTrans { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -149,15 +149,15 @@ impl RTSPMethod { #[doc(alias = "gst_rtsp_method_as_text")] pub fn as_text(self) -> Option { assert_initialized_main_thread!(); - unsafe { from_glib_none(ffi::gst_rtsp_method_as_text(self.to_glib())) } + unsafe { from_glib_none(ffi::gst_rtsp_method_as_text(self.into_glib())) } } } #[doc(hidden)] -impl ToGlib for RTSPMethod { +impl IntoGlib for RTSPMethod { type GlibType = ffi::GstRTSPMethod; - fn to_glib(&self) -> ffi::GstRTSPMethod { + fn into_glib(self) -> ffi::GstRTSPMethod { self.bits() } } @@ -193,7 +193,7 @@ impl ToValue for RTSPMethod { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -213,10 +213,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for RTSPProfile { +impl IntoGlib for RTSPProfile { type GlibType = ffi::GstRTSPProfile; - fn to_glib(&self) -> ffi::GstRTSPProfile { + fn into_glib(self) -> ffi::GstRTSPProfile { self.bits() } } @@ -252,7 +252,7 @@ impl ToValue for RTSPProfile { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -270,10 +270,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for RTSPTransMode { +impl IntoGlib for RTSPTransMode { type GlibType = ffi::GstRTSPTransMode; - fn to_glib(&self) -> ffi::GstRTSPTransMode { + fn into_glib(self) -> ffi::GstRTSPTransMode { self.bits() } } @@ -309,7 +309,7 @@ impl ToValue for RTSPTransMode { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } diff --git a/gstreamer-rtsp/src/auto/versions.txt b/gstreamer-rtsp/src/auto/versions.txt index e31790782..47c89fa9e 100644 --- a/gstreamer-rtsp/src/auto/versions.txt +++ b/gstreamer-rtsp/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) diff --git a/gstreamer-rtsp/sys/build.rs b/gstreamer-rtsp/sys/build.rs index c7e114aaa..526a151cd 100644 --- a/gstreamer-rtsp/sys/build.rs +++ b/gstreamer-rtsp/sys/build.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-rtsp/sys/src/lib.rs b/gstreamer-rtsp/sys/src/lib.rs index 48b8c7373..1589abd72 100644 --- a/gstreamer-rtsp/sys/src/lib.rs +++ b/gstreamer-rtsp/sys/src/lib.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-rtsp/sys/tests/abi.rs b/gstreamer-rtsp/sys/tests/abi.rs index 7641cd320..c7a3d1b26 100644 --- a/gstreamer-rtsp/sys/tests/abi.rs +++ b/gstreamer-rtsp/sys/tests/abi.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-rtsp/sys/tests/constant.c b/gstreamer-rtsp/sys/tests/constant.c index 92c5bdb37..f43b204b9 100644 --- a/gstreamer-rtsp/sys/tests/constant.c +++ b/gstreamer-rtsp/sys/tests/constant.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-rtsp/sys/tests/layout.c b/gstreamer-rtsp/sys/tests/layout.c index bee463da0..cbffd2c82 100644 --- a/gstreamer-rtsp/sys/tests/layout.c +++ b/gstreamer-rtsp/sys/tests/layout.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-sdp/src/auto/versions.txt b/gstreamer-sdp/src/auto/versions.txt index e31790782..47c89fa9e 100644 --- a/gstreamer-sdp/src/auto/versions.txt +++ b/gstreamer-sdp/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) diff --git a/gstreamer-sdp/sys/build.rs b/gstreamer-sdp/sys/build.rs index c7e114aaa..526a151cd 100644 --- a/gstreamer-sdp/sys/build.rs +++ b/gstreamer-sdp/sys/build.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-sdp/sys/src/lib.rs b/gstreamer-sdp/sys/src/lib.rs index e8990ff7b..74607be83 100644 --- a/gstreamer-sdp/sys/src/lib.rs +++ b/gstreamer-sdp/sys/src/lib.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-sdp/sys/tests/abi.rs b/gstreamer-sdp/sys/tests/abi.rs index d5aaf27bf..eb20a8d4f 100644 --- a/gstreamer-sdp/sys/tests/abi.rs +++ b/gstreamer-sdp/sys/tests/abi.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-sdp/sys/tests/constant.c b/gstreamer-sdp/sys/tests/constant.c index d057821ef..7507d0703 100644 --- a/gstreamer-sdp/sys/tests/constant.c +++ b/gstreamer-sdp/sys/tests/constant.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-sdp/sys/tests/layout.c b/gstreamer-sdp/sys/tests/layout.c index cf097b96a..157dbc2d6 100644 --- a/gstreamer-sdp/sys/tests/layout.c +++ b/gstreamer-sdp/sys/tests/layout.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-tag/sys/build.rs b/gstreamer-tag/sys/build.rs index c7e114aaa..526a151cd 100644 --- a/gstreamer-tag/sys/build.rs +++ b/gstreamer-tag/sys/build.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-tag/sys/src/lib.rs b/gstreamer-tag/sys/src/lib.rs index 2acb262d4..74272860f 100644 --- a/gstreamer-tag/sys/src/lib.rs +++ b/gstreamer-tag/sys/src/lib.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-tag/sys/tests/abi.rs b/gstreamer-tag/sys/tests/abi.rs index 9c1e78337..419047f1c 100644 --- a/gstreamer-tag/sys/tests/abi.rs +++ b/gstreamer-tag/sys/tests/abi.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-tag/sys/tests/constant.c b/gstreamer-tag/sys/tests/constant.c index 62f9b3595..8da195d50 100644 --- a/gstreamer-tag/sys/tests/constant.c +++ b/gstreamer-tag/sys/tests/constant.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-tag/sys/tests/layout.c b/gstreamer-tag/sys/tests/layout.c index bf1a687d3..5830eacc7 100644 --- a/gstreamer-tag/sys/tests/layout.c +++ b/gstreamer-tag/sys/tests/layout.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-video/src/auto/enums.rs b/gstreamer-video/src/auto/enums.rs index 95ef13a13..d03d24603 100644 --- a/gstreamer-video/src/auto/enums.rs +++ b/gstreamer-video/src/auto/enums.rs @@ -30,11 +30,11 @@ pub enum VideoAFDSpec { #[cfg(any(feature = "v1_18", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] #[doc(hidden)] -impl ToGlib for VideoAFDSpec { +impl IntoGlib for VideoAFDSpec { type GlibType = ffi::GstVideoAFDSpec; - fn to_glib(&self) -> ffi::GstVideoAFDSpec { - match *self { + fn into_glib(self) -> ffi::GstVideoAFDSpec { + match self { VideoAFDSpec::DvbEtsi => ffi::GST_VIDEO_AFD_SPEC_DVB_ETSI, VideoAFDSpec::AtscA53 => ffi::GST_VIDEO_AFD_SPEC_ATSC_A53, VideoAFDSpec::SmpteSt20161 => ffi::GST_VIDEO_AFD_SPEC_SMPTE_ST2016_1, @@ -89,7 +89,7 @@ impl ToValue for VideoAFDSpec { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -134,11 +134,11 @@ pub enum VideoAFDValue { #[cfg(any(feature = "v1_18", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] #[doc(hidden)] -impl ToGlib for VideoAFDValue { +impl IntoGlib for VideoAFDValue { type GlibType = ffi::GstVideoAFDValue; - fn to_glib(&self) -> ffi::GstVideoAFDValue { - match *self { + fn into_glib(self) -> ffi::GstVideoAFDValue { + match self { VideoAFDValue::Unavailable => ffi::GST_VIDEO_AFD_UNAVAILABLE, VideoAFDValue::_169TopAligned => ffi::GST_VIDEO_AFD_16_9_TOP_ALIGNED, VideoAFDValue::_149TopAligned => ffi::GST_VIDEO_AFD_14_9_TOP_ALIGNED, @@ -209,7 +209,7 @@ impl ToValue for VideoAFDValue { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -234,11 +234,11 @@ pub enum VideoAlphaMode { } #[doc(hidden)] -impl ToGlib for VideoAlphaMode { +impl IntoGlib for VideoAlphaMode { type GlibType = ffi::GstVideoAlphaMode; - fn to_glib(&self) -> ffi::GstVideoAlphaMode { - match *self { + fn into_glib(self) -> ffi::GstVideoAlphaMode { + match self { VideoAlphaMode::Copy => ffi::GST_VIDEO_ALPHA_MODE_COPY, VideoAlphaMode::Set => ffi::GST_VIDEO_ALPHA_MODE_SET, VideoAlphaMode::Mult => ffi::GST_VIDEO_ALPHA_MODE_MULT, @@ -283,7 +283,7 @@ impl ToValue for VideoAlphaMode { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -325,18 +325,18 @@ impl VideoCaptionType { #[doc(alias = "gst_video_caption_type_to_caps")] pub fn to_caps(self) -> Option { assert_initialized_main_thread!(); - unsafe { from_glib_full(ffi::gst_video_caption_type_to_caps(self.to_glib())) } + unsafe { from_glib_full(ffi::gst_video_caption_type_to_caps(self.into_glib())) } } } #[cfg(any(feature = "v1_16", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))] #[doc(hidden)] -impl ToGlib for VideoCaptionType { +impl IntoGlib for VideoCaptionType { type GlibType = ffi::GstVideoCaptionType; - fn to_glib(&self) -> ffi::GstVideoCaptionType { - match *self { + fn into_glib(self) -> ffi::GstVideoCaptionType { + match self { VideoCaptionType::Unknown => ffi::GST_VIDEO_CAPTION_TYPE_UNKNOWN, VideoCaptionType::Cea608Raw => ffi::GST_VIDEO_CAPTION_TYPE_CEA608_RAW, VideoCaptionType::Cea608S3341a => ffi::GST_VIDEO_CAPTION_TYPE_CEA608_S334_1A, @@ -395,7 +395,7 @@ impl ToValue for VideoCaptionType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -422,11 +422,11 @@ pub enum VideoChromaMode { } #[doc(hidden)] -impl ToGlib for VideoChromaMode { +impl IntoGlib for VideoChromaMode { type GlibType = ffi::GstVideoChromaMode; - fn to_glib(&self) -> ffi::GstVideoChromaMode { - match *self { + fn into_glib(self) -> ffi::GstVideoChromaMode { + match self { VideoChromaMode::Full => ffi::GST_VIDEO_CHROMA_MODE_FULL, VideoChromaMode::UpsampleOnly => ffi::GST_VIDEO_CHROMA_MODE_UPSAMPLE_ONLY, VideoChromaMode::DownsampleOnly => ffi::GST_VIDEO_CHROMA_MODE_DOWNSAMPLE_ONLY, @@ -473,7 +473,7 @@ impl ToValue for VideoChromaMode { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -519,16 +519,16 @@ impl VideoColorMatrix { #[doc(alias = "gst_video_color_matrix_to_iso")] pub fn to_iso(self) -> u32 { assert_initialized_main_thread!(); - unsafe { ffi::gst_video_color_matrix_to_iso(self.to_glib()) } + unsafe { ffi::gst_video_color_matrix_to_iso(self.into_glib()) } } } #[doc(hidden)] -impl ToGlib for VideoColorMatrix { +impl IntoGlib for VideoColorMatrix { type GlibType = ffi::GstVideoColorMatrix; - fn to_glib(&self) -> ffi::GstVideoColorMatrix { - match *self { + fn into_glib(self) -> ffi::GstVideoColorMatrix { + match self { VideoColorMatrix::Unknown => ffi::GST_VIDEO_COLOR_MATRIX_UNKNOWN, VideoColorMatrix::Rgb => ffi::GST_VIDEO_COLOR_MATRIX_RGB, VideoColorMatrix::Fcc => ffi::GST_VIDEO_COLOR_MATRIX_FCC, @@ -581,7 +581,7 @@ impl ToValue for VideoColorMatrix { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -652,16 +652,16 @@ impl VideoColorPrimaries { #[doc(alias = "gst_video_color_primaries_to_iso")] pub fn to_iso(self) -> u32 { assert_initialized_main_thread!(); - unsafe { ffi::gst_video_color_primaries_to_iso(self.to_glib()) } + unsafe { ffi::gst_video_color_primaries_to_iso(self.into_glib()) } } } #[doc(hidden)] -impl ToGlib for VideoColorPrimaries { +impl IntoGlib for VideoColorPrimaries { type GlibType = ffi::GstVideoColorPrimaries; - fn to_glib(&self) -> ffi::GstVideoColorPrimaries { - match *self { + fn into_glib(self) -> ffi::GstVideoColorPrimaries { + match self { VideoColorPrimaries::Unknown => ffi::GST_VIDEO_COLOR_PRIMARIES_UNKNOWN, VideoColorPrimaries::Bt709 => ffi::GST_VIDEO_COLOR_PRIMARIES_BT709, VideoColorPrimaries::Bt470m => ffi::GST_VIDEO_COLOR_PRIMARIES_BT470M, @@ -734,7 +734,7 @@ impl ToValue for VideoColorPrimaries { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -763,11 +763,11 @@ pub enum VideoDitherMethod { } #[doc(hidden)] -impl ToGlib for VideoDitherMethod { +impl IntoGlib for VideoDitherMethod { type GlibType = ffi::GstVideoDitherMethod; - fn to_glib(&self) -> ffi::GstVideoDitherMethod { - match *self { + fn into_glib(self) -> ffi::GstVideoDitherMethod { + match self { VideoDitherMethod::None => ffi::GST_VIDEO_DITHER_NONE, VideoDitherMethod::Verterr => ffi::GST_VIDEO_DITHER_VERTERR, VideoDitherMethod::FloydSteinberg => ffi::GST_VIDEO_DITHER_FLOYD_STEINBERG, @@ -816,7 +816,7 @@ impl ToValue for VideoDitherMethod { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -868,11 +868,11 @@ impl fmt::Display for VideoFieldOrder { #[cfg(any(feature = "v1_12", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_12")))] #[doc(hidden)] -impl ToGlib for VideoFieldOrder { +impl IntoGlib for VideoFieldOrder { type GlibType = ffi::GstVideoFieldOrder; - fn to_glib(&self) -> ffi::GstVideoFieldOrder { - match *self { + fn into_glib(self) -> ffi::GstVideoFieldOrder { + match self { VideoFieldOrder::Unknown => ffi::GST_VIDEO_FIELD_ORDER_UNKNOWN, VideoFieldOrder::TopFieldFirst => ffi::GST_VIDEO_FIELD_ORDER_TOP_FIELD_FIRST, VideoFieldOrder::BottomFieldFirst => ffi::GST_VIDEO_FIELD_ORDER_BOTTOM_FIELD_FIRST, @@ -927,7 +927,7 @@ impl ToValue for VideoFieldOrder { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1240,7 +1240,7 @@ impl VideoFormat { #[doc(alias = "gst_video_format_to_fourcc")] pub fn to_fourcc(self) -> u32 { assert_initialized_main_thread!(); - unsafe { ffi::gst_video_format_to_fourcc(self.to_glib()) } + unsafe { ffi::gst_video_format_to_fourcc(self.into_glib()) } } } @@ -1252,11 +1252,11 @@ impl fmt::Display for VideoFormat { } #[doc(hidden)] -impl ToGlib for VideoFormat { +impl IntoGlib for VideoFormat { type GlibType = ffi::GstVideoFormat; - fn to_glib(&self) -> ffi::GstVideoFormat { - match *self { + fn into_glib(self) -> ffi::GstVideoFormat { + match self { VideoFormat::Unknown => ffi::GST_VIDEO_FORMAT_UNKNOWN, VideoFormat::Encoded => ffi::GST_VIDEO_FORMAT_ENCODED, VideoFormat::I420 => ffi::GST_VIDEO_FORMAT_I420, @@ -1569,7 +1569,7 @@ impl ToValue for VideoFormat { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1592,11 +1592,11 @@ pub enum VideoGammaMode { } #[doc(hidden)] -impl ToGlib for VideoGammaMode { +impl IntoGlib for VideoGammaMode { type GlibType = ffi::GstVideoGammaMode; - fn to_glib(&self) -> ffi::GstVideoGammaMode { - match *self { + fn into_glib(self) -> ffi::GstVideoGammaMode { + match self { VideoGammaMode::None => ffi::GST_VIDEO_GAMMA_MODE_NONE, VideoGammaMode::Remap => ffi::GST_VIDEO_GAMMA_MODE_REMAP, VideoGammaMode::__Unknown(value) => value, @@ -1639,7 +1639,7 @@ impl ToValue for VideoGammaMode { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1683,7 +1683,7 @@ impl VideoInterlaceMode { pub fn to_str<'a>(self) -> &'a str { unsafe { CStr::from_ptr( - ffi::gst_video_interlace_mode_to_string(self.to_glib()) + ffi::gst_video_interlace_mode_to_string(self.into_glib()) .as_ref() .expect("gst_video_interlace_mode_to_string returned NULL"), ) @@ -1701,11 +1701,11 @@ impl fmt::Display for VideoInterlaceMode { } #[doc(hidden)] -impl ToGlib for VideoInterlaceMode { +impl IntoGlib for VideoInterlaceMode { type GlibType = ffi::GstVideoInterlaceMode; - fn to_glib(&self) -> ffi::GstVideoInterlaceMode { - match *self { + fn into_glib(self) -> ffi::GstVideoInterlaceMode { + match self { VideoInterlaceMode::Progressive => ffi::GST_VIDEO_INTERLACE_MODE_PROGRESSIVE, VideoInterlaceMode::Interleaved => ffi::GST_VIDEO_INTERLACE_MODE_INTERLEAVED, VideoInterlaceMode::Mixed => ffi::GST_VIDEO_INTERLACE_MODE_MIXED, @@ -1756,7 +1756,7 @@ impl ToValue for VideoInterlaceMode { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1783,11 +1783,11 @@ pub enum VideoMatrixMode { } #[doc(hidden)] -impl ToGlib for VideoMatrixMode { +impl IntoGlib for VideoMatrixMode { type GlibType = ffi::GstVideoMatrixMode; - fn to_glib(&self) -> ffi::GstVideoMatrixMode { - match *self { + fn into_glib(self) -> ffi::GstVideoMatrixMode { + match self { VideoMatrixMode::Full => ffi::GST_VIDEO_MATRIX_MODE_FULL, VideoMatrixMode::InputOnly => ffi::GST_VIDEO_MATRIX_MODE_INPUT_ONLY, VideoMatrixMode::OutputOnly => ffi::GST_VIDEO_MATRIX_MODE_OUTPUT_ONLY, @@ -1834,7 +1834,7 @@ impl ToValue for VideoMatrixMode { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1873,11 +1873,11 @@ pub enum VideoMultiviewFramePacking { } #[doc(hidden)] -impl ToGlib for VideoMultiviewFramePacking { +impl IntoGlib for VideoMultiviewFramePacking { type GlibType = ffi::GstVideoMultiviewFramePacking; - fn to_glib(&self) -> ffi::GstVideoMultiviewFramePacking { - match *self { + fn into_glib(self) -> ffi::GstVideoMultiviewFramePacking { + match self { VideoMultiviewFramePacking::None => ffi::GST_VIDEO_MULTIVIEW_FRAME_PACKING_NONE, VideoMultiviewFramePacking::Mono => ffi::GST_VIDEO_MULTIVIEW_FRAME_PACKING_MONO, VideoMultiviewFramePacking::Left => ffi::GST_VIDEO_MULTIVIEW_FRAME_PACKING_LEFT, @@ -1948,7 +1948,7 @@ impl ToValue for VideoMultiviewFramePacking { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -2006,16 +2006,20 @@ impl VideoMultiviewMode { #[doc(alias = "gst_video_multiview_mode_to_caps_string")] pub fn to_caps_string(self) -> Option { assert_initialized_main_thread!(); - unsafe { from_glib_none(ffi::gst_video_multiview_mode_to_caps_string(self.to_glib())) } + unsafe { + from_glib_none(ffi::gst_video_multiview_mode_to_caps_string( + self.into_glib(), + )) + } } } #[doc(hidden)] -impl ToGlib for VideoMultiviewMode { +impl IntoGlib for VideoMultiviewMode { type GlibType = ffi::GstVideoMultiviewMode; - fn to_glib(&self) -> ffi::GstVideoMultiviewMode { - match *self { + fn into_glib(self) -> ffi::GstVideoMultiviewMode { + match self { VideoMultiviewMode::None => ffi::GST_VIDEO_MULTIVIEW_MODE_NONE, VideoMultiviewMode::Mono => ffi::GST_VIDEO_MULTIVIEW_MODE_MONO, VideoMultiviewMode::Left => ffi::GST_VIDEO_MULTIVIEW_MODE_LEFT, @@ -2086,7 +2090,7 @@ impl ToValue for VideoMultiviewMode { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -2129,11 +2133,11 @@ pub enum VideoOrientationMethod { #[cfg(any(feature = "v1_10", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] #[doc(hidden)] -impl ToGlib for VideoOrientationMethod { +impl IntoGlib for VideoOrientationMethod { type GlibType = ffi::GstVideoOrientationMethod; - fn to_glib(&self) -> ffi::GstVideoOrientationMethod { - match *self { + fn into_glib(self) -> ffi::GstVideoOrientationMethod { + match self { VideoOrientationMethod::Identity => ffi::GST_VIDEO_ORIENTATION_IDENTITY, VideoOrientationMethod::_90r => ffi::GST_VIDEO_ORIENTATION_90R, VideoOrientationMethod::_180 => ffi::GST_VIDEO_ORIENTATION_180, @@ -2202,7 +2206,7 @@ impl ToValue for VideoOrientationMethod { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -2227,11 +2231,11 @@ pub enum VideoPrimariesMode { } #[doc(hidden)] -impl ToGlib for VideoPrimariesMode { +impl IntoGlib for VideoPrimariesMode { type GlibType = ffi::GstVideoPrimariesMode; - fn to_glib(&self) -> ffi::GstVideoPrimariesMode { - match *self { + fn into_glib(self) -> ffi::GstVideoPrimariesMode { + match self { VideoPrimariesMode::None => ffi::GST_VIDEO_PRIMARIES_MODE_NONE, VideoPrimariesMode::MergeOnly => ffi::GST_VIDEO_PRIMARIES_MODE_MERGE_ONLY, VideoPrimariesMode::Fast => ffi::GST_VIDEO_PRIMARIES_MODE_FAST, @@ -2276,7 +2280,7 @@ impl ToValue for VideoPrimariesMode { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -2305,11 +2309,11 @@ pub enum VideoResamplerMethod { } #[doc(hidden)] -impl ToGlib for VideoResamplerMethod { +impl IntoGlib for VideoResamplerMethod { type GlibType = ffi::GstVideoResamplerMethod; - fn to_glib(&self) -> ffi::GstVideoResamplerMethod { - match *self { + fn into_glib(self) -> ffi::GstVideoResamplerMethod { + match self { VideoResamplerMethod::Nearest => ffi::GST_VIDEO_RESAMPLER_METHOD_NEAREST, VideoResamplerMethod::Linear => ffi::GST_VIDEO_RESAMPLER_METHOD_LINEAR, VideoResamplerMethod::Cubic => ffi::GST_VIDEO_RESAMPLER_METHOD_CUBIC, @@ -2358,7 +2362,7 @@ impl ToValue for VideoResamplerMethod { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -2385,11 +2389,11 @@ pub enum VideoTileMode { } #[doc(hidden)] -impl ToGlib for VideoTileMode { +impl IntoGlib for VideoTileMode { type GlibType = ffi::GstVideoTileMode; - fn to_glib(&self) -> ffi::GstVideoTileMode { - match *self { + fn into_glib(self) -> ffi::GstVideoTileMode { + match self { VideoTileMode::Unknown => ffi::GST_VIDEO_TILE_MODE_UNKNOWN, VideoTileMode::Zflipz2x2 => ffi::GST_VIDEO_TILE_MODE_ZFLIPZ_2X2, #[cfg(any(feature = "v1_18", feature = "dox"))] @@ -2436,7 +2440,7 @@ impl ToValue for VideoTileMode { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -2512,9 +2516,9 @@ impl VideoTransferFunction { assert_initialized_main_thread!(); unsafe { from_glib(ffi::gst_video_transfer_function_is_equivalent( - self.to_glib(), + self.into_glib(), from_bpp, - to_func.to_glib(), + to_func.into_glib(), to_bpp, )) } @@ -2525,16 +2529,16 @@ impl VideoTransferFunction { #[doc(alias = "gst_video_transfer_function_to_iso")] pub fn to_iso(self) -> u32 { assert_initialized_main_thread!(); - unsafe { ffi::gst_video_transfer_function_to_iso(self.to_glib()) } + unsafe { ffi::gst_video_transfer_function_to_iso(self.into_glib()) } } } #[doc(hidden)] -impl ToGlib for VideoTransferFunction { +impl IntoGlib for VideoTransferFunction { type GlibType = ffi::GstVideoTransferFunction; - fn to_glib(&self) -> ffi::GstVideoTransferFunction { - match *self { + fn into_glib(self) -> ffi::GstVideoTransferFunction { + match self { VideoTransferFunction::Unknown => ffi::GST_VIDEO_TRANSFER_UNKNOWN, VideoTransferFunction::Gamma10 => ffi::GST_VIDEO_TRANSFER_GAMMA10, VideoTransferFunction::Gamma18 => ffi::GST_VIDEO_TRANSFER_GAMMA18, @@ -2615,7 +2619,7 @@ impl ToValue for VideoTransferFunction { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } diff --git a/gstreamer-video/src/auto/flags.rs b/gstreamer-video/src/auto/flags.rs index d654694e3..e50a26c23 100644 --- a/gstreamer-video/src/auto/flags.rs +++ b/gstreamer-video/src/auto/flags.rs @@ -31,10 +31,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for VideoBufferFlags { +impl IntoGlib for VideoBufferFlags { type GlibType = ffi::GstVideoBufferFlags; - fn to_glib(&self) -> ffi::GstVideoBufferFlags { + fn into_glib(self) -> ffi::GstVideoBufferFlags { self.bits() } } @@ -70,7 +70,7 @@ impl ToValue for VideoBufferFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -94,10 +94,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for VideoChromaSite { +impl IntoGlib for VideoChromaSite { type GlibType = ffi::GstVideoChromaSite; - fn to_glib(&self) -> ffi::GstVideoChromaSite { + fn into_glib(self) -> ffi::GstVideoChromaSite { self.bits() } } @@ -133,7 +133,7 @@ impl ToValue for VideoChromaSite { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -153,10 +153,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for VideoCodecFrameFlags { +impl IntoGlib for VideoCodecFrameFlags { type GlibType = ffi::GstVideoCodecFrameFlags; - fn to_glib(&self) -> ffi::GstVideoCodecFrameFlags { + fn into_glib(self) -> ffi::GstVideoCodecFrameFlags { self.bits() } } @@ -177,10 +177,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for VideoFlags { +impl IntoGlib for VideoFlags { type GlibType = ffi::GstVideoFlags; - fn to_glib(&self) -> ffi::GstVideoFlags { + fn into_glib(self) -> ffi::GstVideoFlags { self.bits() } } @@ -216,7 +216,7 @@ impl ToValue for VideoFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -241,10 +241,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for VideoFormatFlags { +impl IntoGlib for VideoFormatFlags { type GlibType = ffi::GstVideoFormatFlags; - fn to_glib(&self) -> ffi::GstVideoFormatFlags { + fn into_glib(self) -> ffi::GstVideoFormatFlags { self.bits() } } @@ -280,7 +280,7 @@ impl ToValue for VideoFormatFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -304,10 +304,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for VideoFrameFlags { +impl IntoGlib for VideoFrameFlags { type GlibType = ffi::GstVideoFrameFlags; - fn to_glib(&self) -> ffi::GstVideoFrameFlags { + fn into_glib(self) -> ffi::GstVideoFrameFlags { self.bits() } } @@ -343,7 +343,7 @@ impl ToValue for VideoFrameFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -366,10 +366,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for VideoMultiviewFlags { +impl IntoGlib for VideoMultiviewFlags { type GlibType = ffi::GstVideoMultiviewFlags; - fn to_glib(&self) -> ffi::GstVideoMultiviewFlags { + fn into_glib(self) -> ffi::GstVideoMultiviewFlags { self.bits() } } @@ -405,7 +405,7 @@ impl ToValue for VideoMultiviewFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -423,10 +423,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for VideoOverlayFormatFlags { +impl IntoGlib for VideoOverlayFormatFlags { type GlibType = ffi::GstVideoOverlayFormatFlags; - fn to_glib(&self) -> ffi::GstVideoOverlayFormatFlags { + fn into_glib(self) -> ffi::GstVideoOverlayFormatFlags { self.bits() } } @@ -470,7 +470,7 @@ impl ToValue for VideoOverlayFormatFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -488,10 +488,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for VideoPackFlags { +impl IntoGlib for VideoPackFlags { type GlibType = ffi::GstVideoPackFlags; - fn to_glib(&self) -> ffi::GstVideoPackFlags { + fn into_glib(self) -> ffi::GstVideoPackFlags { self.bits() } } @@ -527,7 +527,7 @@ impl ToValue for VideoPackFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -549,10 +549,10 @@ bitflags! { #[cfg(any(feature = "v1_10", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] #[doc(hidden)] -impl ToGlib for VideoTimeCodeFlags { +impl IntoGlib for VideoTimeCodeFlags { type GlibType = ffi::GstVideoTimeCodeFlags; - fn to_glib(&self) -> ffi::GstVideoTimeCodeFlags { + fn into_glib(self) -> ffi::GstVideoTimeCodeFlags { self.bits() } } @@ -598,7 +598,7 @@ impl ToValue for VideoTimeCodeFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } diff --git a/gstreamer-video/src/auto/versions.txt b/gstreamer-video/src/auto/versions.txt index e31790782..47c89fa9e 100644 --- a/gstreamer-video/src/auto/versions.txt +++ b/gstreamer-video/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) diff --git a/gstreamer-video/src/auto/video_decoder.rs b/gstreamer-video/src/auto/video_decoder.rs index 705d9883e..b4b6d6dcd 100644 --- a/gstreamer-video/src/auto/video_decoder.rs +++ b/gstreamer-video/src/auto/video_decoder.rs @@ -188,7 +188,7 @@ impl> VideoDecoderExt for O { ffi::gst_video_decoder_merge_tags( self.as_ref().to_glib_none().0, tags.to_glib_none().0, - mode.to_glib(), + mode.into_glib(), ); } } @@ -207,7 +207,7 @@ impl> VideoDecoderExt for O { unsafe { ffi::gst_video_decoder_set_estimate_rate( self.as_ref().to_glib_none().0, - enabled.to_glib(), + enabled.into_glib(), ); } } @@ -222,7 +222,7 @@ impl> VideoDecoderExt for O { unsafe { ffi::gst_video_decoder_set_needs_format( self.as_ref().to_glib_none().0, - enabled.to_glib(), + enabled.into_glib(), ); } } @@ -231,7 +231,7 @@ impl> VideoDecoderExt for O { unsafe { ffi::gst_video_decoder_set_packetized( self.as_ref().to_glib_none().0, - packetized.to_glib(), + packetized.into_glib(), ); } } @@ -240,7 +240,7 @@ impl> VideoDecoderExt for O { unsafe { ffi::gst_video_decoder_set_use_default_pad_acceptcaps( self.as_ref().to_glib_none().0, - use_.to_glib(), + use_.into_glib(), ); } } diff --git a/gstreamer-video/src/auto/video_encoder.rs b/gstreamer-video/src/auto/video_encoder.rs index 88f211c11..4c00f87fe 100644 --- a/gstreamer-video/src/auto/video_encoder.rs +++ b/gstreamer-video/src/auto/video_encoder.rs @@ -136,7 +136,7 @@ impl> VideoEncoderExt for O { ffi::gst_video_encoder_merge_tags( self.as_ref().to_glib_none().0, tags.to_glib_none().0, - mode.to_glib(), + mode.into_glib(), ); } } @@ -166,14 +166,14 @@ impl> VideoEncoderExt for O { unsafe { ffi::gst_video_encoder_set_min_force_key_unit_interval( self.as_ref().to_glib_none().0, - interval.to_glib(), + interval.into_glib(), ); } } fn set_min_pts(&self, min_pts: gst::ClockTime) { unsafe { - ffi::gst_video_encoder_set_min_pts(self.as_ref().to_glib_none().0, min_pts.to_glib()); + ffi::gst_video_encoder_set_min_pts(self.as_ref().to_glib_none().0, min_pts.into_glib()); } } @@ -183,7 +183,7 @@ impl> VideoEncoderExt for O { unsafe { ffi::gst_video_encoder_set_qos_enabled( self.as_ref().to_glib_none().0, - enabled.to_glib(), + enabled.into_glib(), ); } } diff --git a/gstreamer-video/src/auto/video_orientation.rs b/gstreamer-video/src/auto/video_orientation.rs index af1e2d082..e3ad728ec 100644 --- a/gstreamer-video/src/auto/video_orientation.rs +++ b/gstreamer-video/src/auto/video_orientation.rs @@ -125,7 +125,7 @@ impl> VideoOrientationExt for O { glib::result_from_gboolean!( ffi::gst_video_orientation_set_hflip( self.as_ref().to_glib_none().0, - flip.to_glib() + flip.into_glib() ), "Failed to set horizontal flipping" ) @@ -146,7 +146,7 @@ impl> VideoOrientationExt for O { glib::result_from_gboolean!( ffi::gst_video_orientation_set_vflip( self.as_ref().to_glib_none().0, - flip.to_glib() + flip.into_glib() ), "Failed to set vertical flipping" ) diff --git a/gstreamer-video/src/auto/video_overlay.rs b/gstreamer-video/src/auto/video_overlay.rs index 390d81780..0b60e56ef 100644 --- a/gstreamer-video/src/auto/video_overlay.rs +++ b/gstreamer-video/src/auto/video_overlay.rs @@ -76,7 +76,7 @@ impl> VideoOverlayExt for O { unsafe { ffi::gst_video_overlay_handle_events( self.as_ref().to_glib_none().0, - handle_events.to_glib(), + handle_events.into_glib(), ); } } diff --git a/gstreamer-video/sys/build.rs b/gstreamer-video/sys/build.rs index c7e114aaa..526a151cd 100644 --- a/gstreamer-video/sys/build.rs +++ b/gstreamer-video/sys/build.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-video/sys/src/lib.rs b/gstreamer-video/sys/src/lib.rs index 158b31e88..0000329e5 100644 --- a/gstreamer-video/sys/src/lib.rs +++ b/gstreamer-video/sys/src/lib.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-video/sys/tests/abi.rs b/gstreamer-video/sys/tests/abi.rs index d1d502fcd..0619754cd 100644 --- a/gstreamer-video/sys/tests/abi.rs +++ b/gstreamer-video/sys/tests/abi.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-video/sys/tests/constant.c b/gstreamer-video/sys/tests/constant.c index 5a8a66093..ad5fe441a 100644 --- a/gstreamer-video/sys/tests/constant.c +++ b/gstreamer-video/sys/tests/constant.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-video/sys/tests/layout.c b/gstreamer-video/sys/tests/layout.c index 74612d12f..1eb1282ef 100644 --- a/gstreamer-video/sys/tests/layout.c +++ b/gstreamer-video/sys/tests/layout.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-webrtc/src/auto/enums.rs b/gstreamer-webrtc/src/auto/enums.rs index dcfa96276..751b5ec40 100644 --- a/gstreamer-webrtc/src/auto/enums.rs +++ b/gstreamer-webrtc/src/auto/enums.rs @@ -32,11 +32,11 @@ pub enum WebRTCBundlePolicy { #[cfg(any(feature = "v1_16", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))] #[doc(hidden)] -impl ToGlib for WebRTCBundlePolicy { +impl IntoGlib for WebRTCBundlePolicy { type GlibType = ffi::GstWebRTCBundlePolicy; - fn to_glib(&self) -> ffi::GstWebRTCBundlePolicy { - match *self { + fn into_glib(self) -> ffi::GstWebRTCBundlePolicy { + match self { WebRTCBundlePolicy::None => ffi::GST_WEBRTC_BUNDLE_POLICY_NONE, WebRTCBundlePolicy::Balanced => ffi::GST_WEBRTC_BUNDLE_POLICY_BALANCED, WebRTCBundlePolicy::MaxCompat => ffi::GST_WEBRTC_BUNDLE_POLICY_MAX_COMPAT, @@ -93,7 +93,7 @@ impl ToValue for WebRTCBundlePolicy { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -120,11 +120,11 @@ pub enum WebRTCDTLSSetup { } #[doc(hidden)] -impl ToGlib for WebRTCDTLSSetup { +impl IntoGlib for WebRTCDTLSSetup { type GlibType = ffi::GstWebRTCDTLSSetup; - fn to_glib(&self) -> ffi::GstWebRTCDTLSSetup { - match *self { + fn into_glib(self) -> ffi::GstWebRTCDTLSSetup { + match self { WebRTCDTLSSetup::None => ffi::GST_WEBRTC_DTLS_SETUP_NONE, WebRTCDTLSSetup::Actpass => ffi::GST_WEBRTC_DTLS_SETUP_ACTPASS, WebRTCDTLSSetup::Active => ffi::GST_WEBRTC_DTLS_SETUP_ACTIVE, @@ -171,7 +171,7 @@ impl ToValue for WebRTCDTLSSetup { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -200,11 +200,11 @@ pub enum WebRTCDTLSTransportState { } #[doc(hidden)] -impl ToGlib for WebRTCDTLSTransportState { +impl IntoGlib for WebRTCDTLSTransportState { type GlibType = ffi::GstWebRTCDTLSTransportState; - fn to_glib(&self) -> ffi::GstWebRTCDTLSTransportState { - match *self { + fn into_glib(self) -> ffi::GstWebRTCDTLSTransportState { + match self { WebRTCDTLSTransportState::New => ffi::GST_WEBRTC_DTLS_TRANSPORT_STATE_NEW, WebRTCDTLSTransportState::Closed => ffi::GST_WEBRTC_DTLS_TRANSPORT_STATE_CLOSED, WebRTCDTLSTransportState::Failed => ffi::GST_WEBRTC_DTLS_TRANSPORT_STATE_FAILED, @@ -253,7 +253,7 @@ impl ToValue for WebRTCDTLSTransportState { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -286,11 +286,11 @@ pub enum WebRTCDataChannelState { #[cfg(any(feature = "v1_16", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))] #[doc(hidden)] -impl ToGlib for WebRTCDataChannelState { +impl IntoGlib for WebRTCDataChannelState { type GlibType = ffi::GstWebRTCDataChannelState; - fn to_glib(&self) -> ffi::GstWebRTCDataChannelState { - match *self { + fn into_glib(self) -> ffi::GstWebRTCDataChannelState { + match self { WebRTCDataChannelState::New => ffi::GST_WEBRTC_DATA_CHANNEL_STATE_NEW, WebRTCDataChannelState::Connecting => ffi::GST_WEBRTC_DATA_CHANNEL_STATE_CONNECTING, WebRTCDataChannelState::Open => ffi::GST_WEBRTC_DATA_CHANNEL_STATE_OPEN, @@ -349,7 +349,7 @@ impl ToValue for WebRTCDataChannelState { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -376,11 +376,11 @@ pub enum WebRTCFECType { #[cfg(any(feature = "v1_14_1", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_14_1")))] #[doc(hidden)] -impl ToGlib for WebRTCFECType { +impl IntoGlib for WebRTCFECType { type GlibType = ffi::GstWebRTCFECType; - fn to_glib(&self) -> ffi::GstWebRTCFECType { - match *self { + fn into_glib(self) -> ffi::GstWebRTCFECType { + match self { WebRTCFECType::None => ffi::GST_WEBRTC_FEC_TYPE_NONE, WebRTCFECType::UlpRed => ffi::GST_WEBRTC_FEC_TYPE_ULP_RED, WebRTCFECType::__Unknown(value) => value, @@ -433,7 +433,7 @@ impl ToValue for WebRTCFECType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -456,11 +456,11 @@ pub enum WebRTCICEComponent { } #[doc(hidden)] -impl ToGlib for WebRTCICEComponent { +impl IntoGlib for WebRTCICEComponent { type GlibType = ffi::GstWebRTCICEComponent; - fn to_glib(&self) -> ffi::GstWebRTCICEComponent { - match *self { + fn into_glib(self) -> ffi::GstWebRTCICEComponent { + match self { WebRTCICEComponent::Rtp => ffi::GST_WEBRTC_ICE_COMPONENT_RTP, WebRTCICEComponent::Rtcp => ffi::GST_WEBRTC_ICE_COMPONENT_RTCP, WebRTCICEComponent::__Unknown(value) => value, @@ -503,7 +503,7 @@ impl ToValue for WebRTCICEComponent { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -536,11 +536,11 @@ pub enum WebRTCICEConnectionState { } #[doc(hidden)] -impl ToGlib for WebRTCICEConnectionState { +impl IntoGlib for WebRTCICEConnectionState { type GlibType = ffi::GstWebRTCICEConnectionState; - fn to_glib(&self) -> ffi::GstWebRTCICEConnectionState { - match *self { + fn into_glib(self) -> ffi::GstWebRTCICEConnectionState { + match self { WebRTCICEConnectionState::New => ffi::GST_WEBRTC_ICE_CONNECTION_STATE_NEW, WebRTCICEConnectionState::Checking => ffi::GST_WEBRTC_ICE_CONNECTION_STATE_CHECKING, WebRTCICEConnectionState::Connected => ffi::GST_WEBRTC_ICE_CONNECTION_STATE_CONNECTED, @@ -595,7 +595,7 @@ impl ToValue for WebRTCICEConnectionState { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -620,11 +620,11 @@ pub enum WebRTCICEGatheringState { } #[doc(hidden)] -impl ToGlib for WebRTCICEGatheringState { +impl IntoGlib for WebRTCICEGatheringState { type GlibType = ffi::GstWebRTCICEGatheringState; - fn to_glib(&self) -> ffi::GstWebRTCICEGatheringState { - match *self { + fn into_glib(self) -> ffi::GstWebRTCICEGatheringState { + match self { WebRTCICEGatheringState::New => ffi::GST_WEBRTC_ICE_GATHERING_STATE_NEW, WebRTCICEGatheringState::Gathering => ffi::GST_WEBRTC_ICE_GATHERING_STATE_GATHERING, WebRTCICEGatheringState::Complete => ffi::GST_WEBRTC_ICE_GATHERING_STATE_COMPLETE, @@ -669,7 +669,7 @@ impl ToValue for WebRTCICEGatheringState { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -692,11 +692,11 @@ pub enum WebRTCICERole { } #[doc(hidden)] -impl ToGlib for WebRTCICERole { +impl IntoGlib for WebRTCICERole { type GlibType = ffi::GstWebRTCICERole; - fn to_glib(&self) -> ffi::GstWebRTCICERole { - match *self { + fn into_glib(self) -> ffi::GstWebRTCICERole { + match self { WebRTCICERole::Controlled => ffi::GST_WEBRTC_ICE_ROLE_CONTROLLED, WebRTCICERole::Controlling => ffi::GST_WEBRTC_ICE_ROLE_CONTROLLING, WebRTCICERole::__Unknown(value) => value, @@ -739,7 +739,7 @@ impl ToValue for WebRTCICERole { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -766,11 +766,11 @@ pub enum WebRTCICETransportPolicy { #[cfg(any(feature = "v1_16", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))] #[doc(hidden)] -impl ToGlib for WebRTCICETransportPolicy { +impl IntoGlib for WebRTCICETransportPolicy { type GlibType = ffi::GstWebRTCICETransportPolicy; - fn to_glib(&self) -> ffi::GstWebRTCICETransportPolicy { - match *self { + fn into_glib(self) -> ffi::GstWebRTCICETransportPolicy { + match self { WebRTCICETransportPolicy::All => ffi::GST_WEBRTC_ICE_TRANSPORT_POLICY_ALL, WebRTCICETransportPolicy::Relay => ffi::GST_WEBRTC_ICE_TRANSPORT_POLICY_RELAY, WebRTCICETransportPolicy::__Unknown(value) => value, @@ -823,7 +823,7 @@ impl ToValue for WebRTCICETransportPolicy { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -854,11 +854,11 @@ pub enum WebRTCPeerConnectionState { } #[doc(hidden)] -impl ToGlib for WebRTCPeerConnectionState { +impl IntoGlib for WebRTCPeerConnectionState { type GlibType = ffi::GstWebRTCPeerConnectionState; - fn to_glib(&self) -> ffi::GstWebRTCPeerConnectionState { - match *self { + fn into_glib(self) -> ffi::GstWebRTCPeerConnectionState { + match self { WebRTCPeerConnectionState::New => ffi::GST_WEBRTC_PEER_CONNECTION_STATE_NEW, WebRTCPeerConnectionState::Connecting => { ffi::GST_WEBRTC_PEER_CONNECTION_STATE_CONNECTING @@ -913,7 +913,7 @@ impl ToValue for WebRTCPeerConnectionState { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -944,11 +944,11 @@ pub enum WebRTCPriorityType { #[cfg(any(feature = "v1_16", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))] #[doc(hidden)] -impl ToGlib for WebRTCPriorityType { +impl IntoGlib for WebRTCPriorityType { type GlibType = ffi::GstWebRTCPriorityType; - fn to_glib(&self) -> ffi::GstWebRTCPriorityType { - match *self { + fn into_glib(self) -> ffi::GstWebRTCPriorityType { + match self { WebRTCPriorityType::VeryLow => ffi::GST_WEBRTC_PRIORITY_TYPE_VERY_LOW, WebRTCPriorityType::Low => ffi::GST_WEBRTC_PRIORITY_TYPE_LOW, WebRTCPriorityType::Medium => ffi::GST_WEBRTC_PRIORITY_TYPE_MEDIUM, @@ -1005,7 +1005,7 @@ impl ToValue for WebRTCPriorityType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1034,11 +1034,11 @@ pub enum WebRTCRTPTransceiverDirection { } #[doc(hidden)] -impl ToGlib for WebRTCRTPTransceiverDirection { +impl IntoGlib for WebRTCRTPTransceiverDirection { type GlibType = ffi::GstWebRTCRTPTransceiverDirection; - fn to_glib(&self) -> ffi::GstWebRTCRTPTransceiverDirection { - match *self { + fn into_glib(self) -> ffi::GstWebRTCRTPTransceiverDirection { + match self { WebRTCRTPTransceiverDirection::None => ffi::GST_WEBRTC_RTP_TRANSCEIVER_DIRECTION_NONE, WebRTCRTPTransceiverDirection::Inactive => { ffi::GST_WEBRTC_RTP_TRANSCEIVER_DIRECTION_INACTIVE @@ -1095,7 +1095,7 @@ impl ToValue for WebRTCRTPTransceiverDirection { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1126,11 +1126,11 @@ pub enum WebRTCSCTPTransportState { #[cfg(any(feature = "v1_16", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_16")))] #[doc(hidden)] -impl ToGlib for WebRTCSCTPTransportState { +impl IntoGlib for WebRTCSCTPTransportState { type GlibType = ffi::GstWebRTCSCTPTransportState; - fn to_glib(&self) -> ffi::GstWebRTCSCTPTransportState { - match *self { + fn into_glib(self) -> ffi::GstWebRTCSCTPTransportState { + match self { WebRTCSCTPTransportState::New => ffi::GST_WEBRTC_SCTP_TRANSPORT_STATE_NEW, WebRTCSCTPTransportState::Connecting => ffi::GST_WEBRTC_SCTP_TRANSPORT_STATE_CONNECTING, WebRTCSCTPTransportState::Connected => ffi::GST_WEBRTC_SCTP_TRANSPORT_STATE_CONNECTED, @@ -1187,7 +1187,7 @@ impl ToValue for WebRTCSCTPTransportState { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1217,7 +1217,7 @@ impl WebRTCSDPType { pub fn to_str<'a>(self) -> &'a str { unsafe { CStr::from_ptr( - ffi::gst_webrtc_sdp_type_to_string(self.to_glib()) + ffi::gst_webrtc_sdp_type_to_string(self.into_glib()) .as_ref() .expect("gst_webrtc_sdp_type_to_string returned NULL"), ) @@ -1235,11 +1235,11 @@ impl fmt::Display for WebRTCSDPType { } #[doc(hidden)] -impl ToGlib for WebRTCSDPType { +impl IntoGlib for WebRTCSDPType { type GlibType = ffi::GstWebRTCSDPType; - fn to_glib(&self) -> ffi::GstWebRTCSDPType { - match *self { + fn into_glib(self) -> ffi::GstWebRTCSDPType { + match self { WebRTCSDPType::Offer => ffi::GST_WEBRTC_SDP_TYPE_OFFER, WebRTCSDPType::Pranswer => ffi::GST_WEBRTC_SDP_TYPE_PRANSWER, WebRTCSDPType::Answer => ffi::GST_WEBRTC_SDP_TYPE_ANSWER, @@ -1286,7 +1286,7 @@ impl ToValue for WebRTCSDPType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1317,11 +1317,11 @@ pub enum WebRTCSignalingState { } #[doc(hidden)] -impl ToGlib for WebRTCSignalingState { +impl IntoGlib for WebRTCSignalingState { type GlibType = ffi::GstWebRTCSignalingState; - fn to_glib(&self) -> ffi::GstWebRTCSignalingState { - match *self { + fn into_glib(self) -> ffi::GstWebRTCSignalingState { + match self { WebRTCSignalingState::Stable => ffi::GST_WEBRTC_SIGNALING_STATE_STABLE, WebRTCSignalingState::Closed => ffi::GST_WEBRTC_SIGNALING_STATE_CLOSED, WebRTCSignalingState::HaveLocalOffer => { @@ -1380,7 +1380,7 @@ impl ToValue for WebRTCSignalingState { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1427,11 +1427,11 @@ pub enum WebRTCStatsType { } #[doc(hidden)] -impl ToGlib for WebRTCStatsType { +impl IntoGlib for WebRTCStatsType { type GlibType = ffi::GstWebRTCStatsType; - fn to_glib(&self) -> ffi::GstWebRTCStatsType { - match *self { + fn into_glib(self) -> ffi::GstWebRTCStatsType { + match self { WebRTCStatsType::Codec => ffi::GST_WEBRTC_STATS_CODEC, WebRTCStatsType::InboundRtp => ffi::GST_WEBRTC_STATS_INBOUND_RTP, WebRTCStatsType::OutboundRtp => ffi::GST_WEBRTC_STATS_OUTBOUND_RTP, @@ -1498,7 +1498,7 @@ impl ToValue for WebRTCStatsType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } diff --git a/gstreamer-webrtc/src/auto/versions.txt b/gstreamer-webrtc/src/auto/versions.txt index e31790782..47c89fa9e 100644 --- a/gstreamer-webrtc/src/auto/versions.txt +++ b/gstreamer-webrtc/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) diff --git a/gstreamer-webrtc/src/auto/web_rtcdtls_transport.rs b/gstreamer-webrtc/src/auto/web_rtcdtls_transport.rs index e3130c50b..bdd63579a 100644 --- a/gstreamer-webrtc/src/auto/web_rtcdtls_transport.rs +++ b/gstreamer-webrtc/src/auto/web_rtcdtls_transport.rs @@ -29,7 +29,7 @@ impl WebRTCDTLSTransport { unsafe { from_glib_none(ffi::gst_webrtc_dtls_transport_new( session_id, - rtcp.to_glib(), + rtcp.into_glib(), )) } } diff --git a/gstreamer-webrtc/src/auto/web_rtcice_transport.rs b/gstreamer-webrtc/src/auto/web_rtcice_transport.rs index cc215d6bf..219b72160 100644 --- a/gstreamer-webrtc/src/auto/web_rtcice_transport.rs +++ b/gstreamer-webrtc/src/auto/web_rtcice_transport.rs @@ -28,7 +28,7 @@ impl WebRTCICETransport { unsafe { ffi::gst_webrtc_ice_transport_connection_state_change( self.to_glib_none().0, - new_state.to_glib(), + new_state.into_glib(), ); } } @@ -38,7 +38,7 @@ impl WebRTCICETransport { unsafe { ffi::gst_webrtc_ice_transport_gathering_state_change( self.to_glib_none().0, - new_state.to_glib(), + new_state.into_glib(), ); } } @@ -49,7 +49,7 @@ impl WebRTCICETransport { ffi::gst_webrtc_ice_transport_new_candidate( self.to_glib_none().0, stream_id, - component.to_glib(), + component.into_glib(), attr.to_glib_none().0, ); } diff --git a/gstreamer-webrtc/sys/build.rs b/gstreamer-webrtc/sys/build.rs index c7e114aaa..526a151cd 100644 --- a/gstreamer-webrtc/sys/build.rs +++ b/gstreamer-webrtc/sys/build.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-webrtc/sys/src/lib.rs b/gstreamer-webrtc/sys/src/lib.rs index fc3c54e4d..d9321baf5 100644 --- a/gstreamer-webrtc/sys/src/lib.rs +++ b/gstreamer-webrtc/sys/src/lib.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-webrtc/sys/tests/abi.rs b/gstreamer-webrtc/sys/tests/abi.rs index 15b7b53b5..c115a48c7 100644 --- a/gstreamer-webrtc/sys/tests/abi.rs +++ b/gstreamer-webrtc/sys/tests/abi.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-webrtc/sys/tests/constant.c b/gstreamer-webrtc/sys/tests/constant.c index e89e142a2..f2a56313f 100644 --- a/gstreamer-webrtc/sys/tests/constant.c +++ b/gstreamer-webrtc/sys/tests/constant.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer-webrtc/sys/tests/layout.c b/gstreamer-webrtc/sys/tests/layout.c index c57b91ece..a4ca22d33 100644 --- a/gstreamer-webrtc/sys/tests/layout.c +++ b/gstreamer-webrtc/sys/tests/layout.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer/src/auto/bin.rs b/gstreamer/src/auto/bin.rs index fbb2ce8d6..776b7caa7 100644 --- a/gstreamer/src/auto/bin.rs +++ b/gstreamer/src/auto/bin.rs @@ -174,7 +174,7 @@ impl> GstBinExt for O { unsafe { from_glib_full(ffi::gst_bin_find_unlinked_pad( self.as_ref().to_glib_none().0, - direction.to_glib(), + direction.into_glib(), )) } } @@ -183,7 +183,7 @@ impl> GstBinExt for O { unsafe { from_glib_full(ffi::gst_bin_get_by_interface( self.as_ref().to_glib_none().0, - iface.to_glib(), + iface.into_glib(), )) } } @@ -275,7 +275,7 @@ impl> GstBinExt for O { #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] fn set_suppressed_flags(&self, flags: ElementFlags) { unsafe { - ffi::gst_bin_set_suppressed_flags(self.as_ref().to_glib_none().0, flags.to_glib()); + ffi::gst_bin_set_suppressed_flags(self.as_ref().to_glib_none().0, flags.into_glib()); } } diff --git a/gstreamer/src/auto/buffer_pool.rs b/gstreamer/src/auto/buffer_pool.rs index ec158cb2a..129e4b6c1 100644 --- a/gstreamer/src/auto/buffer_pool.rs +++ b/gstreamer/src/auto/buffer_pool.rs @@ -66,7 +66,7 @@ impl> BufferPoolExt for O { fn set_active(&self, active: bool) -> Result<(), glib::error::BoolError> { unsafe { glib::result_from_gboolean!( - ffi::gst_buffer_pool_set_active(self.as_ref().to_glib_none().0, active.to_glib()), + ffi::gst_buffer_pool_set_active(self.as_ref().to_glib_none().0, active.into_glib()), "Failed to activate buffer pool" ) } @@ -74,7 +74,7 @@ impl> BufferPoolExt for O { fn set_flushing(&self, flushing: bool) { unsafe { - ffi::gst_buffer_pool_set_flushing(self.as_ref().to_glib_none().0, flushing.to_glib()); + ffi::gst_buffer_pool_set_flushing(self.as_ref().to_glib_none().0, flushing.into_glib()); } } } diff --git a/gstreamer/src/auto/bus.rs b/gstreamer/src/auto/bus.rs index 243c8f220..e4f71d75c 100644 --- a/gstreamer/src/auto/bus.rs +++ b/gstreamer/src/auto/bus.rs @@ -106,7 +106,7 @@ impl Bus { #[doc(alias = "gst_bus_set_flushing")] pub fn set_flushing(&self, flushing: bool) { unsafe { - ffi::gst_bus_set_flushing(self.to_glib_none().0, flushing.to_glib()); + ffi::gst_bus_set_flushing(self.to_glib_none().0, flushing.into_glib()); } } @@ -120,7 +120,7 @@ impl Bus { unsafe { from_glib_full(ffi::gst_bus_timed_pop( self.to_glib_none().0, - timeout.to_glib(), + timeout.into_glib(), )) } } diff --git a/gstreamer/src/auto/clock.rs b/gstreamer/src/auto/clock.rs index 088d887e8..2d7eee105 100644 --- a/gstreamer/src/auto/clock.rs +++ b/gstreamer/src/auto/clock.rs @@ -190,8 +190,8 @@ impl> ClockExt for O { let mut r_squared = mem::MaybeUninit::uninit(); let ret = from_glib(ffi::gst_clock_add_observation( self.as_ref().to_glib_none().0, - slave.to_glib(), - master.to_glib(), + slave.into_glib(), + master.into_glib(), r_squared.as_mut_ptr(), )); let r_squared = r_squared.assume_init(); @@ -216,8 +216,8 @@ impl> ClockExt for O { let mut rate_denom = mem::MaybeUninit::uninit(); let ret = from_glib(ffi::gst_clock_add_observation_unapplied( self.as_ref().to_glib_none().0, - slave.to_glib(), - master.to_glib(), + slave.into_glib(), + master.into_glib(), r_squared.as_mut_ptr(), internal.as_mut_ptr(), external.as_mut_ptr(), @@ -247,7 +247,7 @@ impl> ClockExt for O { unsafe { from_glib(ffi::gst_clock_adjust_unlocked( self.as_ref().to_glib_none().0, - internal.to_glib(), + internal.into_glib(), )) } } @@ -332,10 +332,10 @@ impl> ClockExt for O { unsafe { ffi::gst_clock_set_calibration( self.as_ref().to_glib_none().0, - internal.to_glib(), - external.to_glib(), - rate_num.to_glib(), - rate_denom.to_glib(), + internal.into_glib(), + external.into_glib(), + rate_num.into_glib(), + rate_denom.into_glib(), ); } } @@ -356,20 +356,20 @@ impl> ClockExt for O { unsafe { from_glib(ffi::gst_clock_set_resolution( self.as_ref().to_glib_none().0, - resolution.to_glib(), + resolution.into_glib(), )) } } fn set_synced(&self, synced: bool) { unsafe { - ffi::gst_clock_set_synced(self.as_ref().to_glib_none().0, synced.to_glib()); + ffi::gst_clock_set_synced(self.as_ref().to_glib_none().0, synced.into_glib()); } } fn set_timeout(&self, timeout: ClockTime) { unsafe { - ffi::gst_clock_set_timeout(self.as_ref().to_glib_none().0, timeout.to_glib()); + ffi::gst_clock_set_timeout(self.as_ref().to_glib_none().0, timeout.into_glib()); } } @@ -381,7 +381,7 @@ impl> ClockExt for O { unsafe { from_glib(ffi::gst_clock_unadjust_unlocked( self.as_ref().to_glib_none().0, - external.to_glib(), + external.into_glib(), )) } } @@ -389,7 +389,7 @@ impl> ClockExt for O { fn wait_for_sync(&self, timeout: ClockTime) -> Result<(), glib::error::BoolError> { unsafe { glib::result_from_gboolean!( - ffi::gst_clock_wait_for_sync(self.as_ref().to_glib_none().0, timeout.to_glib()), + ffi::gst_clock_wait_for_sync(self.as_ref().to_glib_none().0, timeout.into_glib()), "Timed out waiting for sync" ) } diff --git a/gstreamer/src/auto/control_binding.rs b/gstreamer/src/auto/control_binding.rs index 813237d59..7712c275a 100644 --- a/gstreamer/src/auto/control_binding.rs +++ b/gstreamer/src/auto/control_binding.rs @@ -52,7 +52,7 @@ impl> ControlBindingExt for O { unsafe { from_glib_full(ffi::gst_control_binding_get_value( self.as_ref().to_glib_none().0, - timestamp.to_glib(), + timestamp.into_glib(), )) } } @@ -73,7 +73,7 @@ impl> ControlBindingExt for O { unsafe { ffi::gst_control_binding_set_disabled( self.as_ref().to_glib_none().0, - disabled.to_glib(), + disabled.into_glib(), ); } } @@ -88,8 +88,8 @@ impl> ControlBindingExt for O { from_glib(ffi::gst_control_binding_sync_values( self.as_ref().to_glib_none().0, object.as_ref().to_glib_none().0, - timestamp.to_glib(), - last_sync.to_glib(), + timestamp.into_glib(), + last_sync.into_glib(), )) } } diff --git a/gstreamer/src/auto/control_source.rs b/gstreamer/src/auto/control_source.rs index c0a42a20f..cc319e061 100644 --- a/gstreamer/src/auto/control_source.rs +++ b/gstreamer/src/auto/control_source.rs @@ -33,7 +33,7 @@ impl> ControlSourceExt for O { let mut value = mem::MaybeUninit::uninit(); let ret = from_glib(ffi::gst_control_source_get_value( self.as_ref().to_glib_none().0, - timestamp.to_glib(), + timestamp.into_glib(), value.as_mut_ptr(), )); let value = value.assume_init(); diff --git a/gstreamer/src/auto/device_monitor.rs b/gstreamer/src/auto/device_monitor.rs index 297981a90..f45ae6456 100644 --- a/gstreamer/src/auto/device_monitor.rs +++ b/gstreamer/src/auto/device_monitor.rs @@ -100,7 +100,7 @@ impl> DeviceMonitorExt for O { unsafe { ffi::gst_device_monitor_set_show_all_devices( self.as_ref().to_glib_none().0, - show_all.to_glib(), + show_all.into_glib(), ); } } diff --git a/gstreamer/src/auto/device_provider_factory.rs b/gstreamer/src/auto/device_provider_factory.rs index dd28c009a..897cb1004 100644 --- a/gstreamer/src/auto/device_provider_factory.rs +++ b/gstreamer/src/auto/device_provider_factory.rs @@ -92,7 +92,7 @@ impl DeviceProviderFactory { assert_initialized_main_thread!(); unsafe { FromGlibPtrContainer::from_glib_full( - ffi::gst_device_provider_factory_list_get_device_providers(minrank.to_glib()), + ffi::gst_device_provider_factory_list_get_device_providers(minrank.into_glib()), ) } } diff --git a/gstreamer/src/auto/element.rs b/gstreamer/src/auto/element.rs index 23b3d5185..48e09a647 100644 --- a/gstreamer/src/auto/element.rs +++ b/gstreamer/src/auto/element.rs @@ -42,7 +42,7 @@ impl Element { unsafe { let mut error = ptr::null_mut(); let ret = ffi::gst_element_make_from_uri( - type_.to_glib(), + type_.into_glib(), uri.to_glib_none().0, elementname.to_glib_none().0, &mut error, @@ -282,7 +282,7 @@ impl> ElementExt for O { let pad = from_glib_borrow(pad); let callback: *mut P = user_data as *const _ as usize as *mut P; let res = (*callback)(&element, &pad); - res.to_glib() + res.into_glib() } let func = Some(func_func::

as _); let super_callback0: &P = &func_data; @@ -308,7 +308,7 @@ impl> ElementExt for O { let pad = from_glib_borrow(pad); let callback: *mut P = user_data as *const _ as usize as *mut P; let res = (*callback)(&element, &pad); - res.to_glib() + res.into_glib() } let func = Some(func_func::

as _); let super_callback0: &P = &func_data; @@ -334,7 +334,7 @@ impl> ElementExt for O { let pad = from_glib_borrow(pad); let callback: *mut P = user_data as *const _ as usize as *mut P; let res = (*callback)(&element, &pad); - res.to_glib() + res.into_glib() } let func = Some(func_func::

as _); let super_callback0: &P = &func_data; @@ -536,7 +536,7 @@ impl> ElementExt for O { srcpadname.to_glib_none().0, dest.as_ref().to_glib_none().0, destpadname.to_glib_none().0, - flags.to_glib() + flags.into_glib() ), "Failed to link pads" ) @@ -612,7 +612,7 @@ impl> ElementExt for O { fn set_base_time(&self, time: ClockTime) { unsafe { - ffi::gst_element_set_base_time(self.as_ref().to_glib_none().0, time.to_glib()); + ffi::gst_element_set_base_time(self.as_ref().to_glib_none().0, time.into_glib()); } } @@ -644,14 +644,14 @@ impl> ElementExt for O { unsafe { from_glib(ffi::gst_element_set_locked_state( self.as_ref().to_glib_none().0, - locked_state.to_glib(), + locked_state.into_glib(), )) } } fn set_start_time(&self, time: ClockTime) { unsafe { - ffi::gst_element_set_start_time(self.as_ref().to_glib_none().0, time.to_glib()); + ffi::gst_element_set_start_time(self.as_ref().to_glib_none().0, time.into_glib()); } } diff --git a/gstreamer/src/auto/element_factory.rs b/gstreamer/src/auto/element_factory.rs index c93d4e5a0..91f5187fc 100644 --- a/gstreamer/src/auto/element_factory.rs +++ b/gstreamer/src/auto/element_factory.rs @@ -145,7 +145,7 @@ impl ElementFactory { unsafe { from_glib(ffi::gst_element_factory_list_is_type( self.to_glib_none().0, - type_.to_glib(), + type_.into_glib(), )) } } @@ -168,8 +168,8 @@ impl ElementFactory { FromGlibPtrContainer::from_glib_full(ffi::gst_element_factory_list_filter( list.to_glib_none().0, caps.to_glib_none().0, - direction.to_glib(), - subsetonly.to_glib(), + direction.into_glib(), + subsetonly.into_glib(), )) } } @@ -179,8 +179,8 @@ impl ElementFactory { assert_initialized_main_thread!(); unsafe { FromGlibPtrContainer::from_glib_full(ffi::gst_element_factory_list_get_elements( - type_.to_glib(), - minrank.to_glib(), + type_.into_glib(), + minrank.into_glib(), )) } } diff --git a/gstreamer/src/auto/enums.rs b/gstreamer/src/auto/enums.rs index 8b842b2c0..ae9219f4f 100644 --- a/gstreamer/src/auto/enums.rs +++ b/gstreamer/src/auto/enums.rs @@ -31,11 +31,11 @@ pub enum BufferingMode { } #[doc(hidden)] -impl ToGlib for BufferingMode { +impl IntoGlib for BufferingMode { type GlibType = ffi::GstBufferingMode; - fn to_glib(&self) -> ffi::GstBufferingMode { - match *self { + fn into_glib(self) -> ffi::GstBufferingMode { + match self { BufferingMode::Stream => ffi::GST_BUFFERING_STREAM, BufferingMode::Download => ffi::GST_BUFFERING_DOWNLOAD, BufferingMode::Timeshift => ffi::GST_BUFFERING_TIMESHIFT, @@ -82,7 +82,7 @@ impl ToValue for BufferingMode { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -107,11 +107,11 @@ pub enum BusSyncReply { } #[doc(hidden)] -impl ToGlib for BusSyncReply { +impl IntoGlib for BusSyncReply { type GlibType = ffi::GstBusSyncReply; - fn to_glib(&self) -> ffi::GstBusSyncReply { - match *self { + fn into_glib(self) -> ffi::GstBusSyncReply { + match self { BusSyncReply::Drop => ffi::GST_BUS_DROP, BusSyncReply::Pass => ffi::GST_BUS_PASS, BusSyncReply::Async => ffi::GST_BUS_ASYNC, @@ -156,7 +156,7 @@ impl ToValue for BusSyncReply { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -179,11 +179,11 @@ pub enum CapsIntersectMode { } #[doc(hidden)] -impl ToGlib for CapsIntersectMode { +impl IntoGlib for CapsIntersectMode { type GlibType = ffi::GstCapsIntersectMode; - fn to_glib(&self) -> ffi::GstCapsIntersectMode { - match *self { + fn into_glib(self) -> ffi::GstCapsIntersectMode { + match self { CapsIntersectMode::ZigZag => ffi::GST_CAPS_INTERSECT_ZIG_ZAG, CapsIntersectMode::First => ffi::GST_CAPS_INTERSECT_FIRST, CapsIntersectMode::__Unknown(value) => value, @@ -226,7 +226,7 @@ impl ToValue for CapsIntersectMode { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -249,11 +249,11 @@ pub enum ClockEntryType { } #[doc(hidden)] -impl ToGlib for ClockEntryType { +impl IntoGlib for ClockEntryType { type GlibType = ffi::GstClockEntryType; - fn to_glib(&self) -> ffi::GstClockEntryType { - match *self { + fn into_glib(self) -> ffi::GstClockEntryType { + match self { ClockEntryType::Single => ffi::GST_CLOCK_ENTRY_SINGLE, ClockEntryType::Periodic => ffi::GST_CLOCK_ENTRY_PERIODIC, ClockEntryType::__Unknown(value) => value, @@ -296,7 +296,7 @@ impl ToValue for ClockEntryType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -332,11 +332,11 @@ pub enum ClockReturn { } #[doc(hidden)] -impl ToGlib for ClockReturn { +impl IntoGlib for ClockReturn { type GlibType = ffi::GstClockReturn; - fn to_glib(&self) -> ffi::GstClockReturn { - match *self { + fn into_glib(self) -> ffi::GstClockReturn { + match self { ClockReturn::Ok => ffi::GST_CLOCK_OK, ClockReturn::Early => ffi::GST_CLOCK_EARLY, ClockReturn::Unscheduled => ffi::GST_CLOCK_UNSCHEDULED, @@ -391,7 +391,7 @@ impl ToValue for ClockReturn { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -420,11 +420,11 @@ pub enum ClockType { } #[doc(hidden)] -impl ToGlib for ClockType { +impl IntoGlib for ClockType { type GlibType = ffi::GstClockType; - fn to_glib(&self) -> ffi::GstClockType { - match *self { + fn into_glib(self) -> ffi::GstClockType { + match self { ClockType::Realtime => ffi::GST_CLOCK_TYPE_REALTIME, ClockType::Monotonic => ffi::GST_CLOCK_TYPE_MONOTONIC, ClockType::Other => ffi::GST_CLOCK_TYPE_OTHER, @@ -473,7 +473,7 @@ impl ToValue for ClockType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -522,11 +522,11 @@ pub enum CoreError { } #[doc(hidden)] -impl ToGlib for CoreError { +impl IntoGlib for CoreError { type GlibType = ffi::GstCoreError; - fn to_glib(&self) -> ffi::GstCoreError { - match *self { + fn into_glib(self) -> ffi::GstCoreError { + match self { CoreError::Failed => ffi::GST_CORE_ERROR_FAILED, CoreError::TooLazy => ffi::GST_CORE_ERROR_TOO_LAZY, CoreError::NotImplemented => ffi::GST_CORE_ERROR_NOT_IMPLEMENTED, @@ -580,7 +580,7 @@ impl ErrorDomain for CoreError { } fn code(self) -> i32 { - self.to_glib() + self.into_glib() } fn from(code: i32) -> Option { @@ -629,7 +629,7 @@ impl ToValue for CoreError { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -671,7 +671,7 @@ impl DebugLevel { pub fn name<'a>(self) -> &'a str { unsafe { CStr::from_ptr( - ffi::gst_debug_level_get_name(self.to_glib()) + ffi::gst_debug_level_get_name(self.into_glib()) .as_ref() .expect("gst_debug_level_get_name returned NULL"), ) @@ -689,11 +689,11 @@ impl fmt::Display for DebugLevel { } #[doc(hidden)] -impl ToGlib for DebugLevel { +impl IntoGlib for DebugLevel { type GlibType = ffi::GstDebugLevel; - fn to_glib(&self) -> ffi::GstDebugLevel { - match *self { + fn into_glib(self) -> ffi::GstDebugLevel { + match self { DebugLevel::None => ffi::GST_LEVEL_NONE, DebugLevel::Error => ffi::GST_LEVEL_ERROR, DebugLevel::Warning => ffi::GST_LEVEL_WARNING, @@ -752,7 +752,7 @@ impl ToValue for DebugLevel { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -846,13 +846,13 @@ impl EventType { #[doc(alias = "gst_event_type_get_flags")] pub fn flags(self) -> EventTypeFlags { assert_initialized_main_thread!(); - unsafe { from_glib(ffi::gst_event_type_get_flags(self.to_glib())) } + unsafe { from_glib(ffi::gst_event_type_get_flags(self.into_glib())) } } pub fn name<'a>(self) -> &'a str { unsafe { CStr::from_ptr( - ffi::gst_event_type_get_name(self.to_glib()) + ffi::gst_event_type_get_name(self.into_glib()) .as_ref() .expect("gst_event_type_get_name returned NULL"), ) @@ -864,7 +864,7 @@ impl EventType { #[doc(alias = "gst_event_type_to_quark")] pub fn to_quark(self) -> glib::Quark { assert_initialized_main_thread!(); - unsafe { from_glib(ffi::gst_event_type_to_quark(self.to_glib())) } + unsafe { from_glib(ffi::gst_event_type_to_quark(self.into_glib())) } } } @@ -876,11 +876,11 @@ impl fmt::Display for EventType { } #[doc(hidden)] -impl ToGlib for EventType { +impl IntoGlib for EventType { type GlibType = ffi::GstEventType; - fn to_glib(&self) -> ffi::GstEventType { - match *self { + fn into_glib(self) -> ffi::GstEventType { + match self { EventType::Unknown => ffi::GST_EVENT_UNKNOWN, EventType::FlushStart => ffi::GST_EVENT_FLUSH_START, EventType::FlushStop => ffi::GST_EVENT_FLUSH_STOP, @@ -991,7 +991,7 @@ impl ToValue for EventType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1037,11 +1037,11 @@ pub enum FlowReturn { } #[doc(hidden)] -impl ToGlib for FlowReturn { +impl IntoGlib for FlowReturn { type GlibType = ffi::GstFlowReturn; - fn to_glib(&self) -> ffi::GstFlowReturn { - match *self { + fn into_glib(self) -> ffi::GstFlowReturn { + match self { FlowReturn::CustomSuccess2 => ffi::GST_FLOW_CUSTOM_SUCCESS_2, FlowReturn::CustomSuccess1 => ffi::GST_FLOW_CUSTOM_SUCCESS_1, FlowReturn::CustomSuccess => ffi::GST_FLOW_CUSTOM_SUCCESS, @@ -1106,7 +1106,7 @@ impl ToValue for FlowReturn { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1152,7 +1152,7 @@ impl Format { #[doc(alias = "gst_format_get_name")] pub fn name(self) -> Option { assert_initialized_main_thread!(); - unsafe { from_glib_none(ffi::gst_format_get_name(self.to_glib())) } + unsafe { from_glib_none(ffi::gst_format_get_name(self.into_glib())) } } //#[doc(alias = "gst_format_iterate_definitions")] @@ -1163,16 +1163,16 @@ impl Format { #[doc(alias = "gst_format_to_quark")] pub fn to_quark(self) -> glib::Quark { assert_initialized_main_thread!(); - unsafe { from_glib(ffi::gst_format_to_quark(self.to_glib())) } + unsafe { from_glib(ffi::gst_format_to_quark(self.into_glib())) } } } #[doc(hidden)] -impl ToGlib for Format { +impl IntoGlib for Format { type GlibType = ffi::GstFormat; - fn to_glib(&self) -> ffi::GstFormat { - match *self { + fn into_glib(self) -> ffi::GstFormat { + match self { Format::Undefined => ffi::GST_FORMAT_UNDEFINED, Format::Default => ffi::GST_FORMAT_DEFAULT, Format::Bytes => ffi::GST_FORMAT_BYTES, @@ -1223,7 +1223,7 @@ impl ToValue for Format { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1256,11 +1256,11 @@ pub enum LibraryError { } #[doc(hidden)] -impl ToGlib for LibraryError { +impl IntoGlib for LibraryError { type GlibType = ffi::GstLibraryError; - fn to_glib(&self) -> ffi::GstLibraryError { - match *self { + fn into_glib(self) -> ffi::GstLibraryError { + match self { LibraryError::Failed => ffi::GST_LIBRARY_ERROR_FAILED, LibraryError::TooLazy => ffi::GST_LIBRARY_ERROR_TOO_LAZY, LibraryError::Init => ffi::GST_LIBRARY_ERROR_INIT, @@ -1298,7 +1298,7 @@ impl ErrorDomain for LibraryError { } fn code(self) -> i32 { - self.to_glib() + self.into_glib() } fn from(code: i32) -> Option { @@ -1339,7 +1339,7 @@ impl ToValue for LibraryError { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1364,11 +1364,11 @@ pub enum PadDirection { } #[doc(hidden)] -impl ToGlib for PadDirection { +impl IntoGlib for PadDirection { type GlibType = ffi::GstPadDirection; - fn to_glib(&self) -> ffi::GstPadDirection { - match *self { + fn into_glib(self) -> ffi::GstPadDirection { + match self { PadDirection::Unknown => ffi::GST_PAD_UNKNOWN, PadDirection::Src => ffi::GST_PAD_SRC, PadDirection::Sink => ffi::GST_PAD_SINK, @@ -1413,7 +1413,7 @@ impl ToValue for PadDirection { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1447,11 +1447,11 @@ pub enum PadLinkReturn { } #[doc(hidden)] -impl ToGlib for PadLinkReturn { +impl IntoGlib for PadLinkReturn { type GlibType = ffi::GstPadLinkReturn; - fn to_glib(&self) -> ffi::GstPadLinkReturn { - match *self { + fn into_glib(self) -> ffi::GstPadLinkReturn { + match self { PadLinkReturn::Ok => ffi::GST_PAD_LINK_OK, PadLinkReturn::WrongHierarchy => ffi::GST_PAD_LINK_WRONG_HIERARCHY, PadLinkReturn::WasLinked => ffi::GST_PAD_LINK_WAS_LINKED, @@ -1504,7 +1504,7 @@ impl ToValue for PadLinkReturn { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1532,7 +1532,7 @@ impl PadMode { pub fn name<'a>(self) -> &'a str { unsafe { CStr::from_ptr( - ffi::gst_pad_mode_get_name(self.to_glib()) + ffi::gst_pad_mode_get_name(self.into_glib()) .as_ref() .expect("gst_pad_mode_get_name returned NULL"), ) @@ -1550,11 +1550,11 @@ impl fmt::Display for PadMode { } #[doc(hidden)] -impl ToGlib for PadMode { +impl IntoGlib for PadMode { type GlibType = ffi::GstPadMode; - fn to_glib(&self) -> ffi::GstPadMode { - match *self { + fn into_glib(self) -> ffi::GstPadMode { + match self { PadMode::None => ffi::GST_PAD_MODE_NONE, PadMode::Push => ffi::GST_PAD_MODE_PUSH, PadMode::Pull => ffi::GST_PAD_MODE_PULL, @@ -1599,7 +1599,7 @@ impl ToValue for PadMode { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1624,11 +1624,11 @@ pub enum PadPresence { } #[doc(hidden)] -impl ToGlib for PadPresence { +impl IntoGlib for PadPresence { type GlibType = ffi::GstPadPresence; - fn to_glib(&self) -> ffi::GstPadPresence { - match *self { + fn into_glib(self) -> ffi::GstPadPresence { + match self { PadPresence::Always => ffi::GST_PAD_ALWAYS, PadPresence::Sometimes => ffi::GST_PAD_SOMETIMES, PadPresence::Request => ffi::GST_PAD_REQUEST, @@ -1673,7 +1673,7 @@ impl ToValue for PadPresence { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1702,11 +1702,11 @@ pub enum PadProbeReturn { } #[doc(hidden)] -impl ToGlib for PadProbeReturn { +impl IntoGlib for PadProbeReturn { type GlibType = ffi::GstPadProbeReturn; - fn to_glib(&self) -> ffi::GstPadProbeReturn { - match *self { + fn into_glib(self) -> ffi::GstPadProbeReturn { + match self { PadProbeReturn::Drop => ffi::GST_PAD_PROBE_DROP, PadProbeReturn::Ok => ffi::GST_PAD_PROBE_OK, PadProbeReturn::Remove => ffi::GST_PAD_PROBE_REMOVE, @@ -1755,7 +1755,7 @@ impl ToValue for PadProbeReturn { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1790,11 +1790,11 @@ pub enum ParseError { } #[doc(hidden)] -impl ToGlib for ParseError { +impl IntoGlib for ParseError { type GlibType = ffi::GstParseError; - fn to_glib(&self) -> ffi::GstParseError { - match *self { + fn into_glib(self) -> ffi::GstParseError { + match self { ParseError::Syntax => ffi::GST_PARSE_ERROR_SYNTAX, ParseError::NoSuchElement => ffi::GST_PARSE_ERROR_NO_SUCH_ELEMENT, ParseError::NoSuchProperty => ffi::GST_PARSE_ERROR_NO_SUCH_PROPERTY, @@ -1834,7 +1834,7 @@ impl ErrorDomain for ParseError { } fn code(self) -> i32 { - self.to_glib() + self.into_glib() } fn from(code: i32) -> Option { @@ -1876,7 +1876,7 @@ impl ToValue for ParseError { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1901,11 +1901,11 @@ pub enum PluginError { } #[doc(hidden)] -impl ToGlib for PluginError { +impl IntoGlib for PluginError { type GlibType = ffi::GstPluginError; - fn to_glib(&self) -> ffi::GstPluginError { - match *self { + fn into_glib(self) -> ffi::GstPluginError { + match self { PluginError::Module => ffi::GST_PLUGIN_ERROR_MODULE, PluginError::Dependencies => ffi::GST_PLUGIN_ERROR_DEPENDENCIES, PluginError::NameMismatch => ffi::GST_PLUGIN_ERROR_NAME_MISMATCH, @@ -1935,7 +1935,7 @@ impl ErrorDomain for PluginError { } fn code(self) -> i32 { - self.to_glib() + self.into_glib() } fn from(code: i32) -> Option { @@ -1972,7 +1972,7 @@ impl ToValue for PluginError { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -2001,11 +2001,11 @@ pub enum ProgressType { } #[doc(hidden)] -impl ToGlib for ProgressType { +impl IntoGlib for ProgressType { type GlibType = ffi::GstProgressType; - fn to_glib(&self) -> ffi::GstProgressType { - match *self { + fn into_glib(self) -> ffi::GstProgressType { + match self { ProgressType::Start => ffi::GST_PROGRESS_TYPE_START, ProgressType::Continue => ffi::GST_PROGRESS_TYPE_CONTINUE, ProgressType::Complete => ffi::GST_PROGRESS_TYPE_COMPLETE, @@ -2054,7 +2054,7 @@ impl ToValue for ProgressType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -2085,11 +2085,11 @@ pub enum PromiseResult { #[cfg(any(feature = "v1_14", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_14")))] #[doc(hidden)] -impl ToGlib for PromiseResult { +impl IntoGlib for PromiseResult { type GlibType = ffi::GstPromiseResult; - fn to_glib(&self) -> ffi::GstPromiseResult { - match *self { + fn into_glib(self) -> ffi::GstPromiseResult { + match self { PromiseResult::Pending => ffi::GST_PROMISE_RESULT_PENDING, PromiseResult::Interrupted => ffi::GST_PROMISE_RESULT_INTERRUPTED, PromiseResult::Replied => ffi::GST_PROMISE_RESULT_REPLIED, @@ -2146,7 +2146,7 @@ impl ToValue for PromiseResult { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -2171,11 +2171,11 @@ pub enum QOSType { } #[doc(hidden)] -impl ToGlib for QOSType { +impl IntoGlib for QOSType { type GlibType = ffi::GstQOSType; - fn to_glib(&self) -> ffi::GstQOSType { - match *self { + fn into_glib(self) -> ffi::GstQOSType { + match self { QOSType::Overflow => ffi::GST_QOS_TYPE_OVERFLOW, QOSType::Underflow => ffi::GST_QOS_TYPE_UNDERFLOW, QOSType::Throttle => ffi::GST_QOS_TYPE_THROTTLE, @@ -2220,7 +2220,7 @@ impl ToValue for QOSType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -2247,11 +2247,11 @@ pub enum Rank { } #[doc(hidden)] -impl ToGlib for Rank { +impl IntoGlib for Rank { type GlibType = ffi::GstRank; - fn to_glib(&self) -> ffi::GstRank { - match *self { + fn into_glib(self) -> ffi::GstRank { + match self { Rank::None => ffi::GST_RANK_NONE, Rank::Marginal => ffi::GST_RANK_MARGINAL, Rank::Secondary => ffi::GST_RANK_SECONDARY, @@ -2298,7 +2298,7 @@ impl ToValue for Rank { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -2349,11 +2349,11 @@ pub enum ResourceError { } #[doc(hidden)] -impl ToGlib for ResourceError { +impl IntoGlib for ResourceError { type GlibType = ffi::GstResourceError; - fn to_glib(&self) -> ffi::GstResourceError { - match *self { + fn into_glib(self) -> ffi::GstResourceError { + match self { ResourceError::Failed => ffi::GST_RESOURCE_ERROR_FAILED, ResourceError::TooLazy => ffi::GST_RESOURCE_ERROR_TOO_LAZY, ResourceError::NotFound => ffi::GST_RESOURCE_ERROR_NOT_FOUND, @@ -2409,7 +2409,7 @@ impl ErrorDomain for ResourceError { } fn code(self) -> i32 { - self.to_glib() + self.into_glib() } fn from(code: i32) -> Option { @@ -2459,7 +2459,7 @@ impl ToValue for ResourceError { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -2484,11 +2484,11 @@ pub enum SeekType { } #[doc(hidden)] -impl ToGlib for SeekType { +impl IntoGlib for SeekType { type GlibType = ffi::GstSeekType; - fn to_glib(&self) -> ffi::GstSeekType { - match *self { + fn into_glib(self) -> ffi::GstSeekType { + match self { SeekType::None => ffi::GST_SEEK_TYPE_NONE, SeekType::Set => ffi::GST_SEEK_TYPE_SET, SeekType::End => ffi::GST_SEEK_TYPE_END, @@ -2533,7 +2533,7 @@ impl ToValue for SeekType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -2562,11 +2562,11 @@ pub enum State { } #[doc(hidden)] -impl ToGlib for State { +impl IntoGlib for State { type GlibType = ffi::GstState; - fn to_glib(&self) -> ffi::GstState { - match *self { + fn into_glib(self) -> ffi::GstState { + match self { State::VoidPending => ffi::GST_STATE_VOID_PENDING, State::Null => ffi::GST_STATE_NULL, State::Ready => ffi::GST_STATE_READY, @@ -2615,7 +2615,7 @@ impl ToValue for State { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -2661,11 +2661,11 @@ impl fmt::Display for StateChange { } #[doc(hidden)] -impl ToGlib for StateChange { +impl IntoGlib for StateChange { type GlibType = ffi::GstStateChange; - fn to_glib(&self) -> ffi::GstStateChange { - match *self { + fn into_glib(self) -> ffi::GstStateChange { + match self { StateChange::NullToReady => ffi::GST_STATE_CHANGE_NULL_TO_READY, StateChange::ReadyToPaused => ffi::GST_STATE_CHANGE_READY_TO_PAUSED, StateChange::PausedToPlaying => ffi::GST_STATE_CHANGE_PAUSED_TO_PLAYING, @@ -2724,7 +2724,7 @@ impl ToValue for StateChange { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -2752,11 +2752,11 @@ pub enum StateChangeReturn { } #[doc(hidden)] -impl ToGlib for StateChangeReturn { +impl IntoGlib for StateChangeReturn { type GlibType = ffi::GstStateChangeReturn; - fn to_glib(&self) -> ffi::GstStateChangeReturn { - match *self { + fn into_glib(self) -> ffi::GstStateChangeReturn { + match self { StateChangeReturn::Failure => ffi::GST_STATE_CHANGE_FAILURE, StateChangeReturn::Success => ffi::GST_STATE_CHANGE_SUCCESS, StateChangeReturn::Async => ffi::GST_STATE_CHANGE_ASYNC, @@ -2803,7 +2803,7 @@ impl ToValue for StateChangeReturn { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -2850,11 +2850,11 @@ pub enum StreamError { } #[doc(hidden)] -impl ToGlib for StreamError { +impl IntoGlib for StreamError { type GlibType = ffi::GstStreamError; - fn to_glib(&self) -> ffi::GstStreamError { - match *self { + fn into_glib(self) -> ffi::GstStreamError { + match self { StreamError::Failed => ffi::GST_STREAM_ERROR_FAILED, StreamError::TooLazy => ffi::GST_STREAM_ERROR_TOO_LAZY, StreamError::NotImplemented => ffi::GST_STREAM_ERROR_NOT_IMPLEMENTED, @@ -2906,7 +2906,7 @@ impl ErrorDomain for StreamError { } fn code(self) -> i32 { - self.to_glib() + self.into_glib() } fn from(code: i32) -> Option { @@ -2954,7 +2954,7 @@ impl ToValue for StreamError { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -2987,11 +2987,11 @@ pub enum StreamStatusType { } #[doc(hidden)] -impl ToGlib for StreamStatusType { +impl IntoGlib for StreamStatusType { type GlibType = ffi::GstStreamStatusType; - fn to_glib(&self) -> ffi::GstStreamStatusType { - match *self { + fn into_glib(self) -> ffi::GstStreamStatusType { + match self { StreamStatusType::Create => ffi::GST_STREAM_STATUS_TYPE_CREATE, StreamStatusType::Enter => ffi::GST_STREAM_STATUS_TYPE_ENTER, StreamStatusType::Leave => ffi::GST_STREAM_STATUS_TYPE_LEAVE, @@ -3044,7 +3044,7 @@ impl ToValue for StreamStatusType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -3067,11 +3067,11 @@ pub enum StructureChangeType { } #[doc(hidden)] -impl ToGlib for StructureChangeType { +impl IntoGlib for StructureChangeType { type GlibType = ffi::GstStructureChangeType; - fn to_glib(&self) -> ffi::GstStructureChangeType { - match *self { + fn into_glib(self) -> ffi::GstStructureChangeType { + match self { StructureChangeType::Link => ffi::GST_STRUCTURE_CHANGE_TYPE_PAD_LINK, StructureChangeType::Unlink => ffi::GST_STRUCTURE_CHANGE_TYPE_PAD_UNLINK, StructureChangeType::__Unknown(value) => value, @@ -3114,7 +3114,7 @@ impl ToValue for StructureChangeType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -3143,11 +3143,11 @@ pub enum TagFlag { } #[doc(hidden)] -impl ToGlib for TagFlag { +impl IntoGlib for TagFlag { type GlibType = ffi::GstTagFlag; - fn to_glib(&self) -> ffi::GstTagFlag { - match *self { + fn into_glib(self) -> ffi::GstTagFlag { + match self { TagFlag::Undefined => ffi::GST_TAG_FLAG_UNDEFINED, TagFlag::Meta => ffi::GST_TAG_FLAG_META, TagFlag::Encoded => ffi::GST_TAG_FLAG_ENCODED, @@ -3196,7 +3196,7 @@ impl ToValue for TagFlag { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -3231,11 +3231,11 @@ pub enum TagMergeMode { } #[doc(hidden)] -impl ToGlib for TagMergeMode { +impl IntoGlib for TagMergeMode { type GlibType = ffi::GstTagMergeMode; - fn to_glib(&self) -> ffi::GstTagMergeMode { - match *self { + fn into_glib(self) -> ffi::GstTagMergeMode { + match self { TagMergeMode::Undefined => ffi::GST_TAG_MERGE_UNDEFINED, TagMergeMode::ReplaceAll => ffi::GST_TAG_MERGE_REPLACE_ALL, TagMergeMode::Replace => ffi::GST_TAG_MERGE_REPLACE, @@ -3290,7 +3290,7 @@ impl ToValue for TagMergeMode { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -3314,11 +3314,11 @@ pub enum TagScope { } #[doc(hidden)] -impl ToGlib for TagScope { +impl IntoGlib for TagScope { type GlibType = ffi::GstTagScope; - fn to_glib(&self) -> ffi::GstTagScope { - match *self { + fn into_glib(self) -> ffi::GstTagScope { + match self { TagScope::Stream => ffi::GST_TAG_SCOPE_STREAM, TagScope::Global => ffi::GST_TAG_SCOPE_GLOBAL, TagScope::__Unknown(value) => value, @@ -3361,7 +3361,7 @@ impl ToValue for TagScope { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -3386,11 +3386,11 @@ pub enum TaskState { } #[doc(hidden)] -impl ToGlib for TaskState { +impl IntoGlib for TaskState { type GlibType = ffi::GstTaskState; - fn to_glib(&self) -> ffi::GstTaskState { - match *self { + fn into_glib(self) -> ffi::GstTaskState { + match self { TaskState::Started => ffi::GST_TASK_STARTED, TaskState::Stopped => ffi::GST_TASK_STOPPED, TaskState::Paused => ffi::GST_TASK_PAUSED, @@ -3435,7 +3435,7 @@ impl ToValue for TaskState { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -3472,7 +3472,7 @@ impl TocEntryType { pub fn nick<'a>(self) -> &'a str { unsafe { CStr::from_ptr( - ffi::gst_toc_entry_type_get_nick(self.to_glib()) + ffi::gst_toc_entry_type_get_nick(self.into_glib()) .as_ref() .expect("gst_toc_entry_type_get_nick returned NULL"), ) @@ -3483,11 +3483,11 @@ impl TocEntryType { } #[doc(hidden)] -impl ToGlib for TocEntryType { +impl IntoGlib for TocEntryType { type GlibType = ffi::GstTocEntryType; - fn to_glib(&self) -> ffi::GstTocEntryType { - match *self { + fn into_glib(self) -> ffi::GstTocEntryType { + match self { TocEntryType::Angle => ffi::GST_TOC_ENTRY_TYPE_ANGLE, TocEntryType::Version => ffi::GST_TOC_ENTRY_TYPE_VERSION, TocEntryType::Edition => ffi::GST_TOC_ENTRY_TYPE_EDITION, @@ -3540,7 +3540,7 @@ impl ToValue for TocEntryType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -3568,11 +3568,11 @@ pub enum TocLoopType { } #[doc(hidden)] -impl ToGlib for TocLoopType { +impl IntoGlib for TocLoopType { type GlibType = ffi::GstTocLoopType; - fn to_glib(&self) -> ffi::GstTocLoopType { - match *self { + fn into_glib(self) -> ffi::GstTocLoopType { + match self { TocLoopType::None => ffi::GST_TOC_LOOP_NONE, TocLoopType::Forward => ffi::GST_TOC_LOOP_FORWARD, TocLoopType::Reverse => ffi::GST_TOC_LOOP_REVERSE, @@ -3619,7 +3619,7 @@ impl ToValue for TocLoopType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -3643,11 +3643,11 @@ pub enum TocScope { } #[doc(hidden)] -impl ToGlib for TocScope { +impl IntoGlib for TocScope { type GlibType = ffi::GstTocScope; - fn to_glib(&self) -> ffi::GstTocScope { - match *self { + fn into_glib(self) -> ffi::GstTocScope { + match self { TocScope::Global => ffi::GST_TOC_SCOPE_GLOBAL, TocScope::Current => ffi::GST_TOC_SCOPE_CURRENT, TocScope::__Unknown(value) => value, @@ -3690,7 +3690,7 @@ impl ToValue for TocScope { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -3721,11 +3721,11 @@ pub enum TypeFindProbability { } #[doc(hidden)] -impl ToGlib for TypeFindProbability { +impl IntoGlib for TypeFindProbability { type GlibType = ffi::GstTypeFindProbability; - fn to_glib(&self) -> ffi::GstTypeFindProbability { - match *self { + fn into_glib(self) -> ffi::GstTypeFindProbability { + match self { TypeFindProbability::None => ffi::GST_TYPE_FIND_NONE, TypeFindProbability::Minimum => ffi::GST_TYPE_FIND_MINIMUM, TypeFindProbability::Possible => ffi::GST_TYPE_FIND_POSSIBLE, @@ -3776,7 +3776,7 @@ impl ToValue for TypeFindProbability { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -3803,11 +3803,11 @@ pub enum URIError { } #[doc(hidden)] -impl ToGlib for URIError { +impl IntoGlib for URIError { type GlibType = ffi::GstURIError; - fn to_glib(&self) -> ffi::GstURIError { - match *self { + fn into_glib(self) -> ffi::GstURIError { + match self { URIError::UnsupportedProtocol => ffi::GST_URI_ERROR_UNSUPPORTED_PROTOCOL, URIError::BadUri => ffi::GST_URI_ERROR_BAD_URI, URIError::BadState => ffi::GST_URI_ERROR_BAD_STATE, @@ -3839,7 +3839,7 @@ impl ErrorDomain for URIError { } fn code(self) -> i32 { - self.to_glib() + self.into_glib() } fn from(code: i32) -> Option { @@ -3877,7 +3877,7 @@ impl ToValue for URIError { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -3902,11 +3902,11 @@ pub enum URIType { } #[doc(hidden)] -impl ToGlib for URIType { +impl IntoGlib for URIType { type GlibType = ffi::GstURIType; - fn to_glib(&self) -> ffi::GstURIType { - match *self { + fn into_glib(self) -> ffi::GstURIType { + match self { URIType::Unknown => ffi::GST_URI_UNKNOWN, URIType::Sink => ffi::GST_URI_SINK, URIType::Src => ffi::GST_URI_SRC, @@ -3951,7 +3951,7 @@ impl ToValue for URIType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_enum(value.to_glib_none_mut().0, self.into_glib()); } value } diff --git a/gstreamer/src/auto/flags.rs b/gstreamer/src/auto/flags.rs index fb0249bd0..41cdb7250 100644 --- a/gstreamer/src/auto/flags.rs +++ b/gstreamer/src/auto/flags.rs @@ -26,10 +26,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for BinFlags { +impl IntoGlib for BinFlags { type GlibType = ffi::GstBinFlags; - fn to_glib(&self) -> ffi::GstBinFlags { + fn into_glib(self) -> ffi::GstBinFlags { self.bits() } } @@ -65,7 +65,7 @@ impl ToValue for BinFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -87,10 +87,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for BufferCopyFlags { +impl IntoGlib for BufferCopyFlags { type GlibType = ffi::GstBufferCopyFlags; - fn to_glib(&self) -> ffi::GstBufferCopyFlags { + fn into_glib(self) -> ffi::GstBufferCopyFlags { self.bits() } } @@ -126,7 +126,7 @@ impl ToValue for BufferCopyFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -158,10 +158,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for BufferFlags { +impl IntoGlib for BufferFlags { type GlibType = ffi::GstBufferFlags; - fn to_glib(&self) -> ffi::GstBufferFlags { + fn into_glib(self) -> ffi::GstBufferFlags { self.bits() } } @@ -197,7 +197,7 @@ impl ToValue for BufferFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -216,10 +216,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for BufferPoolAcquireFlags { +impl IntoGlib for BufferPoolAcquireFlags { type GlibType = ffi::GstBufferPoolAcquireFlags; - fn to_glib(&self) -> ffi::GstBufferPoolAcquireFlags { + fn into_glib(self) -> ffi::GstBufferPoolAcquireFlags { self.bits() } } @@ -255,7 +255,7 @@ impl ToValue for BufferPoolAcquireFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -278,10 +278,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for ClockFlags { +impl IntoGlib for ClockFlags { type GlibType = ffi::GstClockFlags; - fn to_glib(&self) -> ffi::GstClockFlags { + fn into_glib(self) -> ffi::GstClockFlags { self.bits() } } @@ -317,7 +317,7 @@ impl ToValue for ClockFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -351,10 +351,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for DebugColorFlags { +impl IntoGlib for DebugColorFlags { type GlibType = ffi::GstDebugColorFlags; - fn to_glib(&self) -> ffi::GstDebugColorFlags { + fn into_glib(self) -> ffi::GstDebugColorFlags { self.bits() } } @@ -390,7 +390,7 @@ impl ToValue for DebugColorFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -413,10 +413,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for DebugGraphDetails { +impl IntoGlib for DebugGraphDetails { type GlibType = ffi::GstDebugGraphDetails; - fn to_glib(&self) -> ffi::GstDebugGraphDetails { + fn into_glib(self) -> ffi::GstDebugGraphDetails { self.bits() } } @@ -452,7 +452,7 @@ impl ToValue for DebugGraphDetails { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -474,10 +474,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for ElementFlags { +impl IntoGlib for ElementFlags { type GlibType = ffi::GstElementFlags; - fn to_glib(&self) -> ffi::GstElementFlags { + fn into_glib(self) -> ffi::GstElementFlags { self.bits() } } @@ -513,7 +513,7 @@ impl ToValue for ElementFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -534,10 +534,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for EventTypeFlags { +impl IntoGlib for EventTypeFlags { type GlibType = ffi::GstEventTypeFlags; - fn to_glib(&self) -> ffi::GstEventTypeFlags { + fn into_glib(self) -> ffi::GstEventTypeFlags { self.bits() } } @@ -573,7 +573,7 @@ impl ToValue for EventTypeFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -595,10 +595,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for MemoryFlags { +impl IntoGlib for MemoryFlags { type GlibType = ffi::GstMemoryFlags; - fn to_glib(&self) -> ffi::GstMemoryFlags { + fn into_glib(self) -> ffi::GstMemoryFlags { self.bits() } } @@ -634,7 +634,7 @@ impl ToValue for MemoryFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -653,10 +653,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for ObjectFlags { +impl IntoGlib for ObjectFlags { type GlibType = ffi::GstObjectFlags; - fn to_glib(&self) -> ffi::GstObjectFlags { + fn into_glib(self) -> ffi::GstObjectFlags { self.bits() } } @@ -692,7 +692,7 @@ impl ToValue for ObjectFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -721,10 +721,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for PadFlags { +impl IntoGlib for PadFlags { type GlibType = ffi::GstPadFlags; - fn to_glib(&self) -> ffi::GstPadFlags { + fn into_glib(self) -> ffi::GstPadFlags { self.bits() } } @@ -760,7 +760,7 @@ impl ToValue for PadFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -781,10 +781,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for PadLinkCheck { +impl IntoGlib for PadLinkCheck { type GlibType = ffi::GstPadLinkCheck; - fn to_glib(&self) -> ffi::GstPadLinkCheck { + fn into_glib(self) -> ffi::GstPadLinkCheck { self.bits() } } @@ -820,7 +820,7 @@ impl ToValue for PadLinkCheck { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -857,10 +857,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for PadProbeType { +impl IntoGlib for PadProbeType { type GlibType = ffi::GstPadProbeType; - fn to_glib(&self) -> ffi::GstPadProbeType { + fn into_glib(self) -> ffi::GstPadProbeType { self.bits() } } @@ -896,7 +896,7 @@ impl ToValue for PadProbeType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -917,10 +917,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for ParseFlags { +impl IntoGlib for ParseFlags { type GlibType = ffi::GstParseFlags; - fn to_glib(&self) -> ffi::GstParseFlags { + fn into_glib(self) -> ffi::GstParseFlags { self.bits() } } @@ -956,7 +956,7 @@ impl ToValue for ParseFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -973,10 +973,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for PipelineFlags { +impl IntoGlib for PipelineFlags { type GlibType = ffi::GstPipelineFlags; - fn to_glib(&self) -> ffi::GstPipelineFlags { + fn into_glib(self) -> ffi::GstPipelineFlags { self.bits() } } @@ -1012,7 +1012,7 @@ impl ToValue for PipelineFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1033,10 +1033,10 @@ bitflags! { #[cfg(any(feature = "v1_18", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_18")))] #[doc(hidden)] -impl ToGlib for PluginAPIFlags { +impl IntoGlib for PluginAPIFlags { type GlibType = ffi::GstPluginAPIFlags; - fn to_glib(&self) -> ffi::GstPluginAPIFlags { + fn into_glib(self) -> ffi::GstPluginAPIFlags { self.bits() } } @@ -1082,7 +1082,7 @@ impl ToValue for PluginAPIFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1103,10 +1103,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for PluginDependencyFlags { +impl IntoGlib for PluginDependencyFlags { type GlibType = ffi::GstPluginDependencyFlags; - fn to_glib(&self) -> ffi::GstPluginDependencyFlags { + fn into_glib(self) -> ffi::GstPluginDependencyFlags { self.bits() } } @@ -1142,7 +1142,7 @@ impl ToValue for PluginDependencyFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1160,10 +1160,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for PluginFlags { +impl IntoGlib for PluginFlags { type GlibType = ffi::GstPluginFlags; - fn to_glib(&self) -> ffi::GstPluginFlags { + fn into_glib(self) -> ffi::GstPluginFlags { self.bits() } } @@ -1199,7 +1199,7 @@ impl ToValue for PluginFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1218,10 +1218,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for SchedulingFlags { +impl IntoGlib for SchedulingFlags { type GlibType = ffi::GstSchedulingFlags; - fn to_glib(&self) -> ffi::GstSchedulingFlags { + fn into_glib(self) -> ffi::GstSchedulingFlags { self.bits() } } @@ -1257,7 +1257,7 @@ impl ToValue for SchedulingFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1290,10 +1290,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for SeekFlags { +impl IntoGlib for SeekFlags { type GlibType = ffi::GstSeekFlags; - fn to_glib(&self) -> ffi::GstSeekFlags { + fn into_glib(self) -> ffi::GstSeekFlags { self.bits() } } @@ -1329,7 +1329,7 @@ impl ToValue for SeekFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1355,10 +1355,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for SegmentFlags { +impl IntoGlib for SegmentFlags { type GlibType = ffi::GstSegmentFlags; - fn to_glib(&self) -> ffi::GstSegmentFlags { + fn into_glib(self) -> ffi::GstSegmentFlags { self.bits() } } @@ -1394,7 +1394,7 @@ impl ToValue for SegmentFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1415,10 +1415,10 @@ bitflags! { #[cfg(any(feature = "v1_12", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_12")))] #[doc(hidden)] -impl ToGlib for StackTraceFlags { +impl IntoGlib for StackTraceFlags { type GlibType = ffi::GstStackTraceFlags; - fn to_glib(&self) -> ffi::GstStackTraceFlags { + fn into_glib(self) -> ffi::GstStackTraceFlags { self.bits() } } @@ -1464,7 +1464,7 @@ impl ToValue for StackTraceFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1483,10 +1483,10 @@ bitflags! { } #[doc(hidden)] -impl ToGlib for StreamFlags { +impl IntoGlib for StreamFlags { type GlibType = ffi::GstStreamFlags; - fn to_glib(&self) -> ffi::GstStreamFlags { + fn into_glib(self) -> ffi::GstStreamFlags { self.bits() } } @@ -1522,7 +1522,7 @@ impl ToValue for StreamFlags { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } @@ -1550,7 +1550,7 @@ impl StreamType { pub fn name<'a>(self) -> &'a str { unsafe { CStr::from_ptr( - ffi::gst_stream_type_get_name(self.to_glib()) + ffi::gst_stream_type_get_name(self.into_glib()) .as_ref() .expect("gst_stream_type_get_name returned NULL"), ) @@ -1572,10 +1572,10 @@ impl fmt::Display for StreamType { #[cfg(any(feature = "v1_10", feature = "dox"))] #[cfg_attr(feature = "dox", doc(cfg(feature = "v1_10")))] #[doc(hidden)] -impl ToGlib for StreamType { +impl IntoGlib for StreamType { type GlibType = ffi::GstStreamType; - fn to_glib(&self) -> ffi::GstStreamType { + fn into_glib(self) -> ffi::GstStreamType { self.bits() } } @@ -1621,7 +1621,7 @@ impl ToValue for StreamType { fn to_value(&self) -> glib::Value { let mut value = glib::Value::for_value_type::(); unsafe { - glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.to_glib()); + glib::gobject_ffi::g_value_set_flags(value.to_glib_none_mut().0, self.into_glib()); } value } diff --git a/gstreamer/src/auto/functions.rs b/gstreamer/src/auto/functions.rs index cb570cf61..cda9fddd3 100644 --- a/gstreamer/src/auto/functions.rs +++ b/gstreamer/src/auto/functions.rs @@ -35,7 +35,7 @@ pub fn debug_bin_to_dot_data>(bin: &P, details: DebugGraphDetails) - unsafe { from_glib_full(ffi::gst_debug_bin_to_dot_data( bin.as_ref().to_glib_none().0, - details.to_glib(), + details.into_glib(), )) } } @@ -50,7 +50,7 @@ pub fn debug_bin_to_dot_file, Q: AsRef>( unsafe { ffi::gst_debug_bin_to_dot_file( bin.as_ref().to_glib_none().0, - details.to_glib(), + details.into_glib(), file_name.as_ref().to_glib_none().0, ); } @@ -66,7 +66,7 @@ pub fn debug_bin_to_dot_file_with_ts, Q: AsRef>( unsafe { ffi::gst_debug_bin_to_dot_file_with_ts( bin.as_ref().to_glib_none().0, - details.to_glib(), + details.into_glib(), file_name.as_ref().to_glib_none().0, ); } @@ -84,7 +84,7 @@ pub fn debug_get_default_threshold() -> DebugLevel { pub fn debug_get_stack_trace(flags: StackTraceFlags) -> Result { skip_assert_initialized!(); unsafe { - Option::<_>::from_glib_full(ffi::gst_debug_get_stack_trace(flags.to_glib())) + Option::<_>::from_glib_full(ffi::gst_debug_get_stack_trace(flags.into_glib())) .ok_or_else(|| glib::bool_error!("Failed to get stack trace")) } } @@ -131,7 +131,7 @@ pub fn debug_ring_buffer_logger_get_logs() -> Vec { pub fn debug_set_active(active: bool) { skip_assert_initialized!(); unsafe { - ffi::gst_debug_set_active(active.to_glib()); + ffi::gst_debug_set_active(active.into_glib()); } } @@ -139,7 +139,7 @@ pub fn debug_set_active(active: bool) { pub fn debug_set_colored(colored: bool) { skip_assert_initialized!(); unsafe { - ffi::gst_debug_set_colored(colored.to_glib()); + ffi::gst_debug_set_colored(colored.into_glib()); } } @@ -147,7 +147,7 @@ pub fn debug_set_colored(colored: bool) { pub fn debug_set_default_threshold(level: DebugLevel) { skip_assert_initialized!(); unsafe { - ffi::gst_debug_set_default_threshold(level.to_glib()); + ffi::gst_debug_set_default_threshold(level.into_glib()); } } @@ -155,7 +155,7 @@ pub fn debug_set_default_threshold(level: DebugLevel) { pub fn debug_set_threshold_for_name(name: &str, level: DebugLevel) { skip_assert_initialized!(); unsafe { - ffi::gst_debug_set_threshold_for_name(name.to_glib_none().0, level.to_glib()); + ffi::gst_debug_set_threshold_for_name(name.to_glib_none().0, level.into_glib()); } } @@ -163,7 +163,7 @@ pub fn debug_set_threshold_for_name(name: &str, level: DebugLevel) { pub fn debug_set_threshold_from_string(list: &str, reset: bool) { skip_assert_initialized!(); unsafe { - ffi::gst_debug_set_threshold_from_string(list.to_glib_none().0, reset.to_glib()); + ffi::gst_debug_set_threshold_from_string(list.to_glib_none().0, reset.into_glib()); } } @@ -196,7 +196,7 @@ pub fn parse_bin_from_description( let mut error = ptr::null_mut(); let ret = ffi::gst_parse_bin_from_description( bin_description.to_glib_none().0, - ghost_unlinked_pads.to_glib(), + ghost_unlinked_pads.into_glib(), &mut error, ); if error.is_null() { @@ -253,7 +253,7 @@ pub fn parse_launchv(argv: &[&str]) -> Result { pub fn type_mark_as_plugin_api(type_: glib::types::Type, flags: PluginAPIFlags) { assert_initialized_main_thread!(); unsafe { - ffi::gst_type_mark_as_plugin_api(type_.to_glib(), flags.to_glib()); + ffi::gst_type_mark_as_plugin_api(type_.into_glib(), flags.into_glib()); } } diff --git a/gstreamer/src/auto/object.rs b/gstreamer/src/auto/object.rs index d48f244e1..4c2160134 100644 --- a/gstreamer/src/auto/object.rs +++ b/gstreamer/src/auto/object.rs @@ -201,7 +201,7 @@ impl> GstObjectExt for O { from_glib_full(ffi::gst_object_get_value( self.as_ref().to_glib_none().0, property_name.to_glib_none().0, - timestamp.to_glib(), + timestamp.into_glib(), )) } } @@ -259,7 +259,7 @@ impl> GstObjectExt for O { ffi::gst_object_set_control_binding_disabled( self.as_ref().to_glib_none().0, property_name.to_glib_none().0, - disabled.to_glib(), + disabled.into_glib(), ); } } @@ -268,7 +268,7 @@ impl> GstObjectExt for O { unsafe { ffi::gst_object_set_control_bindings_disabled( self.as_ref().to_glib_none().0, - disabled.to_glib(), + disabled.into_glib(), ); } } @@ -277,7 +277,7 @@ impl> GstObjectExt for O { unsafe { ffi::gst_object_set_control_rate( self.as_ref().to_glib_none().0, - control_rate.to_glib(), + control_rate.into_glib(), ); } } @@ -305,7 +305,7 @@ impl> GstObjectExt for O { fn sync_values(&self, timestamp: ClockTime) -> Result<(), glib::error::BoolError> { unsafe { glib::result_from_gboolean!( - ffi::gst_object_sync_values(self.as_ref().to_glib_none().0, timestamp.to_glib()), + ffi::gst_object_sync_values(self.as_ref().to_glib_none().0, timestamp.into_glib()), "Failed to sync values" ) } diff --git a/gstreamer/src/auto/pad.rs b/gstreamer/src/auto/pad.rs index 55ae97bf1..098177435 100644 --- a/gstreamer/src/auto/pad.rs +++ b/gstreamer/src/auto/pad.rs @@ -215,8 +215,8 @@ impl> PadExt for O { glib::result_from_gboolean!( ffi::gst_pad_activate_mode( self.as_ref().to_glib_none().0, - mode.to_glib(), - active.to_glib() + mode.into_glib(), + active.into_glib() ), "Failed to activate mode pad" ) @@ -271,7 +271,7 @@ impl> PadExt for O { let pad = from_glib_borrow(pad); let callback: *mut P = user_data as *const _ as usize as *mut P; let res = (*callback)(&pad); - res.to_glib() + res.into_glib() } let forward = Some(forward_func::

as _); let super_callback0: &P = &forward_data; @@ -354,7 +354,7 @@ impl> PadExt for O { unsafe { from_glib_full(ffi::gst_pad_get_sticky_event( self.as_ref().to_glib_none().0, - event_type.to_glib(), + event_type.into_glib(), idx, )) } @@ -434,7 +434,7 @@ impl> PadExt for O { ffi::gst_pad_link_maybe_ghosting_full( self.as_ref().to_glib_none().0, sink.as_ref().to_glib_none().0, - flags.to_glib() + flags.into_glib() ), "Failed to link pads, possibly ghosting" ) @@ -503,7 +503,7 @@ impl> PadExt for O { fn set_active(&self, active: bool) -> Result<(), glib::error::BoolError> { unsafe { glib::result_from_gboolean!( - ffi::gst_pad_set_active(self.as_ref().to_glib_none().0, active.to_glib()), + ffi::gst_pad_set_active(self.as_ref().to_glib_none().0, active.into_glib()), "Failed to activate pad" ) } diff --git a/gstreamer/src/auto/pad_template.rs b/gstreamer/src/auto/pad_template.rs index 53f1900a5..edcaf0887 100644 --- a/gstreamer/src/auto/pad_template.rs +++ b/gstreamer/src/auto/pad_template.rs @@ -37,8 +37,8 @@ impl PadTemplate { unsafe { Option::<_>::from_glib_none(ffi::gst_pad_template_new( name_template.to_glib_none().0, - direction.to_glib(), - presence.to_glib(), + direction.into_glib(), + presence.into_glib(), caps.to_glib_none().0, )) .ok_or_else(|| glib::bool_error!("Failed to create pad template")) @@ -59,10 +59,10 @@ impl PadTemplate { unsafe { Option::<_>::from_glib_none(ffi::gst_pad_template_new_with_gtype( name_template.to_glib_none().0, - direction.to_glib(), - presence.to_glib(), + direction.into_glib(), + presence.into_glib(), caps.to_glib_none().0, - pad_type.to_glib(), + pad_type.into_glib(), )) .ok_or_else(|| glib::bool_error!("Failed to create pad template")) } diff --git a/gstreamer/src/auto/pipeline.rs b/gstreamer/src/auto/pipeline.rs index ac56b8ac9..6a2413b28 100644 --- a/gstreamer/src/auto/pipeline.rs +++ b/gstreamer/src/auto/pipeline.rs @@ -123,20 +123,20 @@ impl> PipelineExt for O { unsafe { ffi::gst_pipeline_set_auto_flush_bus( self.as_ref().to_glib_none().0, - auto_flush.to_glib(), + auto_flush.into_glib(), ); } } fn set_delay(&self, delay: ClockTime) { unsafe { - ffi::gst_pipeline_set_delay(self.as_ref().to_glib_none().0, delay.to_glib()); + ffi::gst_pipeline_set_delay(self.as_ref().to_glib_none().0, delay.into_glib()); } } fn set_latency(&self, latency: ClockTime) { unsafe { - ffi::gst_pipeline_set_latency(self.as_ref().to_glib_none().0, latency.to_glib()); + ffi::gst_pipeline_set_latency(self.as_ref().to_glib_none().0, latency.into_glib()); } } diff --git a/gstreamer/src/auto/plugin.rs b/gstreamer/src/auto/plugin.rs index 797fd0040..f6a390356 100644 --- a/gstreamer/src/auto/plugin.rs +++ b/gstreamer/src/auto/plugin.rs @@ -31,7 +31,7 @@ impl Plugin { env_vars.to_glib_none().0, paths.to_glib_none().0, names.to_glib_none().0, - flags.to_glib(), + flags.into_glib(), ); } } @@ -50,7 +50,7 @@ impl Plugin { env_vars.to_glib_none().0, paths.to_glib_none().0, names.to_glib_none().0, - flags.to_glib(), + flags.into_glib(), ); } } diff --git a/gstreamer/src/auto/registry.rs b/gstreamer/src/auto/registry.rs index 167c95f5f..e636d22fc 100644 --- a/gstreamer/src/auto/registry.rs +++ b/gstreamer/src/auto/registry.rs @@ -82,7 +82,7 @@ impl Registry { let feature = from_glib_borrow(feature); let callback: *mut P = user_data as *const _ as usize as *mut P; let res = (*callback)(&feature); - res.to_glib() + res.into_glib() } let filter = Some(filter_func::

as _); let super_callback0: &P = &filter_data; @@ -90,7 +90,7 @@ impl Registry { FromGlibPtrContainer::from_glib_full(ffi::gst_registry_feature_filter( self.to_glib_none().0, filter, - first.to_glib(), + first.into_glib(), super_callback0 as *const _ as usize as *mut _, )) } @@ -102,7 +102,7 @@ impl Registry { from_glib_full(ffi::gst_registry_find_feature( self.to_glib_none().0, name.to_glib_none().0, - type_.to_glib(), + type_.into_glib(), )) } } @@ -122,7 +122,7 @@ impl Registry { unsafe { FromGlibPtrContainer::from_glib_full(ffi::gst_registry_get_feature_list( self.to_glib_none().0, - type_.to_glib(), + type_.into_glib(), )) } } @@ -181,7 +181,7 @@ impl Registry { let plugin = from_glib_borrow(plugin); let callback: *mut P = user_data as *const _ as usize as *mut P; let res = (*callback)(&plugin); - res.to_glib() + res.into_glib() } let filter = Some(filter_func::

as _); let super_callback0: &P = &filter_data; @@ -189,7 +189,7 @@ impl Registry { FromGlibPtrContainer::from_glib_full(ffi::gst_registry_plugin_filter( self.to_glib_none().0, filter, - first.to_glib(), + first.into_glib(), super_callback0 as *const _ as usize as *mut _, )) } diff --git a/gstreamer/src/auto/stream.rs b/gstreamer/src/auto/stream.rs index bfcb5d9b3..41dd62711 100644 --- a/gstreamer/src/auto/stream.rs +++ b/gstreamer/src/auto/stream.rs @@ -59,14 +59,14 @@ impl Stream { #[doc(alias = "gst_stream_set_stream_flags")] pub fn set_stream_flags(&self, flags: StreamFlags) { unsafe { - ffi::gst_stream_set_stream_flags(self.to_glib_none().0, flags.to_glib()); + ffi::gst_stream_set_stream_flags(self.to_glib_none().0, flags.into_glib()); } } #[doc(alias = "gst_stream_set_stream_type")] pub fn set_stream_type(&self, stream_type: StreamType) { unsafe { - ffi::gst_stream_set_stream_type(self.to_glib_none().0, stream_type.to_glib()); + ffi::gst_stream_set_stream_type(self.to_glib_none().0, stream_type.into_glib()); } } diff --git a/gstreamer/src/auto/tag_setter.rs b/gstreamer/src/auto/tag_setter.rs index 2c03ce911..8c85876da 100644 --- a/gstreamer/src/auto/tag_setter.rs +++ b/gstreamer/src/auto/tag_setter.rs @@ -90,7 +90,7 @@ impl> TagSetterExt for O { ffi::gst_tag_setter_merge_tags( self.as_ref().to_glib_none().0, list.to_glib_none().0, - mode.to_glib(), + mode.into_glib(), ); } } @@ -103,7 +103,10 @@ impl> TagSetterExt for O { fn set_tag_merge_mode(&self, mode: TagMergeMode) { unsafe { - ffi::gst_tag_setter_set_tag_merge_mode(self.as_ref().to_glib_none().0, mode.to_glib()); + ffi::gst_tag_setter_set_tag_merge_mode( + self.as_ref().to_glib_none().0, + mode.into_glib(), + ); } } } diff --git a/gstreamer/src/auto/versions.txt b/gstreamer/src/auto/versions.txt index e31790782..47c89fa9e 100644 --- a/gstreamer/src/auto/versions.txt +++ b/gstreamer/src/auto/versions.txt @@ -1,3 +1,3 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) diff --git a/gstreamer/sys/build.rs b/gstreamer/sys/build.rs index c7e114aaa..526a151cd 100644 --- a/gstreamer/sys/build.rs +++ b/gstreamer/sys/build.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer/sys/src/lib.rs b/gstreamer/sys/src/lib.rs index 5ba2863be..100d49e88 100644 --- a/gstreamer/sys/src/lib.rs +++ b/gstreamer/sys/src/lib.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer/sys/tests/abi.rs b/gstreamer/sys/tests/abi.rs index 621b13f3b..f97f38396 100644 --- a/gstreamer/sys/tests/abi.rs +++ b/gstreamer/sys/tests/abi.rs @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer/sys/tests/constant.c b/gstreamer/sys/tests/constant.c index fe44525fe..61134db40 100644 --- a/gstreamer/sys/tests/constant.c +++ b/gstreamer/sys/tests/constant.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT diff --git a/gstreamer/sys/tests/layout.c b/gstreamer/sys/tests/layout.c index 086e7c31c..6e16eb9b4 100644 --- a/gstreamer/sys/tests/layout.c +++ b/gstreamer/sys/tests/layout.c @@ -1,4 +1,4 @@ -// Generated by gir (https://github.com/gtk-rs/gir @ 3698e6a) +// Generated by gir (https://github.com/gtk-rs/gir @ 1a0921b) // from gir-files (https://github.com/gtk-rs/gir-files @ 6088bb6) // from gst-gir-files (https://gitlab.freedesktop.org/gstreamer/gir-files-rs.git @ 208138a) // DO NOT EDIT