From 1e63a820a6fbcb158c126981662f83f4c5174691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 10 Apr 2017 14:10:33 +0300 Subject: [PATCH] Fix GstTag bindings --- gir-files/GstTag-1.0.gir | 142 ++++++++++++++++++++++++----------- gstreamer-tag-sys/src/lib.rs | 8 +- 2 files changed, 104 insertions(+), 46 deletions(-) diff --git a/gir-files/GstTag-1.0.gir b/gir-files/GstTag-1.0.gir index 93190857d..60d6acd26 100644 --- a/gir-files/GstTag-1.0.gir +++ b/gir-files/GstTag-1.0.gir @@ -515,179 +515,233 @@ Subclasses should set this in their class_init function. - + Result values from the parse_tag virtual function. + c:identifier="GST_TAG_DEMUX_RESULT_BROKEN_TAG" + glib:nick="broken-tag"> cannot parse tag, just skip it - + call again with less or more data - + parsed tag successfully - + Type of image contained in an image tag (specified as "image-type" field in the info structure in the image's #GstSample) - + No image type. Can be used to tell functions such as gst_tag_image_data_to_image_sample() that no image type should be set. + c:identifier="GST_TAG_IMAGE_TYPE_UNDEFINED" + glib:nick="undefined"> Undefined/other image type + c:identifier="GST_TAG_IMAGE_TYPE_FRONT_COVER" + glib:nick="front-cover"> Cover (front) + c:identifier="GST_TAG_IMAGE_TYPE_BACK_COVER" + glib:nick="back-cover"> Cover (back) + c:identifier="GST_TAG_IMAGE_TYPE_LEAFLET_PAGE" + glib:nick="leaflet-page"> Leaflet page - + Medium (e.g. label side of CD) + c:identifier="GST_TAG_IMAGE_TYPE_LEAD_ARTIST" + glib:nick="lead-artist"> Lead artist/lead performer/soloist - + Artist/performer + c:identifier="GST_TAG_IMAGE_TYPE_CONDUCTOR" + glib:nick="conductor"> Conductor + c:identifier="GST_TAG_IMAGE_TYPE_BAND_ORCHESTRA" + glib:nick="band-orchestra"> Band/orchestra + c:identifier="GST_TAG_IMAGE_TYPE_COMPOSER" + glib:nick="composer"> Composer + c:identifier="GST_TAG_IMAGE_TYPE_LYRICIST" + glib:nick="lyricist"> Lyricist/text writer + c:identifier="GST_TAG_IMAGE_TYPE_RECORDING_LOCATION" + glib:nick="recording-location"> Recording location + c:identifier="GST_TAG_IMAGE_TYPE_DURING_RECORDING" + glib:nick="during-recording"> During recording + c:identifier="GST_TAG_IMAGE_TYPE_DURING_PERFORMANCE" + glib:nick="during-performance"> During performance + c:identifier="GST_TAG_IMAGE_TYPE_VIDEO_CAPTURE" + glib:nick="video-capture"> Movie/video screen capture - + A fish as funny as the ID3v2 spec + c:identifier="GST_TAG_IMAGE_TYPE_ILLUSTRATION" + glib:nick="illustration"> Illustration - + c:identifier="GST_TAG_IMAGE_TYPE_ARTIST_LOGO" + glib:nick="artist-logo"> Band/artist logotype + c:identifier="GST_TAG_IMAGE_TYPE_PUBLISHER_STUDIO_LOGO" + glib:nick="publisher-studio-logo"> Publisher/studio logotype - + See http://creativecommons.org/ns for more information. + c:identifier="GST_TAG_LICENSE_PERMITS_REPRODUCTION" + glib:nick="permits-reproduction"> making multiple copies is allowed + c:identifier="GST_TAG_LICENSE_PERMITS_DISTRIBUTION" + glib:nick="permits-distribution"> distribution, public display and public performance are allowed + c:identifier="GST_TAG_LICENSE_PERMITS_DERIVATIVE_WORKS" + glib:nick="permits-derivative-works"> distribution of derivative works is allowed + c:identifier="GST_TAG_LICENSE_PERMITS_SHARING" + glib:nick="permits-sharing"> commercial derivatives are allowed, but only non-commercial distribution is allowed + c:identifier="GST_TAG_LICENSE_REQUIRES_NOTICE" + glib:nick="requires-notice"> copyright and license notices must be kept intact - + c:identifier="GST_TAG_LICENSE_REQUIRES_ATTRIBUTIONS" + glib:nick="requires-attributions"> credit must be given to copyright holder and/or author + c:identifier="GST_TAG_LICENSE_REQUIRES_SHARE_ALIKE" + glib:nick="requires-share-alike"> derivative works must be licensed under the same terms or compatible terms as the original work + c:identifier="GST_TAG_LICENSE_REQUIRES_SOURCE_CODE" + glib:nick="requires-source-code"> source code (the preferred form for making modifications) must be provided when exercising some rights granted by the license + c:identifier="GST_TAG_LICENSE_REQUIRES_COPYLEFT" + glib:nick="requires-copyleft"> derivative and combined works must be licensed under specified terms, similar to those of the original work + c:identifier="GST_TAG_LICENSE_REQUIRES_LESSER_COPYLEFT" + glib:nick="requires-lesser-copyleft"> derivative works must be licensed under specified terms, with at least the same conditions as the original work; combinations with the work may be licensed under @@ -695,25 +749,29 @@ the info structure in the image's #GstSample) + c:identifier="GST_TAG_LICENSE_PROHIBITS_COMMERCIAL_USE" + glib:nick="prohibits-commercial-use"> exercising rights for commercial purposes is prohibited + c:identifier="GST_TAG_LICENSE_PROHIBITS_HIGH_INCOME_NATION_USE" + glib:nick="prohibits-high-income-nation-use"> use in a non-developing country is prohibited + c:identifier="GST_TAG_LICENSE_CREATIVE_COMMONS_LICENSE" + glib:nick="creative-commons-license"> this license was created by the Creative Commons project + c:identifier="GST_TAG_LICENSE_FREE_SOFTWARE_FOUNDATION_LICENSE" + glib:nick="free-software-foundation-license"> this license was created by the Free Software Foundation (FSF) diff --git a/gstreamer-tag-sys/src/lib.rs b/gstreamer-tag-sys/src/lib.rs index 6f73a6d46..3c832d2c9 100644 --- a/gstreamer-tag-sys/src/lib.rs +++ b/gstreamer-tag-sys/src/lib.rs @@ -1,4 +1,4 @@ -// This file was generated by gir (bf7bd49) from gir-files (???) +// This file was generated by gir (038b513) from gir-files (???) // DO NOT EDIT #![allow(non_camel_case_types, non_upper_case_globals)] @@ -51,7 +51,7 @@ pub enum GstTagImageType { VideoCapture = 14, Fish = 15, Illustration = 16, - BandArtistLogo = 17, + ArtistLogo = 17, PublisherStudioLogo = 18, } pub const GST_TAG_IMAGE_TYPE_NONE: GstTagImageType = GstTagImageType::None; @@ -72,7 +72,7 @@ pub const GST_TAG_IMAGE_TYPE_DURING_PERFORMANCE: GstTagImageType = GstTagImageTy pub const GST_TAG_IMAGE_TYPE_VIDEO_CAPTURE: GstTagImageType = GstTagImageType::VideoCapture; pub const GST_TAG_IMAGE_TYPE_FISH: GstTagImageType = GstTagImageType::Fish; pub const GST_TAG_IMAGE_TYPE_ILLUSTRATION: GstTagImageType = GstTagImageType::Illustration; -pub const GST_TAG_IMAGE_TYPE_BAND_ARTIST_LOGO: GstTagImageType = GstTagImageType::BandArtistLogo; +pub const GST_TAG_IMAGE_TYPE_ARTIST_LOGO: GstTagImageType = GstTagImageType::ArtistLogo; pub const GST_TAG_IMAGE_TYPE_PUBLISHER_STUDIO_LOGO: GstTagImageType = GstTagImageType::PublisherStudioLogo; // Constants @@ -121,7 +121,7 @@ bitflags! { const GST_TAG_LICENSE_PERMITS_DERIVATIVE_WORKS = 4, const GST_TAG_LICENSE_PERMITS_SHARING = 8, const GST_TAG_LICENSE_REQUIRES_NOTICE = 256, - const GST_TAG_LICENSE_REQUIRES_ATTRIBUTION = 512, + const GST_TAG_LICENSE_REQUIRES_ATTRIBUTIONS = 512, const GST_TAG_LICENSE_REQUIRES_SHARE_ALIKE = 1024, const GST_TAG_LICENSE_REQUIRES_SOURCE_CODE = 2048, const GST_TAG_LICENSE_REQUIRES_COPYLEFT = 4096,