From f8571bd952bf0e0b420a0990388ab7b4b5959686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 7 Oct 2006 18:11:03 +0000 Subject: [PATCH] gst/gsttaglist.h: Less tabs, more spaces. Original commit message from CVS: * gst/gsttaglist.h: Less tabs, more spaces. --- ChangeLog | 5 + gst/gsttaglist.h | 401 +++++++++++++++++++++++------------------------ 2 files changed, 204 insertions(+), 202 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6abdc652f3..a4617362b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-10-07 Tim-Philipp Müller + + * gst/gsttaglist.h: + Less tabs, more spaces. + 2006-10-06 Tim-Philipp Müller * gst/gstinfo.h: diff --git a/gst/gsttaglist.h b/gst/gsttaglist.h index a3b3d0d5fb..cd25451853 100644 --- a/gst/gsttaglist.h +++ b/gst/gsttaglist.h @@ -81,9 +81,9 @@ typedef enum { * Opaque #GstTagList data structure. */ typedef GstStructure GstTagList; -#define GST_TAG_LIST(x) ((GstTagList *) (x)) -#define GST_IS_TAG_LIST(x) (gst_is_tag_list (GST_TAG_LIST (x))) -#define GST_TYPE_TAG_LIST (gst_tag_list_get_type ()) +#define GST_TAG_LIST(x) ((GstTagList *) (x)) +#define GST_IS_TAG_LIST(x) (gst_is_tag_list (GST_TAG_LIST (x))) +#define GST_TYPE_TAG_LIST (gst_tag_list_get_type ()) /** * GstTagForeachFunc: @@ -94,9 +94,9 @@ typedef GstStructure GstTagList; * A function that will be called in gst_tag_list_foreach(). The function may * not modify the tag list. */ -typedef void (*GstTagForeachFunc) (const GstTagList *list, - const gchar * tag, - gpointer user_data); +typedef void (*GstTagForeachFunc) (const GstTagList * list, + const gchar * tag, + gpointer user_data); /** * GstTagMergeFunc: @@ -106,176 +106,173 @@ typedef void (*GstTagForeachFunc) (const GstTagList *list, * A function for merging multiple values of a tag used when registering * tags. */ -typedef void (* GstTagMergeFunc) (GValue *dest, const GValue *src); +typedef void (* GstTagMergeFunc) (GValue *dest, const GValue *src); /* initialize tagging system */ -void _gst_tag_initialize (void); -GType gst_tag_list_get_type (void); +void _gst_tag_initialize (void); +GType gst_tag_list_get_type (void); + +void gst_tag_register (const gchar * name, + GstTagFlag flag, + GType type, + const gchar * nick, + const gchar * blurb, + GstTagMergeFunc func); -void gst_tag_register (const gchar * name, - GstTagFlag flag, - GType type, - const gchar * nick, - const gchar * blurb, - GstTagMergeFunc func); /* some default merging functions */ -void gst_tag_merge_use_first (GValue * dest, - const GValue * src); -void gst_tag_merge_strings_with_comma (GValue * dest, - const GValue * src); +void gst_tag_merge_use_first (GValue * dest, const GValue * src); +void gst_tag_merge_strings_with_comma (GValue * dest, const GValue * src); /* basic tag support */ -gboolean gst_tag_exists (const gchar * tag); -GType gst_tag_get_type (const gchar * tag); -G_CONST_RETURN gchar * - gst_tag_get_nick (const gchar * tag); -G_CONST_RETURN gchar * - gst_tag_get_description (const gchar * tag); -GstTagFlag gst_tag_get_flag (const gchar * tag); -gboolean gst_tag_is_fixed (const gchar * tag); +gboolean gst_tag_exists (const gchar * tag); +GType gst_tag_get_type (const gchar * tag); +G_CONST_RETURN gchar * gst_tag_get_nick (const gchar * tag); +G_CONST_RETURN gchar * gst_tag_get_description (const gchar * tag); +GstTagFlag gst_tag_get_flag (const gchar * tag); +gboolean gst_tag_is_fixed (const gchar * tag); /* tag lists */ -GstTagList * gst_tag_list_new (void); -gboolean gst_is_tag_list (gconstpointer p); -GstTagList * gst_tag_list_copy (const GstTagList * list); -void gst_tag_list_insert (GstTagList * into, - const GstTagList * from, - GstTagMergeMode mode); -GstTagList * gst_tag_list_merge (const GstTagList * list1, - const GstTagList * list2, - GstTagMergeMode mode); -void gst_tag_list_free (GstTagList * list); -guint gst_tag_list_get_tag_size (const GstTagList * list, - const gchar * tag); -void gst_tag_list_add (GstTagList * list, - GstTagMergeMode mode, - const gchar * tag, - ...) G_GNUC_NULL_TERMINATED; -void gst_tag_list_add_values (GstTagList * list, - GstTagMergeMode mode, - const gchar * tag, - ...) G_GNUC_NULL_TERMINATED; -void gst_tag_list_add_valist (GstTagList * list, - GstTagMergeMode mode, - const gchar * tag, - va_list var_args); -void gst_tag_list_add_valist_values (GstTagList * list, - GstTagMergeMode mode, - const gchar * tag, - va_list var_args); -void gst_tag_list_remove_tag (GstTagList * list, - const gchar * tag); -void gst_tag_list_foreach (const GstTagList * list, - GstTagForeachFunc func, - gpointer user_data); +GstTagList * gst_tag_list_new (void); +gboolean gst_is_tag_list (gconstpointer p); +GstTagList * gst_tag_list_copy (const GstTagList * list); +void gst_tag_list_insert (GstTagList * into, + const GstTagList * from, + GstTagMergeMode mode); +GstTagList * gst_tag_list_merge (const GstTagList * list1, + const GstTagList * list2, + GstTagMergeMode mode); +void gst_tag_list_free (GstTagList * list); +guint gst_tag_list_get_tag_size (const GstTagList * list, + const gchar * tag); +void gst_tag_list_add (GstTagList * list, + GstTagMergeMode mode, + const gchar * tag, + ...) G_GNUC_NULL_TERMINATED; +void gst_tag_list_add_values (GstTagList * list, + GstTagMergeMode mode, + const gchar * tag, + ...) G_GNUC_NULL_TERMINATED; +void gst_tag_list_add_valist (GstTagList * list, + GstTagMergeMode mode, + const gchar * tag, + va_list var_args); +void gst_tag_list_add_valist_values (GstTagList * list, + GstTagMergeMode mode, + const gchar * tag, + va_list var_args); +void gst_tag_list_remove_tag (GstTagList * list, + const gchar * tag); +void gst_tag_list_foreach (const GstTagList * list, + GstTagForeachFunc func, + gpointer user_data); G_CONST_RETURN GValue * - gst_tag_list_get_value_index (const GstTagList * list, - const gchar * tag, - guint index); -gboolean gst_tag_list_copy_value (GValue * dest, - const GstTagList * list, - const gchar * tag); + gst_tag_list_get_value_index (const GstTagList * list, + const gchar * tag, + guint index); +gboolean gst_tag_list_copy_value (GValue * dest, + const GstTagList * list, + const gchar * tag); /* simplifications (FIXME: do we want them?) */ -gboolean gst_tag_list_get_char (const GstTagList * list, - const gchar * tag, - gchar * value); -gboolean gst_tag_list_get_char_index (const GstTagList * list, - const gchar * tag, - guint index, - gchar * value); -gboolean gst_tag_list_get_uchar (const GstTagList * list, - const gchar * tag, - guchar * value); -gboolean gst_tag_list_get_uchar_index (const GstTagList * list, - const gchar * tag, - guint index, - guchar * value); -gboolean gst_tag_list_get_boolean (const GstTagList * list, - const gchar * tag, - gboolean * value); -gboolean gst_tag_list_get_boolean_index (const GstTagList * list, - const gchar * tag, - guint index, - gboolean * value); -gboolean gst_tag_list_get_int (const GstTagList * list, - const gchar * tag, - gint * value); -gboolean gst_tag_list_get_int_index (const GstTagList * list, - const gchar * tag, - guint index, - gint * value); -gboolean gst_tag_list_get_uint (const GstTagList * list, - const gchar * tag, - guint * value); -gboolean gst_tag_list_get_uint_index (const GstTagList * list, - const gchar * tag, - guint index, - guint * value); -gboolean gst_tag_list_get_long (const GstTagList * list, - const gchar * tag, - glong * value); -gboolean gst_tag_list_get_long_index (const GstTagList * list, - const gchar * tag, - guint index, - glong * value); -gboolean gst_tag_list_get_ulong (const GstTagList * list, - const gchar * tag, - gulong * value); -gboolean gst_tag_list_get_ulong_index (const GstTagList * list, - const gchar * tag, - guint index, - gulong * value); -gboolean gst_tag_list_get_int64 (const GstTagList * list, - const gchar * tag, - gint64 * value); -gboolean gst_tag_list_get_int64_index (const GstTagList * list, - const gchar * tag, - guint index, - gint64 * value); -gboolean gst_tag_list_get_uint64 (const GstTagList * list, - const gchar * tag, - guint64 * value); -gboolean gst_tag_list_get_uint64_index (const GstTagList * list, - const gchar * tag, - guint index, - guint64 * value); -gboolean gst_tag_list_get_float (const GstTagList * list, - const gchar * tag, - gfloat * value); -gboolean gst_tag_list_get_float_index (const GstTagList * list, - const gchar * tag, - guint index, - gfloat * value); -gboolean gst_tag_list_get_double (const GstTagList * list, - const gchar * tag, - gdouble * value); -gboolean gst_tag_list_get_double_index (const GstTagList * list, - const gchar * tag, - guint index, - gdouble * value); -gboolean gst_tag_list_get_string (const GstTagList * list, - const gchar * tag, - gchar ** value); -gboolean gst_tag_list_get_string_index (const GstTagList * list, - const gchar * tag, - guint index, - gchar ** value); -gboolean gst_tag_list_get_pointer (const GstTagList * list, - const gchar * tag, - gpointer * value); -gboolean gst_tag_list_get_pointer_index (const GstTagList * list, - const gchar * tag, - guint index, - gpointer * value); -gboolean gst_tag_list_get_date (const GstTagList * list, - const gchar * tag, - GDate ** value); -gboolean gst_tag_list_get_date_index (const GstTagList * list, - const gchar * tag, - guint index, - GDate ** value); +gboolean gst_tag_list_get_char (const GstTagList * list, + const gchar * tag, + gchar * value); +gboolean gst_tag_list_get_char_index (const GstTagList * list, + const gchar * tag, + guint index, + gchar * value); +gboolean gst_tag_list_get_uchar (const GstTagList * list, + const gchar * tag, + guchar * value); +gboolean gst_tag_list_get_uchar_index (const GstTagList * list, + const gchar * tag, + guint index, + guchar * value); +gboolean gst_tag_list_get_boolean (const GstTagList * list, + const gchar * tag, + gboolean * value); +gboolean gst_tag_list_get_boolean_index (const GstTagList * list, + const gchar * tag, + guint index, + gboolean * value); +gboolean gst_tag_list_get_int (const GstTagList * list, + const gchar * tag, + gint * value); +gboolean gst_tag_list_get_int_index (const GstTagList * list, + const gchar * tag, + guint index, + gint * value); +gboolean gst_tag_list_get_uint (const GstTagList * list, + const gchar * tag, + guint * value); +gboolean gst_tag_list_get_uint_index (const GstTagList * list, + const gchar * tag, + guint index, + guint * value); +gboolean gst_tag_list_get_long (const GstTagList * list, + const gchar * tag, + glong * value); +gboolean gst_tag_list_get_long_index (const GstTagList * list, + const gchar * tag, + guint index, + glong * value); +gboolean gst_tag_list_get_ulong (const GstTagList * list, + const gchar * tag, + gulong * value); +gboolean gst_tag_list_get_ulong_index (const GstTagList * list, + const gchar * tag, + guint index, + gulong * value); +gboolean gst_tag_list_get_int64 (const GstTagList * list, + const gchar * tag, + gint64 * value); +gboolean gst_tag_list_get_int64_index (const GstTagList * list, + const gchar * tag, + guint index, + gint64 * value); +gboolean gst_tag_list_get_uint64 (const GstTagList * list, + const gchar * tag, + guint64 * value); +gboolean gst_tag_list_get_uint64_index (const GstTagList * list, + const gchar * tag, + guint index, + guint64 * value); +gboolean gst_tag_list_get_float (const GstTagList * list, + const gchar * tag, + gfloat * value); +gboolean gst_tag_list_get_float_index (const GstTagList * list, + const gchar * tag, + guint index, + gfloat * value); +gboolean gst_tag_list_get_double (const GstTagList * list, + const gchar * tag, + gdouble * value); +gboolean gst_tag_list_get_double_index (const GstTagList * list, + const gchar * tag, + guint index, + gdouble * value); +gboolean gst_tag_list_get_string (const GstTagList * list, + const gchar * tag, + gchar ** value); +gboolean gst_tag_list_get_string_index (const GstTagList * list, + const gchar * tag, + guint index, + gchar ** value); +gboolean gst_tag_list_get_pointer (const GstTagList * list, + const gchar * tag, + gpointer * value); +gboolean gst_tag_list_get_pointer_index (const GstTagList * list, + const gchar * tag, + guint index, + gpointer * value); +gboolean gst_tag_list_get_date (const GstTagList * list, + const gchar * tag, + GDate ** value); +gboolean gst_tag_list_get_date_index (const GstTagList * list, + const gchar * tag, + guint index, + GDate ** value); /* GStreamer core tags */ /** @@ -283,37 +280,37 @@ gboolean gst_tag_list_get_date_index (const GstTagList * list, * * commonly used title (string) */ -#define GST_TAG_TITLE "title" +#define GST_TAG_TITLE "title" /** * GST_TAG_ARTIST: * * person(s) responsible for the recording (string) */ -#define GST_TAG_ARTIST "artist" +#define GST_TAG_ARTIST "artist" /** * GST_TAG_ALBUM: * * album containing this data (string) */ -#define GST_TAG_ALBUM "album" +#define GST_TAG_ALBUM "album" /** * GST_TAG_DATE: * * date the data was created (#GDate structure) */ -#define GST_TAG_DATE "date" +#define GST_TAG_DATE "date" /** * GST_TAG_GENRE: * * genre this data belongs to (string) */ -#define GST_TAG_GENRE "genre" +#define GST_TAG_GENRE "genre" /** * GST_TAG_COMMENT: * * free text commenting the data (string) */ -#define GST_TAG_COMMENT "comment" +#define GST_TAG_COMMENT "comment" /** * GST_TAG_EXTENDED_COMMENT: * @@ -328,181 +325,181 @@ gboolean gst_tag_list_get_date_index (const GstTagList * list, * * Since: 0.10.10 */ -#define GST_TAG_EXTENDED_COMMENT "extended-comment" +#define GST_TAG_EXTENDED_COMMENT "extended-comment" /** * GST_TAG_TRACK_NUMBER: * * track number inside a collection (unsigned integer) */ -#define GST_TAG_TRACK_NUMBER "track-number" +#define GST_TAG_TRACK_NUMBER "track-number" /** * GST_TAG_TRACK_COUNT: * * count of tracks inside collection this track belongs to (unsigned integer) */ -#define GST_TAG_TRACK_COUNT "track-count" +#define GST_TAG_TRACK_COUNT "track-count" /** * GST_TAG_ALBUM_VOLUME_NUMBER: * * disc number inside a collection (unsigned integer) */ -#define GST_TAG_ALBUM_VOLUME_NUMBER "album-disc-number" +#define GST_TAG_ALBUM_VOLUME_NUMBER "album-disc-number" /** * GST_TAG_ALBUM_VOLUME_COUNT: * * count of discs inside collection this disc belongs to (unsigned integer) */ -#define GST_TAG_ALBUM_VOLUME_COUNT "album-disc-count" +#define GST_TAG_ALBUM_VOLUME_COUNT "album-disc-count" /** * GST_TAG_LOCATION: * * original location of file as a URI (string) */ -#define GST_TAG_LOCATION "location" +#define GST_TAG_LOCATION "location" /** * GST_TAG_DESCRIPTION: * * short text describing the content of the data (string) */ -#define GST_TAG_DESCRIPTION "description" +#define GST_TAG_DESCRIPTION "description" /** * GST_TAG_VERSION: * * version of this data (string) */ -#define GST_TAG_VERSION "version" +#define GST_TAG_VERSION "version" /** * GST_TAG_ISRC: * * International Standard Recording Code - see http://www.ifpi.org/isrc/ (string) */ -#define GST_TAG_ISRC "isrc" +#define GST_TAG_ISRC "isrc" /** * GST_TAG_ORGANIZATION: * * organization (string) */ -#define GST_TAG_ORGANIZATION "organization" +#define GST_TAG_ORGANIZATION "organization" /** * GST_TAG_COPYRIGHT: * * copyright notice of the data (string) */ -#define GST_TAG_COPYRIGHT "copyright" +#define GST_TAG_COPYRIGHT "copyright" /** * GST_TAG_CONTACT: * * contact information (string) */ -#define GST_TAG_CONTACT "contact" +#define GST_TAG_CONTACT "contact" /** * GST_TAG_LICENSE: * * license of data (string) */ -#define GST_TAG_LICENSE "license" +#define GST_TAG_LICENSE "license" /** * GST_TAG_PERFORMER: * * person(s) performing (string) */ -#define GST_TAG_PERFORMER "performer" +#define GST_TAG_PERFORMER "performer" /** * GST_TAG_DURATION: * * length in GStreamer time units (nanoseconds) (unsigned 64-bit integer) */ -#define GST_TAG_DURATION "duration" +#define GST_TAG_DURATION "duration" /** * GST_TAG_CODEC: * * codec the data is stored in (string) */ -#define GST_TAG_CODEC "codec" +#define GST_TAG_CODEC "codec" /** * GST_TAG_VIDEO_CODEC: * * codec the video data is stored in (string) */ -#define GST_TAG_VIDEO_CODEC "video-codec" +#define GST_TAG_VIDEO_CODEC "video-codec" /** * GST_TAG_AUDIO_CODEC: * * codec the audio data is stored in (string) */ -#define GST_TAG_AUDIO_CODEC "audio-codec" +#define GST_TAG_AUDIO_CODEC "audio-codec" /** * GST_TAG_BITRATE: * * exact or average bitrate in bits/s (unsigned integer) */ -#define GST_TAG_BITRATE "bitrate" +#define GST_TAG_BITRATE "bitrate" /** * GST_TAG_NOMINAL_BITRATE: * * nominal bitrate in bits/s (unsigned integer) */ -#define GST_TAG_NOMINAL_BITRATE "nominal-bitrate" +#define GST_TAG_NOMINAL_BITRATE "nominal-bitrate" /** * GST_TAG_MINIMUM_BITRATE: * * minimum bitrate in bits/s (unsigned integer) */ -#define GST_TAG_MINIMUM_BITRATE "minimum-bitrate" +#define GST_TAG_MINIMUM_BITRATE "minimum-bitrate" /** * GST_TAG_MAXIMUM_BITRATE: * * maximum bitrate in bits/s (unsigned integer) */ -#define GST_TAG_MAXIMUM_BITRATE "maximum-bitrate" +#define GST_TAG_MAXIMUM_BITRATE "maximum-bitrate" /** * GST_TAG_SERIAL: * * serial number of track (unsigned integer) */ -#define GST_TAG_SERIAL "serial" +#define GST_TAG_SERIAL "serial" /** * GST_TAG_ENCODER: * * encoder used to encode this stream (string) */ -#define GST_TAG_ENCODER "encoder" +#define GST_TAG_ENCODER "encoder" /** * GST_TAG_ENCODER_VERSION: * * version of the encoder used to encode this stream (unsigned integer) */ -#define GST_TAG_ENCODER_VERSION "encoder-version" +#define GST_TAG_ENCODER_VERSION "encoder-version" /** * GST_TAG_TRACK_GAIN: * * track gain in db (double) */ -#define GST_TAG_TRACK_GAIN "replaygain-track-gain" +#define GST_TAG_TRACK_GAIN "replaygain-track-gain" /** * GST_TAG_TRACK_PEAK: * * peak of the track (double) */ -#define GST_TAG_TRACK_PEAK "replaygain-track-peak" +#define GST_TAG_TRACK_PEAK "replaygain-track-peak" /** * GST_TAG_ALBUM_GAIN: * * album gain in db (double) */ -#define GST_TAG_ALBUM_GAIN "replaygain-album-gain" +#define GST_TAG_ALBUM_GAIN "replaygain-album-gain" /** * GST_TAG_ALBUM_PEAK: * * peak of the album (double) */ -#define GST_TAG_ALBUM_PEAK "replaygain-album-peak" +#define GST_TAG_ALBUM_PEAK "replaygain-album-peak" /** * GST_TAG_LANGUAGE_CODE: * * Language code (ISO-639-1) (string) */ -#define GST_TAG_LANGUAGE_CODE "language-code" +#define GST_TAG_LANGUAGE_CODE "language-code" /** * GST_TAG_IMAGE: * @@ -510,7 +507,7 @@ gboolean gst_tag_list_get_date_index (const GstTagList * list, * * Since: 0.10.6 */ -#define GST_TAG_IMAGE "image" +#define GST_TAG_IMAGE "image" /** * GST_TAG_PREVIEW_IMAGE: * @@ -519,7 +516,7 @@ gboolean gst_tag_list_get_date_index (const GstTagList * list, * * Since: 0.10.7 */ -#define GST_TAG_PREVIEW_IMAGE "preview-image" +#define GST_TAG_PREVIEW_IMAGE "preview-image" G_END_DECLS