From 911bb34dc2d9b13cacf4631ee24bc4a32c0da7b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 30 Jun 2020 10:22:52 +0300 Subject: [PATCH] Don't generate LAST/NONE variants of flags types Those are automatically provided already. --- Gir_Gst.toml | 118 ++++++++++++++++-- Gir_GstAudio.toml | 16 ++- Gir_GstBase.toml | 8 +- Gir_GstGL.toml | 40 +++++- Gir_GstPbutils.toml | 11 +- Gir_GstRtp.toml | 16 ++- Gir_GstRtsp.toml | 32 ++++- Gir_GstRtspServer.toml | 7 +- Gir_GstVideo.toml | 48 ++++++- examples/src/bin/glupload.rs | 2 +- examples/src/bin/launch.rs | 2 +- examples/src/bin/overlay-composition.rs | 2 +- examples/src/bin/tagsetter.rs | 2 +- gstreamer-app/src/auto/versions.txt | 2 +- gstreamer-audio/src/audio_format_info.rs | 4 +- gstreamer-audio/src/auto/flags.rs | 2 - gstreamer-audio/src/auto/versions.txt | 2 +- gstreamer-base/src/auto/flags.rs | 1 - gstreamer-base/src/auto/versions.txt | 2 +- gstreamer-check/src/auto/versions.txt | 2 +- .../src/auto/versions.txt | 2 +- gstreamer-gl/src/auto/flags.rs | 8 -- gstreamer-gl/src/auto/versions.txt | 2 +- gstreamer-net/src/auto/versions.txt | 2 +- gstreamer-pbutils/src/auto/flags.rs | 2 - gstreamer-pbutils/src/auto/versions.txt | 2 +- gstreamer-player/src/auto/versions.txt | 2 +- gstreamer-rtp/src/auto/flags.rs | 2 - gstreamer-rtp/src/auto/versions.txt | 2 +- gstreamer-rtsp-server/src/auto/flags.rs | 1 - gstreamer-rtsp-server/src/auto/versions.txt | 2 +- gstreamer-rtsp/src/auto/flags.rs | 4 - gstreamer-rtsp/src/auto/versions.txt | 2 +- gstreamer-sdp/src/auto/versions.txt | 2 +- gstreamer-video/src/auto/flags.rs | 10 -- gstreamer-video/src/auto/versions.txt | 2 +- gstreamer-video/src/video_meta.rs | 12 +- gstreamer-webrtc/src/auto/versions.txt | 2 +- gstreamer/src/auto/flags.rs | 19 --- gstreamer/src/auto/versions.txt | 2 +- 40 files changed, 291 insertions(+), 110 deletions(-) diff --git a/Gir_Gst.toml b/Gir_Gst.toml index d31d4d380..fd886b769 100644 --- a/Gir_Gst.toml +++ b/Gir_Gst.toml @@ -36,35 +36,23 @@ generate = [ "Gst.StructureChangeType", "Gst.StreamStatusType", "Gst.StreamType", - "Gst.StreamFlags", "Gst.ProgressType", "Gst.BusSyncReply", "Gst.TagFlag", "Gst.TagMergeMode", - "Gst.PadProbeType", "Gst.PadProbeReturn", "Gst.CapsIntersectMode", - "Gst.BufferCopyFlags", "Gst.PadMode", "Gst.SchedulingFlags", "Gst.QOSType", "Gst.TocSetter", - "Gst.ElementFlags", - "Gst.PadFlags", - "Gst.PipelineFlags", "Gst.PluginFlags", - "Gst.MemoryFlags", - "Gst.PadLinkCheck", "Gst.DebugLevel", "Gst.DebugColorFlags", - "Gst.StackTraceFlags", "Gst.DebugGraphDetails", "Gst.TaskState", - "Gst.PluginDependencyFlags", - "Gst.BufferPoolAcquireFlags", "Gst.PromiseResult", "Gst.ClockEntryType", - "Gst.ClockFlags", ] manual = [ @@ -114,7 +102,9 @@ trait_name = "GstBinExt" [[object]] name = "Gst.BinFlags" status = "generate" - + [[object.member]] + name = "last" + ignore = true [[object.member]] name = "streams_aware" version = "1.10" @@ -185,6 +175,26 @@ status = "generate" [[object.member]] name = "non_droppable" version = "1.14" + [[object.member]] + name = "last" + ignore = true + +[[object]] +name = "Gst.BufferCopyFlags" +status = "generate" + [[object.member]] + name = "none" + ignore = true + +[[object]] +name = "Gst.BufferPoolAcquireFlags" +status = "generate" + [[object.member]] + name = "none" + ignore = true + [[object.member]] + name = "last" + ignore = true [[object]] name = "Gst.ChildProxy" @@ -196,6 +206,13 @@ name = "Gst.ClockTime" status = "manual" conversion_type = "scalar" +[[object]] +name = "Gst.ClockFlags" +status = "generate" + [[object.member]] + name = "last" + ignore = true + [[object]] name = "Gst.Format" status = "generate" @@ -214,6 +231,9 @@ status = "generate" [[object.member]] name = "instant_rate_change" version = "1.18" + [[object.member]] + name = "none" + ignore = true [[object]] name = "Gst.SegmentFlags" @@ -224,6 +244,23 @@ status = "generate" [[object.member]] name = "trickmode_forward_predicted" version = "1.18" + [[object.member]] + name = "none" + ignore = true + +[[object]] +name = "Gst.StackTraceFlags" +status = "generate" + [[object.member]] + name = "none" + ignore = true + +[[object]] +name = "Gst.StreamFlags" +status = "generate" + [[object.member]] + name = "none" + ignore = true [[object]] name = "Gst.TagSetter" @@ -306,6 +343,23 @@ status = "generate" [[object.member]] name = "place_in_bin" version = "1.10" + [[object.member]] + name = "none" + ignore = true + +[[object]] +name = "Gst.PipelineFlags" +status = "generate" + [[object.member]] + name = "last" + ignore = true + +[[object]] +name = "Gst.PluginDependencyFlags" +status = "generate" + [[object.member]] + name = "none" + ignore = true [[object]] name = "Gst.Caps" @@ -419,6 +473,20 @@ status = "generate" [object.function.return] nullable = false +[[object]] +name = "Gst.ElementFlags" +status = "generate" + [[object.member]] + name = "last" + ignore = true + +[[object]] +name = "Gst.MemoryFlags" +status = "generate" + [[object.member]] + name = "last" + ignore = true + [[object]] name = "Gst.Element" status = "generate" @@ -748,6 +816,30 @@ status = "generate" [[object.member]] name = "may_be_leaked" version = "1.10" + [[object.member]] + name = "last" + ignore = true + +[[object]] +name = "Gst.PadFlags" +status = "generate" + [[object.member]] + name = "last" + ignore = true + +[[object]] +name = "Gst.PadLinkCheck" +status = "generate" + [[object.member]] + name = "nothing" + ignore = true + +[[object]] +name = "Gst.PadProbeType" +status = "generate" + [[object.member]] + name = "invalid" + ignore = true [[object]] name = "Gst.Pad" diff --git a/Gir_GstAudio.toml b/Gir_GstAudio.toml index a279a9758..5cec5b2aa 100644 --- a/Gir_GstAudio.toml +++ b/Gir_GstAudio.toml @@ -18,10 +18,8 @@ external_libraries = [ ] generate = [ - "GstAudio.AudioFlags", "GstAudio.AudioFormatFlags", "GstAudio.AudioLayout", - "GstAudio.AudioPackFlags", "GstAudio.AudioChannelPosition", "GstAudio.StreamVolume", "GstAudio.StreamVolumeFormat", @@ -241,3 +239,17 @@ status = "generate" [[object.member]] name = "flac" version = "1.12" + +[[object]] +name = "GstAudio.AudioFlags" +status = "generate" + [[object.member]] + name = "none" + ignore = true + +[[object]] +name = "GstAudio.AudioPackFlags" +status = "generate" + [[object.member]] + name = "none" + ignore = true diff --git a/Gir_GstBase.toml b/Gir_GstBase.toml index fff8b0758..de616abb9 100644 --- a/Gir_GstBase.toml +++ b/Gir_GstBase.toml @@ -18,7 +18,6 @@ external_libraries = [ generate = [ "GstBase.PushSrc", - "GstBase.BaseParseFrameFlags", ] manual = [ @@ -308,3 +307,10 @@ manual_traits = ["BaseParseExtManual"] [[object.function]] name = "push_frame" ignore = true + +[[object]] +name = "GstBase.BaseParseFrameFlags" +status = "generate" + [[object.member]] + name = "none" + ignore = true diff --git a/Gir_GstGL.toml b/Gir_GstGL.toml index 09ef9b861..0a5bf061e 100644 --- a/Gir_GstGL.toml +++ b/Gir_GstGL.toml @@ -19,10 +19,6 @@ external_libraries = [ ] generate = [ - # BitFlags - "GstGL.GLAPI", - "GstGL.GLPlatform", - "GstGL.GLSLProfile", # Enums "GstGL.GLFormat", "GstGL.GLQueryType", @@ -429,8 +425,42 @@ final_type = true [[object]] name = "GstGL.GLDisplayType" status = "generate" - + [[object.member]] + name = "none" + ignore = true + [[object.member]] + name = "any" + ignore = true [[object.member]] name = "egl_device" version = "1.18" +[[object]] +name = "GstGL.GLAPI" +status = "generate" + [[object.member]] + name = "none" + ignore = true + [[object.member]] + name = "any" + ignore = true + +[[object]] +name = "GstGL.GLPlatform" +status = "generate" + [[object.member]] + name = "none" + ignore = true + [[object.member]] + name = "any" + ignore = true + +[[object]] +name = "GstGL.GLSLProfile" +status = "generate" + [[object.member]] + name = "none" + ignore = true + [[object.member]] + name = "any" + ignore = true diff --git a/Gir_GstPbutils.toml b/Gir_GstPbutils.toml index 3c4468385..aa5a20932 100644 --- a/Gir_GstPbutils.toml +++ b/Gir_GstPbutils.toml @@ -18,7 +18,6 @@ external_libraries = [ generate = [ "GstPbutils.DiscovererResult", - "GstPbutils.DiscovererSerializeFlags", ] manual = [ @@ -336,3 +335,13 @@ status = "generate" [[object.function]] name = "plugins_base_version" assertion = "skip" + +[[object]] +name = "GstPbutils.DiscovererSerializeFlags" +status = "generate" + [[object.member]] + name = "basic" + ignore = true + [[object.member]] + name = "all" + ignore = true diff --git a/Gir_GstRtp.toml b/Gir_GstRtp.toml index 0272ba08d..46d1b685d 100644 --- a/Gir_GstRtp.toml +++ b/Gir_GstRtp.toml @@ -24,8 +24,6 @@ generate = [ "GstRtp.RTCPXRType", "GstRtp.RTPPayload", "GstRtp.RTPProfile", - "GstRtp.RTPBufferFlags", - "GstRtp.RTPBufferMapFlags", ] [[object]] @@ -50,3 +48,17 @@ status = "generate" [[object.function]] name = "rtp_source_meta_api_get_type" ignore = true + +[[object]] +name = "GstRtp.RTPBufferFlags" +status = "generate" + [[object.member]] + name = "last" + ignore = true + +[[object]] +name = "GstRtp.RTPBufferMapFlags" +status = "generate" + [[object.member]] + name = "last" + ignore = true diff --git a/Gir_GstRtsp.toml b/Gir_GstRtsp.toml index e9a215893..a4b59ab8e 100644 --- a/Gir_GstRtsp.toml +++ b/Gir_GstRtsp.toml @@ -23,16 +23,12 @@ generate = [ "GstRtsp.RTSPEvent", "GstRtsp.RTSPFamily", "GstRtsp.RTSPHeaderField", - "GstRtsp.RTSPLowerTrans", - "GstRtsp.RTSPMethod", "GstRtsp.RTSPMsgType", - "GstRtsp.RTSPProfile", "GstRtsp.RTSPRangeUnit", "GstRtsp.RTSPResult", "GstRtsp.RTSPState", "GstRtsp.RTSPStatusCode", "GstRtsp.RTSPTimeType", - "GstRtsp.RTSPTransMode" ] manual = [ @@ -68,3 +64,31 @@ ref_mode = "ref" name = "Gst.Structure" status = "manual" ref_mode = "ref-mut" + +[[object]] +name = "GstRtsp.RTSPLowerTrans" +status = "generate" + [[object.member]] + name = "unknown" + ignore = true + +[[object]] +name = "GstRtsp.RTSPMethod" +status = "generate" + [[object.member]] + name = "invalid" + ignore = true + +[[object]] +name = "GstRtsp.RTSPProfile" +status = "generate" + [[object.member]] + name = "unknown" + ignore = true + +[[object]] +name = "GstRtsp.RTSPTransMode" +status = "generate" + [[object.member]] + name = "unknown" + ignore = true diff --git a/Gir_GstRtspServer.toml b/Gir_GstRtspServer.toml index 829159779..55c254ca3 100644 --- a/Gir_GstRtspServer.toml +++ b/Gir_GstRtspServer.toml @@ -22,7 +22,6 @@ external_libraries = [ ] generate = [ - "GstRtspServer.RTSPAddressFlags", "GstRtspServer.RTSPAddressPoolResult", "GstRtspServer.RTSPMediaFactoryURI", "GstRtspServer.RTSPMediaStatus", @@ -361,3 +360,9 @@ status="generate" [object.function.return] nullable_return_is_error = "Failed to manage media" +[[object]] +name = "GstRtspServer.RTSPAddressFlags" +status = "generate" + [[object.member]] + name = "none" + ignore = true diff --git a/Gir_GstVideo.toml b/Gir_GstVideo.toml index 5b4a00790..9f534537f 100644 --- a/Gir_GstVideo.toml +++ b/Gir_GstVideo.toml @@ -21,19 +21,15 @@ generate = [ "GstVideo.VideoCodecFrameFlags", "GstVideo.VideoFormatFlags", "GstVideo.VideoTileMode", - "GstVideo.VideoFlags", - "GstVideo.VideoChromaSite", "GstVideo.VideoColorMatrix", "GstVideo.VideoTransferFunction", "GstVideo.VideoColorPrimaries", "GstVideo.VideoMultiviewMode", - "GstVideo.VideoMultiviewFlags", "GstVideo.VideoFieldOrder", "GstVideo.VideoMultiviewFramePacking", "GstVideo.VideoFilter", "GstVideo.VideoCaptionType", "GstVideo.VideoBufferPool", - "GstVideo.VideoPackFlags", "GstVideo.VideoAlphaMode", "GstVideo.VideoChromaMode", "GstVideo.VideoMatrixMode", @@ -404,6 +400,9 @@ status = "generate" [[object.function]] name = "get_type" version = "1.16" + [[object.member]] + name = "none" + ignore = true [[object]] name = "GstVideo.VideoTimeCodeFlags" @@ -411,6 +410,9 @@ status = "generate" [[object.function]] name = "get_type" version = "1.18" + [[object.member]] + name = "none" + ignore = true [[object]] name = "GstVideo.VideoFrameFlags" @@ -434,6 +436,9 @@ status = "generate" [[object.member]] name = "marker" version = "1.18" + [[object.member]] + name = "last" + ignore = true [[object]] name = "GstVideo.VideoInterlaceMode" @@ -441,3 +446,38 @@ status = "generate" [[object.member]] name = "alternate" version = "1.16" + +[[object]] +name = "GstVideo.VideoChromaSite" +status = "generate" + [[object.member]] + name = "unknown" + ignore = true + +[[object]] +name = "GstVideo.VideoFlags" +status = "generate" + [[object.member]] + name = "none" + ignore = true + +[[object]] +name = "GstVideo.VideoFrameFlags" +status = "generate" + [[object.member]] + name = "none" + ignore = true + +[[object]] +name = "GstVideo.VideoMultiviewFlags" +status = "generate" + [[object.member]] + name = "none" + ignore = true + +[[object]] +name = "GstVideo.VideoPackFlags" +status = "generate" + [[object.member]] + name = "none" + ignore = true diff --git a/examples/src/bin/glupload.rs b/examples/src/bin/glupload.rs index 44e58ef30..bca495ab2 100644 --- a/examples/src/bin/glupload.rs +++ b/examples/src/bin/glupload.rs @@ -519,7 +519,7 @@ impl App { match api { glutin::Api::OpenGl => gst_gl::GLAPI::OPENGL3, glutin::Api::OpenGlEs => gst_gl::GLAPI::GLES2, - _ => gst_gl::GLAPI::NONE, + _ => gst_gl::GLAPI::empty(), } } diff --git a/examples/src/bin/launch.rs b/examples/src/bin/launch.rs index f7b4ec68a..497367fd2 100644 --- a/examples/src/bin/launch.rs +++ b/examples/src/bin/launch.rs @@ -29,7 +29,7 @@ fn example_main() { // install the corresponding gstreamer plugins. let mut context = gst::ParseContext::new(); let pipeline = - match gst::parse_launch_full(&pipeline_str, Some(&mut context), gst::ParseFlags::NONE) { + match gst::parse_launch_full(&pipeline_str, Some(&mut context), gst::ParseFlags::empty()) { Ok(pipeline) => pipeline, Err(err) => { if let Some(gst::ParseError::NoSuchElement) = err.kind::() { diff --git a/examples/src/bin/overlay-composition.rs b/examples/src/bin/overlay-composition.rs index 0d4a3b4e7..2e3d33f65 100644 --- a/examples/src/bin/overlay-composition.rs +++ b/examples/src/bin/overlay-composition.rs @@ -165,7 +165,7 @@ fn create_pipeline() -> Result { gst_video::VideoMeta::add( buffer.get_mut().unwrap(), - gst_video::VideoFrameFlags::NONE, + gst_video::VideoFrameFlags::empty(), gst_video::VideoFormat::Bgra, frame_width as u32, frame_height as u32, diff --git a/examples/src/bin/tagsetter.rs b/examples/src/bin/tagsetter.rs index 92928260d..9cb2138c2 100644 --- a/examples/src/bin/tagsetter.rs +++ b/examples/src/bin/tagsetter.rs @@ -49,7 +49,7 @@ fn example_main() -> Result<(), Error> { let pipeline = match gst::parse_launch_full( "audiotestsrc wave=white-noise num-buffers=100 ! flacenc ! filesink location=test.flac", Some(&mut context), - gst::ParseFlags::NONE, + gst::ParseFlags::empty(), ) { Ok(pipeline) => pipeline, Err(err) => { diff --git a/gstreamer-app/src/auto/versions.txt b/gstreamer-app/src/auto/versions.txt index 6db3a1ff2..eaa6a3f46 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 @ 5a5b8f5) -from gir-files (https://github.com/gtk-rs/gir-files @ 947ac8db) +from gir-files (https://github.com/gtk-rs/gir-files @ 4ac5b6f0) diff --git a/gstreamer-audio/src/audio_format_info.rs b/gstreamer-audio/src/audio_format_info.rs index b1fe6a06f..a704c167a 100644 --- a/gstreamer-audio/src/audio_format_info.rs +++ b/gstreamer-audio/src/audio_format_info.rs @@ -416,8 +416,8 @@ mod tests { let mut unpacked = [0; 16]; let mut output = [0; 8]; - info.unpack(::AudioPackFlags::NONE, &mut unpacked, &input); - info.pack(::AudioPackFlags::NONE, &mut output, &unpacked); + info.unpack(::AudioPackFlags::empty(), &mut unpacked, &input); + info.pack(::AudioPackFlags::empty(), &mut output, &unpacked); assert_eq!(input, output); } diff --git a/gstreamer-audio/src/auto/flags.rs b/gstreamer-audio/src/auto/flags.rs index 6886540ed..97be1f6f0 100644 --- a/gstreamer-audio/src/auto/flags.rs +++ b/gstreamer-audio/src/auto/flags.rs @@ -14,7 +14,6 @@ use gst_audio_sys; bitflags! { pub struct AudioFlags: u32 { - const NONE = 0; const UNPOSITIONED = 1; } } @@ -113,7 +112,6 @@ impl SetValue for AudioFormatFlags { bitflags! { pub struct AudioPackFlags: u32 { - const NONE = 0; const TRUNCATE_RANGE = 1; } } diff --git a/gstreamer-audio/src/auto/versions.txt b/gstreamer-audio/src/auto/versions.txt index 6db3a1ff2..eaa6a3f46 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 @ 5a5b8f5) -from gir-files (https://github.com/gtk-rs/gir-files @ 947ac8db) +from gir-files (https://github.com/gtk-rs/gir-files @ 4ac5b6f0) diff --git a/gstreamer-base/src/auto/flags.rs b/gstreamer-base/src/auto/flags.rs index 6afbdafc5..f660d01da 100644 --- a/gstreamer-base/src/auto/flags.rs +++ b/gstreamer-base/src/auto/flags.rs @@ -7,7 +7,6 @@ use gst_base_sys; bitflags! { pub struct BaseParseFrameFlags: u32 { - const NONE = 0; const NEW_FRAME = 1; const NO_FRAME = 2; const CLIP = 4; diff --git a/gstreamer-base/src/auto/versions.txt b/gstreamer-base/src/auto/versions.txt index 6db3a1ff2..eaa6a3f46 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 @ 5a5b8f5) -from gir-files (https://github.com/gtk-rs/gir-files @ 947ac8db) +from gir-files (https://github.com/gtk-rs/gir-files @ 4ac5b6f0) diff --git a/gstreamer-check/src/auto/versions.txt b/gstreamer-check/src/auto/versions.txt index 6db3a1ff2..eaa6a3f46 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 @ 5a5b8f5) -from gir-files (https://github.com/gtk-rs/gir-files @ 947ac8db) +from gir-files (https://github.com/gtk-rs/gir-files @ 4ac5b6f0) diff --git a/gstreamer-editing-services/src/auto/versions.txt b/gstreamer-editing-services/src/auto/versions.txt index 6db3a1ff2..eaa6a3f46 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 @ 5a5b8f5) -from gir-files (https://github.com/gtk-rs/gir-files @ 947ac8db) +from gir-files (https://github.com/gtk-rs/gir-files @ 4ac5b6f0) diff --git a/gstreamer-gl/src/auto/flags.rs b/gstreamer-gl/src/auto/flags.rs index 177e4b6fb..f1e0823de 100644 --- a/gstreamer-gl/src/auto/flags.rs +++ b/gstreamer-gl/src/auto/flags.rs @@ -14,12 +14,10 @@ use gst_gl_sys; bitflags! { pub struct GLAPI: u32 { - const NONE = 0; const OPENGL = 1; const OPENGL3 = 2; const GLES1 = 32768; const GLES2 = 65536; - const ANY = 4294967295; } } @@ -66,7 +64,6 @@ impl SetValue for GLAPI { bitflags! { pub struct GLDisplayType: u32 { - const NONE = 0; const X11 = 1; const WAYLAND = 2; const COCOA = 4; @@ -77,7 +74,6 @@ bitflags! { const GBM = 128; #[cfg(any(feature = "v1_18", feature = "dox"))] const EGL_DEVICE = 256; - const ANY = 4294967295; } } @@ -124,13 +120,11 @@ impl SetValue for GLDisplayType { bitflags! { pub struct GLPlatform: u32 { - const NONE = 0; const EGL = 1; const GLX = 2; const WGL = 4; const CGL = 8; const EAGL = 16; - const ANY = 4294967295; } } @@ -177,11 +171,9 @@ impl SetValue for GLPlatform { bitflags! { pub struct GLSLProfile: u32 { - const NONE = 0; const ES = 1; const CORE = 2; const COMPATIBILITY = 4; - const ANY = 4294967295; } } diff --git a/gstreamer-gl/src/auto/versions.txt b/gstreamer-gl/src/auto/versions.txt index 6db3a1ff2..eaa6a3f46 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 @ 5a5b8f5) -from gir-files (https://github.com/gtk-rs/gir-files @ 947ac8db) +from gir-files (https://github.com/gtk-rs/gir-files @ 4ac5b6f0) diff --git a/gstreamer-net/src/auto/versions.txt b/gstreamer-net/src/auto/versions.txt index 6db3a1ff2..eaa6a3f46 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 @ 5a5b8f5) -from gir-files (https://github.com/gtk-rs/gir-files @ 947ac8db) +from gir-files (https://github.com/gtk-rs/gir-files @ 4ac5b6f0) diff --git a/gstreamer-pbutils/src/auto/flags.rs b/gstreamer-pbutils/src/auto/flags.rs index a64a9a69c..454b3cda9 100644 --- a/gstreamer-pbutils/src/auto/flags.rs +++ b/gstreamer-pbutils/src/auto/flags.rs @@ -14,11 +14,9 @@ use gst_pbutils_sys; bitflags! { pub struct DiscovererSerializeFlags: u32 { - const BASIC = 0; const CAPS = 1; const TAGS = 2; const MISC = 4; - const ALL = 7; } } diff --git a/gstreamer-pbutils/src/auto/versions.txt b/gstreamer-pbutils/src/auto/versions.txt index 6db3a1ff2..eaa6a3f46 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 @ 5a5b8f5) -from gir-files (https://github.com/gtk-rs/gir-files @ 947ac8db) +from gir-files (https://github.com/gtk-rs/gir-files @ 4ac5b6f0) diff --git a/gstreamer-player/src/auto/versions.txt b/gstreamer-player/src/auto/versions.txt index 6db3a1ff2..eaa6a3f46 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 @ 5a5b8f5) -from gir-files (https://github.com/gtk-rs/gir-files @ 947ac8db) +from gir-files (https://github.com/gtk-rs/gir-files @ 4ac5b6f0) diff --git a/gstreamer-rtp/src/auto/flags.rs b/gstreamer-rtp/src/auto/flags.rs index 55f4f3b7a..534be7380 100644 --- a/gstreamer-rtp/src/auto/flags.rs +++ b/gstreamer-rtp/src/auto/flags.rs @@ -17,7 +17,6 @@ bitflags! { pub struct RTPBufferFlags: u32 { const RETRANSMISSION = 1048576; const REDUNDANT = 2097152; - const LAST = 268435456; } } @@ -71,7 +70,6 @@ impl SetValue for RTPBufferFlags { bitflags! { pub struct RTPBufferMapFlags: u32 { const SKIP_PADDING = 65536; - const LAST = 16777216; } } diff --git a/gstreamer-rtp/src/auto/versions.txt b/gstreamer-rtp/src/auto/versions.txt index 6db3a1ff2..eaa6a3f46 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 @ 5a5b8f5) -from gir-files (https://github.com/gtk-rs/gir-files @ 947ac8db) +from gir-files (https://github.com/gtk-rs/gir-files @ 4ac5b6f0) diff --git a/gstreamer-rtsp-server/src/auto/flags.rs b/gstreamer-rtsp-server/src/auto/flags.rs index dac77718d..1e841ebb8 100644 --- a/gstreamer-rtsp-server/src/auto/flags.rs +++ b/gstreamer-rtsp-server/src/auto/flags.rs @@ -14,7 +14,6 @@ use gst_rtsp_server_sys; bitflags! { pub struct RTSPAddressFlags: u32 { - const NONE = 0; const IPV4 = 1; const IPV6 = 2; const EVEN_PORT = 4; diff --git a/gstreamer-rtsp-server/src/auto/versions.txt b/gstreamer-rtsp-server/src/auto/versions.txt index 6db3a1ff2..eaa6a3f46 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 @ 5a5b8f5) -from gir-files (https://github.com/gtk-rs/gir-files @ 947ac8db) +from gir-files (https://github.com/gtk-rs/gir-files @ 4ac5b6f0) diff --git a/gstreamer-rtsp/src/auto/flags.rs b/gstreamer-rtsp/src/auto/flags.rs index 4c0c0c43f..a7b82ee43 100644 --- a/gstreamer-rtsp/src/auto/flags.rs +++ b/gstreamer-rtsp/src/auto/flags.rs @@ -62,7 +62,6 @@ impl SetValue for RTSPEvent { bitflags! { pub struct RTSPLowerTrans: u32 { - const UNKNOWN = 0; const UDP = 1; const UDP_MCAST = 2; const TCP = 4; @@ -114,7 +113,6 @@ impl SetValue for RTSPLowerTrans { bitflags! { pub struct RTSPMethod: u32 { - const INVALID = 0; const DESCRIBE = 1; const ANNOUNCE = 2; const GET_PARAMETER = 4; @@ -174,7 +172,6 @@ impl SetValue for RTSPMethod { bitflags! { pub struct RTSPProfile: u32 { - const UNKNOWN = 0; const AVP = 1; const SAVP = 2; const AVPF = 4; @@ -225,7 +222,6 @@ impl SetValue for RTSPProfile { bitflags! { pub struct RTSPTransMode: u32 { - const UNKNOWN = 0; const RTP = 1; const RDT = 2; } diff --git a/gstreamer-rtsp/src/auto/versions.txt b/gstreamer-rtsp/src/auto/versions.txt index 6db3a1ff2..eaa6a3f46 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 @ 5a5b8f5) -from gir-files (https://github.com/gtk-rs/gir-files @ 947ac8db) +from gir-files (https://github.com/gtk-rs/gir-files @ 4ac5b6f0) diff --git a/gstreamer-sdp/src/auto/versions.txt b/gstreamer-sdp/src/auto/versions.txt index 6db3a1ff2..eaa6a3f46 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 @ 5a5b8f5) -from gir-files (https://github.com/gtk-rs/gir-files @ 947ac8db) +from gir-files (https://github.com/gtk-rs/gir-files @ 4ac5b6f0) diff --git a/gstreamer-video/src/auto/flags.rs b/gstreamer-video/src/auto/flags.rs index e5b1061fe..35fc754f6 100644 --- a/gstreamer-video/src/auto/flags.rs +++ b/gstreamer-video/src/auto/flags.rs @@ -26,7 +26,6 @@ bitflags! { const BOTTOM_FIELD = 8388608; #[cfg(any(feature = "v1_18", feature = "dox"))] const MARKER = 512; - const LAST = 268435456; } } @@ -73,7 +72,6 @@ impl SetValue for VideoBufferFlags { bitflags! { pub struct VideoChromaSite: u32 { - const UNKNOWN = 0; const NONE = 1; const H_COSITED = 2; const V_COSITED = 4; @@ -154,7 +152,6 @@ impl FromGlib for VideoCodecFrameFlags { bitflags! { pub struct VideoFlags: u32 { - const NONE = 0; const VARIABLE_FPS = 1; const PREMULTIPLIED_ALPHA = 2; } @@ -258,16 +255,13 @@ impl SetValue for VideoFormatFlags { bitflags! { pub struct VideoFrameFlags: u32 { - const NONE = 0; const INTERLACED = 1; const TFF = 2; const RFF = 4; const ONEFIELD = 8; const MULTIPLE_VIEW = 16; const FIRST_IN_BUNDLE = 32; - #[cfg(any(feature = "v1_16", feature = "dox"))] const TOP_FIELD = 10; - #[cfg(any(feature = "v1_16", feature = "dox"))] const BOTTOM_FIELD = 8; } } @@ -315,7 +309,6 @@ impl SetValue for VideoFrameFlags { bitflags! { pub struct VideoMultiviewFlags: u32 { - const NONE = 0; const RIGHT_VIEW_FIRST = 1; const LEFT_FLIPPED = 2; const LEFT_FLOPPED = 4; @@ -369,7 +362,6 @@ impl SetValue for VideoMultiviewFlags { bitflags! { pub struct VideoOverlayFormatFlags: u32 { - const NONE = 0; const PREMULTIPLIED_ALPHA = 1; const GLOBAL_ALPHA = 2; } @@ -422,7 +414,6 @@ impl SetValue for VideoOverlayFormatFlags { bitflags! { pub struct VideoPackFlags: u32 { - const NONE = 0; const TRUNCATE_RANGE = 1; const INTERLACED = 2; } @@ -472,7 +463,6 @@ impl SetValue for VideoPackFlags { #[cfg(any(feature = "v1_10", feature = "dox"))] bitflags! { pub struct VideoTimeCodeFlags: u32 { - const NONE = 0; const DROP_FRAME = 1; const INTERLACED = 2; } diff --git a/gstreamer-video/src/auto/versions.txt b/gstreamer-video/src/auto/versions.txt index 6db3a1ff2..eaa6a3f46 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 @ 5a5b8f5) -from gir-files (https://github.com/gtk-rs/gir-files @ 947ac8db) +from gir-files (https://github.com/gtk-rs/gir-files @ 4ac5b6f0) diff --git a/gstreamer-video/src/video_meta.rs b/gstreamer-video/src/video_meta.rs index 72e374e94..b728a2d43 100644 --- a/gstreamer-video/src/video_meta.rs +++ b/gstreamer-video/src/video_meta.rs @@ -690,14 +690,14 @@ mod tests { { let meta = VideoMeta::add( buffer.get_mut().unwrap(), - ::VideoFrameFlags::NONE, + ::VideoFrameFlags::empty(), ::VideoFormat::Argb, 320, 240, ) .unwrap(); assert_eq!(meta.get_id(), 0); - assert_eq!(meta.get_flags(), ::VideoFrameFlags::NONE); + assert_eq!(meta.get_flags(), ::VideoFrameFlags::empty()); assert_eq!(meta.get_format(), ::VideoFormat::Argb); assert_eq!(meta.get_width(), 320); assert_eq!(meta.get_height(), 240); @@ -709,7 +709,7 @@ mod tests { { let meta = buffer.get_meta::().unwrap(); assert_eq!(meta.get_id(), 0); - assert_eq!(meta.get_flags(), ::VideoFrameFlags::NONE); + assert_eq!(meta.get_flags(), ::VideoFrameFlags::empty()); assert_eq!(meta.get_format(), ::VideoFormat::Argb); assert_eq!(meta.get_width(), 320); assert_eq!(meta.get_height(), 240); @@ -727,7 +727,7 @@ mod tests { { let meta = VideoMeta::add_full( buffer.get_mut().unwrap(), - ::VideoFrameFlags::NONE, + ::VideoFrameFlags::empty(), ::VideoFormat::Argb, 320, 240, @@ -736,7 +736,7 @@ mod tests { ) .unwrap(); assert_eq!(meta.get_id(), 0); - assert_eq!(meta.get_flags(), ::VideoFrameFlags::NONE); + assert_eq!(meta.get_flags(), ::VideoFrameFlags::empty()); assert_eq!(meta.get_format(), ::VideoFormat::Argb); assert_eq!(meta.get_width(), 320); assert_eq!(meta.get_height(), 240); @@ -748,7 +748,7 @@ mod tests { { let meta = buffer.get_meta::().unwrap(); assert_eq!(meta.get_id(), 0); - assert_eq!(meta.get_flags(), ::VideoFrameFlags::NONE); + assert_eq!(meta.get_flags(), ::VideoFrameFlags::empty()); assert_eq!(meta.get_format(), ::VideoFormat::Argb); assert_eq!(meta.get_width(), 320); assert_eq!(meta.get_height(), 240); diff --git a/gstreamer-webrtc/src/auto/versions.txt b/gstreamer-webrtc/src/auto/versions.txt index 6db3a1ff2..eaa6a3f46 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 @ 5a5b8f5) -from gir-files (https://github.com/gtk-rs/gir-files @ 947ac8db) +from gir-files (https://github.com/gtk-rs/gir-files @ 4ac5b6f0) diff --git a/gstreamer/src/auto/flags.rs b/gstreamer/src/auto/flags.rs index 1aed58692..ff2f72d6a 100644 --- a/gstreamer/src/auto/flags.rs +++ b/gstreamer/src/auto/flags.rs @@ -17,7 +17,6 @@ bitflags! { const NO_RESYNC = 16384; #[cfg(any(feature = "v1_10", feature = "dox"))] const STREAMS_AWARE = 32768; - const LAST = 524288; } } @@ -64,7 +63,6 @@ impl SetValue for BinFlags { bitflags! { pub struct BufferCopyFlags: u32 { - const NONE = 0; const FLAGS = 1; const TIMESTAMPS = 2; const META = 4; @@ -132,7 +130,6 @@ bitflags! { const SYNC_AFTER = 32768; #[cfg(any(feature = "v1_14", feature = "dox"))] const NON_DROPPABLE = 65536; - const LAST = 1048576; } } @@ -179,11 +176,9 @@ impl SetValue for BufferFlags { bitflags! { pub struct BufferPoolAcquireFlags: u32 { - const NONE = 0; const KEY_UNIT = 1; const DONTWAIT = 2; const DISCONT = 4; - const LAST = 65536; } } @@ -237,7 +232,6 @@ bitflags! { const CAN_SET_RESOLUTION = 256; const CAN_SET_MASTER = 512; const NEEDS_STARTUP_SYNC = 1024; - const LAST = 4096; } } @@ -407,7 +401,6 @@ bitflags! { const PROVIDE_CLOCK = 128; const REQUIRE_CLOCK = 256; const INDEXABLE = 512; - const LAST = 16384; } } @@ -460,7 +453,6 @@ bitflags! { const ZERO_PADDED = 64; const PHYSICALLY_CONTIGUOUS = 128; const NOT_MAPPABLE = 256; - const LAST = 1048576; } } @@ -509,7 +501,6 @@ bitflags! { pub struct ObjectFlags: u32 { #[cfg(any(feature = "v1_10", feature = "dox"))] const MAY_BE_LEAKED = 1; - const LAST = 16; } } @@ -569,7 +560,6 @@ bitflags! { const PROXY_SCHEDULING = 16384; const ACCEPT_INTERSECT = 32768; const ACCEPT_TEMPLATE = 65536; - const LAST = 1048576; } } @@ -616,7 +606,6 @@ impl SetValue for PadFlags { bitflags! { pub struct PadLinkCheck: u32 { - const NOTHING = 0; const HIERARCHY = 1; const TEMPLATE_CAPS = 2; const CAPS = 4; @@ -668,7 +657,6 @@ impl SetValue for PadLinkCheck { bitflags! { pub struct PadProbeType: u32 { - const INVALID = 0; const IDLE = 1; const BLOCK = 2; const BUFFER = 16; @@ -736,7 +724,6 @@ impl SetValue for PadProbeType { bitflags! { pub struct ParseFlags: u32 { - const NONE = 0; const FATAL_ERRORS = 1; const NO_SINGLE_ELEMENT_BINS = 2; #[cfg(any(feature = "v1_10", feature = "dox"))] @@ -788,7 +775,6 @@ impl SetValue for ParseFlags { bitflags! { pub struct PipelineFlags: u32 { const FIXED_CLOCK = 524288; - const LAST = 8388608; } } @@ -835,7 +821,6 @@ impl SetValue for PipelineFlags { bitflags! { pub struct PluginDependencyFlags: u32 { - const NONE = 0; const RECURSE = 1; const PATHS_ARE_DEFAULT_ONLY = 2; const FILE_NAME_IS_SUFFIX = 4; @@ -984,7 +969,6 @@ impl SetValue for SchedulingFlags { bitflags! { pub struct SeekFlags: u32 { - const NONE = 0; const FLUSH = 1; const ACCURATE = 2; const KEY_UNIT = 4; @@ -1047,7 +1031,6 @@ impl SetValue for SeekFlags { bitflags! { #[cfg_attr(feature = "ser_de", derive(Serialize, Deserialize))] pub struct SegmentFlags: u32 { - const NONE = 0; const RESET = 1; const TRICKMODE = 16; const SKIP = 16; @@ -1103,7 +1086,6 @@ impl SetValue for SegmentFlags { #[cfg(any(feature = "v1_12", feature = "dox"))] bitflags! { pub struct StackTraceFlags: u32 { - const NONE = 0; const FULL = 1; } } @@ -1157,7 +1139,6 @@ impl SetValue for StackTraceFlags { bitflags! { pub struct StreamFlags: u32 { - const NONE = 0; const SPARSE = 1; const SELECT = 2; const UNSELECT = 4; diff --git a/gstreamer/src/auto/versions.txt b/gstreamer/src/auto/versions.txt index 6db3a1ff2..eaa6a3f46 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 @ 5a5b8f5) -from gir-files (https://github.com/gtk-rs/gir-files @ 947ac8db) +from gir-files (https://github.com/gtk-rs/gir-files @ 4ac5b6f0)