diff options
Diffstat (limited to '')
-rw-r--r-- | src/tag/ApeTag.cxx | 6 | ||||
-rw-r--r-- | src/tag/Tag.cxx | 18 | ||||
-rw-r--r-- | src/tag/Tag.hxx | 20 | ||||
-rw-r--r-- | src/tag/TagBuilder.cxx | 6 | ||||
-rw-r--r-- | src/tag/TagBuilder.hxx | 6 | ||||
-rw-r--r-- | src/tag/TagHandler.cxx | 2 | ||||
-rw-r--r-- | src/tag/TagHandler.hxx | 4 | ||||
-rw-r--r-- | src/tag/TagId3.cxx | 14 | ||||
-rw-r--r-- | src/tag/TagItem.hxx | 4 | ||||
-rw-r--r-- | src/tag/TagPool.cxx | 8 | ||||
-rw-r--r-- | src/tag/TagPool.hxx | 2 | ||||
-rw-r--r-- | src/tag/TagTable.cxx | 4 | ||||
-rw-r--r-- | src/tag/TagTable.hxx | 6 | ||||
-rw-r--r-- | src/tag/TagType.h | 4 |
14 files changed, 52 insertions, 52 deletions
diff --git a/src/tag/ApeTag.cxx b/src/tag/ApeTag.cxx index 266d1546f..fa2e744c4 100644 --- a/src/tag/ApeTag.cxx +++ b/src/tag/ApeTag.cxx @@ -34,10 +34,10 @@ const struct tag_table ape_tags[] = { { nullptr, TAG_NUM_OF_ITEM_TYPES } }; -static enum tag_type +static TagType tag_ape_name_parse(const char *name) { - enum tag_type type = tag_table_lookup_i(ape_tags, name); + TagType type = tag_table_lookup_i(ape_tags, name); if (type == TAG_NUM_OF_ITEM_TYPES) type = tag_name_parse_i(name); @@ -58,7 +58,7 @@ tag_ape_import_item(unsigned long flags, tag_handler_invoke_pair(handler, handler_ctx, key, value); - enum tag_type type = tag_ape_name_parse(key); + TagType type = tag_ape_name_parse(key); if (type == TAG_NUM_OF_ITEM_TYPES) return false; diff --git a/src/tag/Tag.cxx b/src/tag/Tag.cxx index 8e6766f80..6ff8b3dc9 100644 --- a/src/tag/Tag.cxx +++ b/src/tag/Tag.cxx @@ -27,7 +27,7 @@ #include <assert.h> #include <string.h> -enum tag_type +TagType tag_name_parse(const char *name) { assert(name != nullptr); @@ -36,13 +36,13 @@ tag_name_parse(const char *name) assert(tag_item_names[i] != nullptr); if (strcmp(name, tag_item_names[i]) == 0) - return (enum tag_type)i; + return (TagType)i; } return TAG_NUM_OF_ITEM_TYPES; } -enum tag_type +TagType tag_name_parse_i(const char *name) { assert(name != nullptr); @@ -51,7 +51,7 @@ tag_name_parse_i(const char *name) assert(tag_item_names[i] != nullptr); if (g_ascii_strcasecmp(name, tag_item_names[i]) == 0) - return (enum tag_type)i; + return (TagType)i; } return TAG_NUM_OF_ITEM_TYPES; @@ -166,7 +166,7 @@ Tag::MergeReplace(Tag *base, Tag *add) } const char * -Tag::GetValue(tag_type type) const +Tag::GetValue(TagType type) const { assert(type < TAG_NUM_OF_ITEM_TYPES); @@ -178,13 +178,13 @@ Tag::GetValue(tag_type type) const } bool -Tag::HasType(tag_type type) const +Tag::HasType(TagType type) const { return GetValue(type) != nullptr; } void -Tag::AddItemInternal(tag_type type, const char *value, size_t len) +Tag::AddItemInternal(TagType type, const char *value, size_t len) { unsigned int i = num_items; @@ -206,7 +206,7 @@ Tag::AddItemInternal(tag_type type, const char *value, size_t len) } void -Tag::AddItem(tag_type type, const char *value, size_t len) +Tag::AddItem(TagType type, const char *value, size_t len) { if (ignore_tag_items[type]) return; @@ -218,7 +218,7 @@ Tag::AddItem(tag_type type, const char *value, size_t len) } void -Tag::AddItem(tag_type type, const char *value) +Tag::AddItem(TagType type, const char *value) { AddItem(type, value, strlen(value)); } diff --git a/src/tag/Tag.hxx b/src/tag/Tag.hxx index 4a1b16b39..4d8f1a4e8 100644 --- a/src/tag/Tag.hxx +++ b/src/tag/Tag.hxx @@ -110,7 +110,7 @@ struct Tag { * @param value the value of the tag item (not null-terminated) * @param len the length of #value */ - void AddItem(tag_type type, const char *value, size_t len); + void AddItem(TagType type, const char *value, size_t len); /** * Appends a new tag item. @@ -119,11 +119,11 @@ struct Tag { * @param type the type of the new tag item * @param value the value of the tag item (null-terminated) */ - void AddItem(tag_type type, const char *value); + void AddItem(TagType type, const char *value); /** * Merges the data from two tags. If both tags share data for the - * same tag_type, only data from "add" is used. + * same TagType, only data from "add" is used. * * @return a newly allocated tag */ @@ -144,35 +144,35 @@ struct Tag { * is present in this tag object. */ gcc_pure - const char *GetValue(tag_type type) const; + const char *GetValue(TagType type) const; /** * Checks whether the tag contains one or more items with * the specified type. */ gcc_pure - bool HasType(tag_type type) const; + bool HasType(TagType type) const; private: - void AddItemInternal(tag_type type, const char *value, size_t len); + void AddItemInternal(TagType type, const char *value, size_t len); }; /** - * Parse the string, and convert it into a #tag_type. Returns + * Parse the string, and convert it into a #TagType. Returns * #TAG_NUM_OF_ITEM_TYPES if the string could not be recognized. */ gcc_pure -enum tag_type +TagType tag_name_parse(const char *name); /** - * Parse the string, and convert it into a #tag_type. Returns + * Parse the string, and convert it into a #TagType. Returns * #TAG_NUM_OF_ITEM_TYPES if the string could not be recognized. * * Case does not matter. */ gcc_pure -enum tag_type +TagType tag_name_parse_i(const char *name); #endif diff --git a/src/tag/TagBuilder.cxx b/src/tag/TagBuilder.cxx index 23409fe33..25e5cc24b 100644 --- a/src/tag/TagBuilder.cxx +++ b/src/tag/TagBuilder.cxx @@ -75,7 +75,7 @@ TagBuilder::Commit() } inline void -TagBuilder::AddItemInternal(tag_type type, const char *value, size_t length) +TagBuilder::AddItemInternal(TagType type, const char *value, size_t length) { assert(value != nullptr); assert(length > 0); @@ -96,7 +96,7 @@ TagBuilder::AddItemInternal(tag_type type, const char *value, size_t length) } void -TagBuilder::AddItem(tag_type type, const char *value, size_t length) +TagBuilder::AddItem(TagType type, const char *value, size_t length) { assert(value != nullptr); @@ -107,7 +107,7 @@ TagBuilder::AddItem(tag_type type, const char *value, size_t length) } void -TagBuilder::AddItem(tag_type type, const char *value) +TagBuilder::AddItem(TagType type, const char *value) { assert(value != nullptr); diff --git a/src/tag/TagBuilder.hxx b/src/tag/TagBuilder.hxx index d737f2b2e..ffc60a1b2 100644 --- a/src/tag/TagBuilder.hxx +++ b/src/tag/TagBuilder.hxx @@ -116,7 +116,7 @@ public: * @param len the length of #value */ gcc_nonnull_all - void AddItem(tag_type type, const char *value, size_t length); + void AddItem(TagType type, const char *value, size_t length); /** * Appends a new tag item. @@ -125,11 +125,11 @@ public: * @param value the value of the tag item (null-terminated) */ gcc_nonnull_all - void AddItem(tag_type type, const char *value); + void AddItem(TagType type, const char *value); private: gcc_nonnull_all - void AddItemInternal(tag_type type, const char *value, size_t length); + void AddItemInternal(TagType type, const char *value, size_t length); }; #endif diff --git a/src/tag/TagHandler.cxx b/src/tag/TagHandler.cxx index 859f92b20..9e31a7d1d 100644 --- a/src/tag/TagHandler.cxx +++ b/src/tag/TagHandler.cxx @@ -32,7 +32,7 @@ add_tag_duration(unsigned seconds, void *ctx) } static void -add_tag_tag(enum tag_type type, const char *value, void *ctx) +add_tag_tag(TagType type, const char *value, void *ctx) { TagBuilder &tag = *(TagBuilder *)ctx; diff --git a/src/tag/TagHandler.hxx b/src/tag/TagHandler.hxx index 36871c962..b8c3c6b79 100644 --- a/src/tag/TagHandler.hxx +++ b/src/tag/TagHandler.hxx @@ -42,7 +42,7 @@ struct tag_handler { * @param the value of the tag; the pointer will become * invalid after returning */ - void (*tag)(enum tag_type type, const char *value, void *ctx); + void (*tag)(TagType type, const char *value, void *ctx); /** * A name-value pair has been read. It is the codec specific @@ -63,7 +63,7 @@ tag_handler_invoke_duration(const struct tag_handler *handler, void *ctx, static inline void tag_handler_invoke_tag(const struct tag_handler *handler, void *ctx, - enum tag_type type, const char *value) + TagType type, const char *value) { assert(handler != nullptr); assert((unsigned)type < TAG_NUM_OF_ITEM_TYPES); diff --git a/src/tag/TagId3.cxx b/src/tag/TagId3.cxx index 2f32ef6e5..63df529d3 100644 --- a/src/tag/TagId3.cxx +++ b/src/tag/TagId3.cxx @@ -134,7 +134,7 @@ import_id3_string(bool is_id3v1, const id3_ucs4_t *ucs4) */ static void tag_id3_import_text_frame(struct id3_tag *tag, const struct id3_frame *frame, - enum tag_type type, + TagType type, const struct tag_handler *handler, void *handler_ctx) { id3_ucs4_t const *ucs4; @@ -182,7 +182,7 @@ tag_id3_import_text_frame(struct id3_tag *tag, const struct id3_frame *frame, * 4.2). This is a wrapper for tag_id3_import_text_frame(). */ static void -tag_id3_import_text(struct id3_tag *tag, const char *id, enum tag_type type, +tag_id3_import_text(struct id3_tag *tag, const char *id, TagType type, const struct tag_handler *handler, void *handler_ctx) { const struct id3_frame *frame; @@ -203,7 +203,7 @@ tag_id3_import_text(struct id3_tag *tag, const char *id, enum tag_type type, */ static void tag_id3_import_comment_frame(struct id3_tag *tag, - const struct id3_frame *frame, enum tag_type type, + const struct id3_frame *frame, TagType type, const struct tag_handler *handler, void *handler_ctx) { @@ -236,7 +236,7 @@ tag_id3_import_comment_frame(struct id3_tag *tag, * wrapper for tag_id3_import_comment_frame(). */ static void -tag_id3_import_comment(struct id3_tag *tag, const char *id, enum tag_type type, +tag_id3_import_comment(struct id3_tag *tag, const char *id, TagType type, const struct tag_handler *handler, void *handler_ctx) { const struct id3_frame *frame; @@ -247,10 +247,10 @@ tag_id3_import_comment(struct id3_tag *tag, const char *id, enum tag_type type, } /** - * Parse a TXXX name, and convert it to a tag_type enum value. + * Parse a TXXX name, and convert it to a TagType enum value. * Returns TAG_NUM_OF_ITEM_TYPES if the TXXX name is not understood. */ -static enum tag_type +static TagType tag_id3_parse_txxx_name(const char *name) { static const struct tag_table txxx_tags[] = { @@ -277,7 +277,7 @@ tag_id3_import_musicbrainz(struct id3_tag *id3_tag, for (unsigned i = 0;; ++i) { const struct id3_frame *frame; id3_utf8_t *name, *value; - enum tag_type type; + TagType type; frame = id3_tag_findframe(id3_tag, "TXXX", i); if (frame == nullptr) diff --git a/src/tag/TagItem.hxx b/src/tag/TagItem.hxx index 5db9a2116..7c3100393 100644 --- a/src/tag/TagItem.hxx +++ b/src/tag/TagItem.hxx @@ -24,13 +24,13 @@ #include "Compiler.h" /** - * One tag value. It is a mapping of #tag_type to am arbitrary string + * One tag value. It is a mapping of #TagType to am arbitrary string * value. Each tag can have multiple items of one tag type (although * few clients support that). */ struct TagItem { /** the type of this item */ - enum tag_type type; + TagType type; /** * the value of this tag; this is a variable length string diff --git a/src/tag/TagPool.cxx b/src/tag/TagPool.cxx index 57a9137a7..cc28ea9a6 100644 --- a/src/tag/TagPool.cxx +++ b/src/tag/TagPool.cxx @@ -39,7 +39,7 @@ struct slot { static struct slot *slots[NUM_SLOTS]; static inline unsigned -calc_hash_n(enum tag_type type, const char *p, size_t length) +calc_hash_n(TagType type, const char *p, size_t length) { unsigned hash = 5381; @@ -52,7 +52,7 @@ calc_hash_n(enum tag_type type, const char *p, size_t length) } static inline unsigned -calc_hash(enum tag_type type, const char *p) +calc_hash(TagType type, const char *p) { unsigned hash = 5381; @@ -71,7 +71,7 @@ tag_item_to_slot(TagItem *item) } static struct slot *slot_alloc(struct slot *next, - enum tag_type type, + TagType type, const char *value, int length) { struct slot *slot; @@ -87,7 +87,7 @@ static struct slot *slot_alloc(struct slot *next, } TagItem * -tag_pool_get_item(enum tag_type type, const char *value, size_t length) +tag_pool_get_item(TagType type, const char *value, size_t length) { struct slot **slot_p, *slot; diff --git a/src/tag/TagPool.hxx b/src/tag/TagPool.hxx index a6b28b355..f41f3a724 100644 --- a/src/tag/TagPool.hxx +++ b/src/tag/TagPool.hxx @@ -28,7 +28,7 @@ extern Mutex tag_pool_lock; struct TagItem; TagItem * -tag_pool_get_item(enum tag_type type, const char *value, size_t length); +tag_pool_get_item(TagType type, const char *value, size_t length); TagItem * tag_pool_dup_item(TagItem *item); diff --git a/src/tag/TagTable.cxx b/src/tag/TagTable.cxx index 9c833d5a2..c7e920f2e 100644 --- a/src/tag/TagTable.cxx +++ b/src/tag/TagTable.cxx @@ -28,7 +28,7 @@ * Returns TAG_NUM_OF_ITEM_TYPES if the specified name was not found * in the table. */ -tag_type +TagType tag_table_lookup(const struct tag_table *table, const char *name) { for (; table->name != nullptr; ++table) @@ -43,7 +43,7 @@ tag_table_lookup(const struct tag_table *table, const char *name) * Returns TAG_NUM_OF_ITEM_TYPES if the specified name was not found * in the table. */ -tag_type +TagType tag_table_lookup_i(const struct tag_table *table, const char *name) { for (; table->name != nullptr; ++table) diff --git a/src/tag/TagTable.hxx b/src/tag/TagTable.hxx index 553415a86..c050f61ac 100644 --- a/src/tag/TagTable.hxx +++ b/src/tag/TagTable.hxx @@ -26,7 +26,7 @@ struct tag_table { const char *name; - enum tag_type type; + TagType type; }; /** @@ -35,7 +35,7 @@ struct tag_table { * in the table. */ gcc_pure -tag_type +TagType tag_table_lookup(const tag_table *table, const char *name); /** @@ -44,7 +44,7 @@ tag_table_lookup(const tag_table *table, const char *name); * in the table. */ gcc_pure -tag_type +TagType tag_table_lookup_i(const tag_table *table, const char *name); #endif diff --git a/src/tag/TagType.h b/src/tag/TagType.h index 118d66a02..0b8aa55d4 100644 --- a/src/tag/TagType.h +++ b/src/tag/TagType.h @@ -27,7 +27,7 @@ /** * Codes for the type of a tag item. */ -enum tag_type +enum TagType #ifdef __cplusplus /* the size of this enum is 1 byte; this is only relevant for C++ code; the only C sources including this header don't use instances @@ -59,7 +59,7 @@ enum tag_type }; /** - * An array of strings, which map the #tag_type to its machine + * An array of strings, which map the #TagType to its machine * readable name (specific to the MPD protocol). */ extern const char *const tag_item_names[]; |