From 78ae1411ceb6becc7ee2cffb4b312ff9533669bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 10 Apr 2017 14:29:20 +0300 Subject: [PATCH] Revert "tag: Fix enum nicks for backwards compatibility" This reverts commit 595b29519ab6850811ed2e68b75e29a2240a5432. Bindings are not using the nicks but the actual enum names. --- gst-libs/gst/tag/tag.h | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/gst-libs/gst/tag/tag.h b/gst-libs/gst/tag/tag.h index 20013059c4..ebfe96fca4 100644 --- a/gst-libs/gst/tag/tag.h +++ b/gst-libs/gst/tag/tag.h @@ -383,7 +383,7 @@ G_BEGIN_DECLS * @GST_TAG_IMAGE_TYPE_VIDEO_CAPTURE : Movie/video screen capture * @GST_TAG_IMAGE_TYPE_FISH : A fish as funny as the ID3v2 spec * @GST_TAG_IMAGE_TYPE_ILLUSTRATION : Illustration - * @GST_TAG_IMAGE_TYPE_ARTIST_LOGO : Band/artist logotype + * @GST_TAG_IMAGE_TYPE_BAND_ARTIST_LOGO : Band/artist logotype * @GST_TAG_IMAGE_TYPE_PUBLISHER_STUDIO_LOGO : Publisher/studio logotype * * Type of image contained in an image tag (specified as "image-type" field in @@ -409,13 +409,10 @@ typedef enum { GST_TAG_IMAGE_TYPE_VIDEO_CAPTURE, GST_TAG_IMAGE_TYPE_FISH, GST_TAG_IMAGE_TYPE_ILLUSTRATION, - GST_TAG_IMAGE_TYPE_ARTIST_LOGO, + GST_TAG_IMAGE_TYPE_BAND_ARTIST_LOGO, GST_TAG_IMAGE_TYPE_PUBLISHER_STUDIO_LOGO } GstTagImageType; -/* FIXME 2.0: Fix the enum value name */ -#define GST_TAG_IMAGE_TYPE_BAND_ARTIST_LOGO GST_TAG_IMAGE_TYPE_ARTIST_LOGO - /** * GST_TAG_ID3V2_HEADER_SIZE: * @@ -553,7 +550,7 @@ gboolean gst_tag_check_language_code (const gchar * lang_code); * but only non-commercial distribution is allowed * @GST_TAG_LICENSE_REQUIRES_NOTICE: copyright and license notices * must be kept intact - * @GST_TAG_LICENSE_REQUIRES_ATTRIBUTIONS: credit must be given to + * @GST_TAG_LICENSE_REQUIRES_ATTRIBUTION: credit must be given to * copyright holder and/or author * @GST_TAG_LICENSE_REQUIRES_SHARE_ALIKE: derivative works must be * licensed under the same terms or compatible terms as the original work @@ -585,7 +582,7 @@ typedef enum { GST_TAG_LICENSE_PERMITS_SHARING = (1 << 3), GST_TAG_LICENSE_REQUIRES_NOTICE = (1 << 8), - GST_TAG_LICENSE_REQUIRES_ATTRIBUTIONS = (1 << 9), + GST_TAG_LICENSE_REQUIRES_ATTRIBUTION = (1 << 9), GST_TAG_LICENSE_REQUIRES_SHARE_ALIKE = (1 << 10), GST_TAG_LICENSE_REQUIRES_SOURCE_CODE = (1 << 11), GST_TAG_LICENSE_REQUIRES_COPYLEFT = (1 << 12), @@ -598,9 +595,6 @@ typedef enum { GST_TAG_LICENSE_FREE_SOFTWARE_FOUNDATION_LICENSE = (1 << 25) } GstTagLicenseFlags; -/* FIXME 2.0: Fix the enum value name */ -#define GST_TAG_LICENSE_REQUIRES_ATTRIBUTION GST_TAG_LICENSE_REQUIRES_ATTRIBUTIONS - gchar ** gst_tag_get_licenses (void); GstTagLicenseFlags gst_tag_get_license_flags (const gchar * license_ref);