mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 22:36:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "tag: Fix enum nicks for backwards compatibility"

Browse source 
This reverts commit 595b29519a.

Bindings are not using the nicks but the actual enum names.
This commit is contained in:
Sebastian Dröge 2017-04-10 14:29:20 +03:00
parent a69befecd3
commit 78ae1411ce
1 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst-libs/gst/tag/tag.h
View file

@ -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);