From 7b2fe31cc1474b7a015229cb242362f52e62bd9d Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Thu, 11 Jun 2020 12:27:43 +0200 Subject: [PATCH] update gir generator and regenerate --- gir | 2 +- gstreamer-app/src/auto/versions.txt | 4 ++-- gstreamer-audio/src/auto/versions.txt | 4 ++-- gstreamer-base/src/auto/versions.txt | 4 ++-- gstreamer-check/src/auto/test_clock.rs | 2 +- gstreamer-check/src/auto/versions.txt | 4 ++-- gstreamer-editing-services/src/auto/timeline.rs | 2 +- gstreamer-editing-services/src/auto/versions.txt | 4 ++-- gstreamer-gl/src/auto/gl_display_egl.rs | 2 +- gstreamer-gl/src/auto/gl_display_wayland.rs | 2 +- gstreamer-gl/src/auto/gl_display_x11.rs | 2 +- gstreamer-gl/src/auto/gl_framebuffer.rs | 2 +- gstreamer-gl/src/auto/gl_shader.rs | 2 +- gstreamer-gl/src/auto/glsl_stage.rs | 4 ++-- gstreamer-gl/src/auto/versions.txt | 4 ++-- gstreamer-net/src/auto/versions.txt | 4 ++-- gstreamer-pbutils/src/auto/versions.txt | 4 ++-- gstreamer-player/src/auto/versions.txt | 4 ++-- gstreamer-rtp/src/auto/versions.txt | 4 ++-- gstreamer-rtsp-server/src/auto/versions.txt | 4 ++-- gstreamer-rtsp/src/auto/versions.txt | 4 ++-- gstreamer-sdp/src/auto/versions.txt | 4 ++-- gstreamer-video/src/auto/versions.txt | 4 ++-- gstreamer-webrtc/src/auto/versions.txt | 4 ++-- gstreamer/src/auto/date_time.rs | 12 ++++++------ gstreamer/src/auto/pad.rs | 2 +- gstreamer/src/auto/pad_template.rs | 2 +- gstreamer/src/auto/versions.txt | 4 ++-- gstreamer/src/date_time.rs | 6 +++--- gstreamer/src/subclass/element.rs | 4 ++-- 30 files changed, 55 insertions(+), 55 deletions(-) diff --git a/gir b/gir index 2ec58ef60..882e09b8a 160000 --- a/gir +++ b/gir @@ -1 +1 @@ -Subproject commit 2ec58ef60208c53e10d22dadf89fa95b80e1f945 +Subproject commit 882e09b8a2e68300689d215a2333d5e8747b60d9 diff --git a/gstreamer-app/src/auto/versions.txt b/gstreamer-app/src/auto/versions.txt index e35f31b1c..9f53a6200 100644 --- a/gstreamer-app/src/auto/versions.txt +++ b/gstreamer-app/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 2ec58ef) -from gir-files (https://github.com/gtk-rs/gir-files @ 9cf46cf7) +Generated by gir (https://github.com/gtk-rs/gir @ 882e09b) +from gir-files (https://github.com/gtk-rs/gir-files @ 38361831) diff --git a/gstreamer-audio/src/auto/versions.txt b/gstreamer-audio/src/auto/versions.txt index e35f31b1c..9f53a6200 100644 --- a/gstreamer-audio/src/auto/versions.txt +++ b/gstreamer-audio/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 2ec58ef) -from gir-files (https://github.com/gtk-rs/gir-files @ 9cf46cf7) +Generated by gir (https://github.com/gtk-rs/gir @ 882e09b) +from gir-files (https://github.com/gtk-rs/gir-files @ 38361831) diff --git a/gstreamer-base/src/auto/versions.txt b/gstreamer-base/src/auto/versions.txt index e35f31b1c..9f53a6200 100644 --- a/gstreamer-base/src/auto/versions.txt +++ b/gstreamer-base/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 2ec58ef) -from gir-files (https://github.com/gtk-rs/gir-files @ 9cf46cf7) +Generated by gir (https://github.com/gtk-rs/gir @ 882e09b) +from gir-files (https://github.com/gtk-rs/gir-files @ 38361831) diff --git a/gstreamer-check/src/auto/test_clock.rs b/gstreamer-check/src/auto/test_clock.rs index 47aa1dcb2..0fa03c8be 100644 --- a/gstreamer-check/src/auto/test_clock.rs +++ b/gstreamer-check/src/auto/test_clock.rs @@ -30,7 +30,7 @@ impl TestClock { unsafe { gst::Clock::from_glib_full(gst_check_sys::gst_test_clock_new()).unsafe_cast() } } - pub fn new_with_start_time(start_time: gst::ClockTime) -> TestClock { + pub fn with_start_time(start_time: gst::ClockTime) -> TestClock { assert_initialized_main_thread!(); unsafe { gst::Clock::from_glib_full(gst_check_sys::gst_test_clock_new_with_start_time( diff --git a/gstreamer-check/src/auto/versions.txt b/gstreamer-check/src/auto/versions.txt index e35f31b1c..9f53a6200 100644 --- a/gstreamer-check/src/auto/versions.txt +++ b/gstreamer-check/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 2ec58ef) -from gir-files (https://github.com/gtk-rs/gir-files @ 9cf46cf7) +Generated by gir (https://github.com/gtk-rs/gir @ 882e09b) +from gir-files (https://github.com/gtk-rs/gir-files @ 38361831) diff --git a/gstreamer-editing-services/src/auto/timeline.rs b/gstreamer-editing-services/src/auto/timeline.rs index f9c46d4cf..828348677 100644 --- a/gstreamer-editing-services/src/auto/timeline.rs +++ b/gstreamer-editing-services/src/auto/timeline.rs @@ -42,7 +42,7 @@ impl Timeline { unsafe { from_glib_none(ges_sys::ges_timeline_new_audio_video()) } } - pub fn new_from_uri(uri: &str) -> Result, glib::Error> { + pub fn from_uri(uri: &str) -> Result, glib::Error> { assert_initialized_main_thread!(); unsafe { let mut error = ptr::null_mut(); diff --git a/gstreamer-editing-services/src/auto/versions.txt b/gstreamer-editing-services/src/auto/versions.txt index e35f31b1c..9f53a6200 100644 --- a/gstreamer-editing-services/src/auto/versions.txt +++ b/gstreamer-editing-services/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 2ec58ef) -from gir-files (https://github.com/gtk-rs/gir-files @ 9cf46cf7) +Generated by gir (https://github.com/gtk-rs/gir @ 882e09b) +from gir-files (https://github.com/gtk-rs/gir-files @ 38361831) diff --git a/gstreamer-gl/src/auto/gl_display_egl.rs b/gstreamer-gl/src/auto/gl_display_egl.rs index dc56d9b87..8ef6b1588 100644 --- a/gstreamer-gl/src/auto/gl_display_egl.rs +++ b/gstreamer-gl/src/auto/gl_display_egl.rs @@ -21,7 +21,7 @@ impl GLDisplayEGL { unsafe { from_glib_full(gst_gl_sys::gst_gl_display_egl_new()) } } - //pub fn new_with_egl_display(display: /*Unimplemented*/Option) -> GLDisplayEGL { + //pub fn with_egl_display(display: /*Unimplemented*/Option) -> GLDisplayEGL { // unsafe { TODO: call gst_gl_sys:gst_gl_display_egl_new_with_egl_display() } //} diff --git a/gstreamer-gl/src/auto/gl_display_wayland.rs b/gstreamer-gl/src/auto/gl_display_wayland.rs index 71cc71ec3..8dda5fe32 100644 --- a/gstreamer-gl/src/auto/gl_display_wayland.rs +++ b/gstreamer-gl/src/auto/gl_display_wayland.rs @@ -25,7 +25,7 @@ impl GLDisplayWayland { } } - //pub fn new_with_display(display: /*Unimplemented*/Option) -> GLDisplayWayland { + //pub fn with_display(display: /*Unimplemented*/Option) -> GLDisplayWayland { // unsafe { TODO: call gst_gl_sys:gst_gl_display_wayland_new_with_display() } //} } diff --git a/gstreamer-gl/src/auto/gl_display_x11.rs b/gstreamer-gl/src/auto/gl_display_x11.rs index 57deca49f..30e6510c2 100644 --- a/gstreamer-gl/src/auto/gl_display_x11.rs +++ b/gstreamer-gl/src/auto/gl_display_x11.rs @@ -21,7 +21,7 @@ impl GLDisplayX11 { unsafe { from_glib_full(gst_gl_sys::gst_gl_display_x11_new(name.to_glib_none().0)) } } - //pub fn new_with_display(display: /*Unimplemented*/Fundamental: Pointer) -> GLDisplayX11 { + //pub fn with_display(display: /*Unimplemented*/Fundamental: Pointer) -> GLDisplayX11 { // unsafe { TODO: call gst_gl_sys:gst_gl_display_x11_new_with_display() } //} } diff --git a/gstreamer-gl/src/auto/gl_framebuffer.rs b/gstreamer-gl/src/auto/gl_framebuffer.rs index 55ca3ecf2..3d87d8940 100644 --- a/gstreamer-gl/src/auto/gl_framebuffer.rs +++ b/gstreamer-gl/src/auto/gl_framebuffer.rs @@ -27,7 +27,7 @@ impl GLFramebuffer { } } - pub fn new_with_default_depth>( + pub fn with_default_depth>( context: &P, width: u32, height: u32, diff --git a/gstreamer-gl/src/auto/gl_shader.rs b/gstreamer-gl/src/auto/gl_shader.rs index 84a87ef6f..d5fef6eb4 100644 --- a/gstreamer-gl/src/auto/gl_shader.rs +++ b/gstreamer-gl/src/auto/gl_shader.rs @@ -64,7 +64,7 @@ impl GLShader { // unsafe { TODO: call gst_gl_sys:gst_gl_shader_new_link_with_stages() } //} - //pub fn new_with_stages>(context: &P, error: &mut glib::Error, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) -> GLShader { + //pub fn with_stages>(context: &P, error: &mut glib::Error, : /*Unknown conversion*//*Unimplemented*/Fundamental: VarArgs) -> GLShader { // unsafe { TODO: call gst_gl_sys:gst_gl_shader_new_with_stages() } //} diff --git a/gstreamer-gl/src/auto/glsl_stage.rs b/gstreamer-gl/src/auto/glsl_stage.rs index 1bffc96a0..75e9fa1b5 100644 --- a/gstreamer-gl/src/auto/glsl_stage.rs +++ b/gstreamer-gl/src/auto/glsl_stage.rs @@ -49,7 +49,7 @@ impl GLSLStage { } } - pub fn new_with_string>( + pub fn with_string>( context: &P, type_: u32, version: GLSLVersion, @@ -68,7 +68,7 @@ impl GLSLStage { } } - pub fn new_with_strings>( + pub fn with_strings>( context: &P, type_: u32, version: GLSLVersion, diff --git a/gstreamer-gl/src/auto/versions.txt b/gstreamer-gl/src/auto/versions.txt index e35f31b1c..9f53a6200 100644 --- a/gstreamer-gl/src/auto/versions.txt +++ b/gstreamer-gl/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 2ec58ef) -from gir-files (https://github.com/gtk-rs/gir-files @ 9cf46cf7) +Generated by gir (https://github.com/gtk-rs/gir @ 882e09b) +from gir-files (https://github.com/gtk-rs/gir-files @ 38361831) diff --git a/gstreamer-net/src/auto/versions.txt b/gstreamer-net/src/auto/versions.txt index e35f31b1c..9f53a6200 100644 --- a/gstreamer-net/src/auto/versions.txt +++ b/gstreamer-net/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 2ec58ef) -from gir-files (https://github.com/gtk-rs/gir-files @ 9cf46cf7) +Generated by gir (https://github.com/gtk-rs/gir @ 882e09b) +from gir-files (https://github.com/gtk-rs/gir-files @ 38361831) diff --git a/gstreamer-pbutils/src/auto/versions.txt b/gstreamer-pbutils/src/auto/versions.txt index e35f31b1c..9f53a6200 100644 --- a/gstreamer-pbutils/src/auto/versions.txt +++ b/gstreamer-pbutils/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 2ec58ef) -from gir-files (https://github.com/gtk-rs/gir-files @ 9cf46cf7) +Generated by gir (https://github.com/gtk-rs/gir @ 882e09b) +from gir-files (https://github.com/gtk-rs/gir-files @ 38361831) diff --git a/gstreamer-player/src/auto/versions.txt b/gstreamer-player/src/auto/versions.txt index e35f31b1c..9f53a6200 100644 --- a/gstreamer-player/src/auto/versions.txt +++ b/gstreamer-player/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 2ec58ef) -from gir-files (https://github.com/gtk-rs/gir-files @ 9cf46cf7) +Generated by gir (https://github.com/gtk-rs/gir @ 882e09b) +from gir-files (https://github.com/gtk-rs/gir-files @ 38361831) diff --git a/gstreamer-rtp/src/auto/versions.txt b/gstreamer-rtp/src/auto/versions.txt index e35f31b1c..9f53a6200 100644 --- a/gstreamer-rtp/src/auto/versions.txt +++ b/gstreamer-rtp/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 2ec58ef) -from gir-files (https://github.com/gtk-rs/gir-files @ 9cf46cf7) +Generated by gir (https://github.com/gtk-rs/gir @ 882e09b) +from gir-files (https://github.com/gtk-rs/gir-files @ 38361831) diff --git a/gstreamer-rtsp-server/src/auto/versions.txt b/gstreamer-rtsp-server/src/auto/versions.txt index e35f31b1c..9f53a6200 100644 --- a/gstreamer-rtsp-server/src/auto/versions.txt +++ b/gstreamer-rtsp-server/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 2ec58ef) -from gir-files (https://github.com/gtk-rs/gir-files @ 9cf46cf7) +Generated by gir (https://github.com/gtk-rs/gir @ 882e09b) +from gir-files (https://github.com/gtk-rs/gir-files @ 38361831) diff --git a/gstreamer-rtsp/src/auto/versions.txt b/gstreamer-rtsp/src/auto/versions.txt index e35f31b1c..9f53a6200 100644 --- a/gstreamer-rtsp/src/auto/versions.txt +++ b/gstreamer-rtsp/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 2ec58ef) -from gir-files (https://github.com/gtk-rs/gir-files @ 9cf46cf7) +Generated by gir (https://github.com/gtk-rs/gir @ 882e09b) +from gir-files (https://github.com/gtk-rs/gir-files @ 38361831) diff --git a/gstreamer-sdp/src/auto/versions.txt b/gstreamer-sdp/src/auto/versions.txt index e35f31b1c..9f53a6200 100644 --- a/gstreamer-sdp/src/auto/versions.txt +++ b/gstreamer-sdp/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 2ec58ef) -from gir-files (https://github.com/gtk-rs/gir-files @ 9cf46cf7) +Generated by gir (https://github.com/gtk-rs/gir @ 882e09b) +from gir-files (https://github.com/gtk-rs/gir-files @ 38361831) diff --git a/gstreamer-video/src/auto/versions.txt b/gstreamer-video/src/auto/versions.txt index e35f31b1c..9f53a6200 100644 --- a/gstreamer-video/src/auto/versions.txt +++ b/gstreamer-video/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 2ec58ef) -from gir-files (https://github.com/gtk-rs/gir-files @ 9cf46cf7) +Generated by gir (https://github.com/gtk-rs/gir @ 882e09b) +from gir-files (https://github.com/gtk-rs/gir-files @ 38361831) diff --git a/gstreamer-webrtc/src/auto/versions.txt b/gstreamer-webrtc/src/auto/versions.txt index e35f31b1c..9f53a6200 100644 --- a/gstreamer-webrtc/src/auto/versions.txt +++ b/gstreamer-webrtc/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 2ec58ef) -from gir-files (https://github.com/gtk-rs/gir-files @ 9cf46cf7) +Generated by gir (https://github.com/gtk-rs/gir @ 882e09b) +from gir-files (https://github.com/gtk-rs/gir-files @ 38361831) diff --git a/gstreamer/src/auto/date_time.rs b/gstreamer/src/auto/date_time.rs index 0503d7043..2792f3c80 100644 --- a/gstreamer/src/auto/date_time.rs +++ b/gstreamer/src/auto/date_time.rs @@ -37,7 +37,7 @@ impl DateTime { } } - pub fn new_from_g_date_time(dt: &glib::DateTime) -> Result { + pub fn from_g_date_time(dt: &glib::DateTime) -> Result { assert_initialized_main_thread!(); unsafe { Option::<_>::from_glib_full(gst_sys::gst_date_time_new_from_g_date_time( @@ -47,7 +47,7 @@ impl DateTime { } } - pub fn new_from_iso8601_string(string: &str) -> Result { + pub fn from_iso8601_string(string: &str) -> Result { assert_initialized_main_thread!(); unsafe { Option::<_>::from_glib_full(gst_sys::gst_date_time_new_from_iso8601_string( @@ -57,13 +57,13 @@ impl DateTime { } } - pub fn new_from_unix_epoch_local_time(secs: i64) -> DateTime { + pub fn from_unix_epoch_local_time(secs: i64) -> DateTime { assert_initialized_main_thread!(); unsafe { from_glib_full(gst_sys::gst_date_time_new_from_unix_epoch_local_time(secs)) } } #[cfg(any(feature = "v1_18", feature = "dox"))] - pub fn new_from_unix_epoch_local_time_usecs(usecs: i64) -> DateTime { + pub fn from_unix_epoch_local_time_usecs(usecs: i64) -> DateTime { assert_initialized_main_thread!(); unsafe { from_glib_full(gst_sys::gst_date_time_new_from_unix_epoch_local_time_usecs( @@ -72,13 +72,13 @@ impl DateTime { } } - pub fn new_from_unix_epoch_utc(secs: i64) -> DateTime { + pub fn from_unix_epoch_utc(secs: i64) -> DateTime { assert_initialized_main_thread!(); unsafe { from_glib_full(gst_sys::gst_date_time_new_from_unix_epoch_utc(secs)) } } #[cfg(any(feature = "v1_18", feature = "dox"))] - pub fn new_from_unix_epoch_utc_usecs(usecs: i64) -> DateTime { + pub fn from_unix_epoch_utc_usecs(usecs: i64) -> DateTime { assert_initialized_main_thread!(); unsafe { from_glib_full(gst_sys::gst_date_time_new_from_unix_epoch_utc_usecs(usecs)) } } diff --git a/gstreamer/src/auto/pad.rs b/gstreamer/src/auto/pad.rs index 6cb7f3976..5cfcad6b5 100644 --- a/gstreamer/src/auto/pad.rs +++ b/gstreamer/src/auto/pad.rs @@ -50,7 +50,7 @@ impl Pad { } } - pub fn new_from_template(templ: &PadTemplate, name: Option<&str>) -> Pad { + pub fn from_template(templ: &PadTemplate, name: Option<&str>) -> Pad { skip_assert_initialized!(); unsafe { from_glib_none(gst_sys::gst_pad_new_from_template( diff --git a/gstreamer/src/auto/pad_template.rs b/gstreamer/src/auto/pad_template.rs index af3b275ff..4f9ea59a2 100644 --- a/gstreamer/src/auto/pad_template.rs +++ b/gstreamer/src/auto/pad_template.rs @@ -50,7 +50,7 @@ impl PadTemplate { } #[cfg(any(feature = "v1_14", feature = "dox"))] - pub fn new_with_gtype( + pub fn with_gtype( name_template: &str, direction: PadDirection, presence: PadPresence, diff --git a/gstreamer/src/auto/versions.txt b/gstreamer/src/auto/versions.txt index e35f31b1c..9f53a6200 100644 --- a/gstreamer/src/auto/versions.txt +++ b/gstreamer/src/auto/versions.txt @@ -1,2 +1,2 @@ -Generated by gir (https://github.com/gtk-rs/gir @ 2ec58ef) -from gir-files (https://github.com/gtk-rs/gir-files @ 9cf46cf7) +Generated by gir (https://github.com/gtk-rs/gir @ 882e09b) +from gir-files (https://github.com/gtk-rs/gir-files @ 38361831) diff --git a/gstreamer/src/date_time.rs b/gstreamer/src/date_time.rs index fb805b79f..43063f6f8 100644 --- a/gstreamer/src/date_time.rs +++ b/gstreamer/src/date_time.rs @@ -30,7 +30,7 @@ impl DateTime { d.to_utc() .ok_or_else(|| glib_bool_error!("Can't convert datetime to UTC")) }) - .and_then(|d| DateTime::new_from_g_date_time(&d)) + .and_then(|d| DateTime::from_g_date_time(&d)) } else { // It would be cheaper to build a `glib::DateTime` direcly, unfortunetaly // this would require using `glib::TimeZone::new_offset` which is feature-gated @@ -235,7 +235,7 @@ impl<'a> convert::TryFrom<&'a glib::DateTime> for DateTime { fn try_from(v: &'a glib::DateTime) -> Result { skip_assert_initialized!(); - DateTime::new_from_g_date_time(v) + DateTime::from_g_date_time(v) } } @@ -244,7 +244,7 @@ impl convert::TryFrom for DateTime { fn try_from(v: glib::DateTime) -> Result { skip_assert_initialized!(); - DateTime::new_from_g_date_time(&v) + DateTime::from_g_date_time(&v) } } diff --git a/gstreamer/src/subclass/element.rs b/gstreamer/src/subclass/element.rs index c05767212..5d824b240 100644 --- a/gstreamer/src/subclass/element.rs +++ b/gstreamer/src/subclass/element.rs @@ -609,9 +609,9 @@ mod tests { fn new_with_class(klass: &subclass::simple::ClassStruct) -> Self { let templ = klass.get_pad_template("sink").unwrap(); - let sinkpad = ::Pad::new_from_template(&templ, Some("sink")); + let sinkpad = ::Pad::from_template(&templ, Some("sink")); let templ = klass.get_pad_template("src").unwrap(); - let srcpad = ::Pad::new_from_template(&templ, Some("src")); + let srcpad = ::Pad::from_template(&templ, Some("src")); TestElement::set_pad_functions(&sinkpad, &srcpad);