mp4: Remove pointless casts in create_ilst().

[paraslash.git] / mp4.c

diff --git a/mp4.c b/mp4.c
index 32871727b345ab61ff3b0498a69de772c387cabd..ae2488996d40044c3258a77552ff84552fa5c27b 100644 (file)
--- a/mp4.c
+++ b/mp4.c
@@ -1564,8 +1564,6 @@ struct membuffer {
        unsigned error;
 };
 
-#define stricmp strcasecmp
-
 static struct membuffer *membuffer_create(void)
 {
        const unsigned initial_size = 256;
@@ -1672,7 +1670,7 @@ static uint32_t meta_genre_to_index(const char *genrestr)
 {
        unsigned n;
        for (n = 0; n < sizeof (ID3v1GenreList) / sizeof (ID3v1GenreList[0]); n++) {
-               if (!stricmp(genrestr, ID3v1GenreList[n]))
+               if (!strcasecmp(genrestr, ID3v1GenreList[n]))
                        return n + 1;
        }
        return 0;
@@ -1700,7 +1698,7 @@ static const char *find_standard_meta(const char *name)   //returns atom name if f
 {
        unsigned n;
        for (n = 0; n < sizeof (stdmetas) / sizeof (stdmetas[0]); n++) {
-               if (!stricmp(name, stdmetas[n].name))
+               if (!strcasecmp(name, stdmetas[n].name))
                        return stdmetas[n].atom;
        }
        return 0;
@@ -1795,64 +1793,58 @@ static uint32_t create_ilst(const struct mp4ff_metadata *data, void **out_buffer
        struct membuffer *buf = membuffer_create();
        unsigned metaptr;
        char *mask = para_calloc(data->count);
-       {
-               const char *tracknumber_ptr = 0, *totaltracks_ptr = 0;
-               const char *discnumber_ptr = 0, *totaldiscs_ptr = 0;
-               const char *genre_ptr = 0, *tempo_ptr = 0;
-               for (metaptr = 0; metaptr < data->count; metaptr++) {
-                       struct mp4ff_tag *tag = &data->tags[metaptr];
-                       if (!stricmp(tag->item, "tracknumber") || !stricmp(tag->item, "track")) {
-                               if (tracknumber_ptr == 0)
-                                       tracknumber_ptr = tag->value;
-                               mask[metaptr] = 1;
-                       } else if (!stricmp(tag->item, "totaltracks")) {
-                               if (totaltracks_ptr == 0)
-                                       totaltracks_ptr = tag->value;
-                               mask[metaptr] = 1;
-                       } else if (!stricmp(tag->item, "discnumber")
-                                       || !stricmp(tag->item, "disc")) {
-                               if (discnumber_ptr == 0)
-                                       discnumber_ptr = tag->value;
-                               mask[metaptr] = 1;
-                       } else if (!stricmp(tag->item, "totaldiscs")) {
-                               if (totaldiscs_ptr == 0)
-                                       totaldiscs_ptr = tag->value;
-                               mask[metaptr] = 1;
-                       } else if (!stricmp(tag->item, "genre")) {
-                               if (genre_ptr == 0)
-                                       genre_ptr = tag->value;
-                               mask[metaptr] = 1;
-                       } else if (!stricmp(tag->item, "tempo")) {
-                               if (tempo_ptr == 0)
-                                       tempo_ptr = tag->value;
-                               mask[metaptr] = 1;
-                       }
-
-               }
-
-               if (tracknumber_ptr)
-                       membuffer_write_track_tag(buf, "trkn",
-                                                 myatoi(tracknumber_ptr),
-                                                 myatoi(totaltracks_ptr));
-               if (discnumber_ptr)
-                       membuffer_write_track_tag(buf, "disk",
-                                                 myatoi(discnumber_ptr),
-                                                 myatoi(totaldiscs_ptr));
-               if (tempo_ptr)
-                       membuffer_write_int16_tag(buf, "tmpo",
-                                                 (uint16_t) myatoi(tempo_ptr));
-
-               if (genre_ptr) {
-                       uint32_t index = meta_genre_to_index(genre_ptr);
-                       if (index == 0)
-                               membuffer_write_std_tag(buf, "©gen",
-                                                       genre_ptr);
-                       else
-                               membuffer_write_int16_tag(buf, "gnre",
-                                                         (uint16_t) index);
+       const char *tracknumber_ptr = 0, *totaltracks_ptr = 0;
+       const char *discnumber_ptr = 0, *totaldiscs_ptr = 0;
+       const char *genre_ptr = 0, *tempo_ptr = 0;
+       for (metaptr = 0; metaptr < data->count; metaptr++) {
+               struct mp4ff_tag *tag = &data->tags[metaptr];
+               if (!strcasecmp(tag->item, "tracknumber") || !strcasecmp(tag->item, "track")) {
+                       if (tracknumber_ptr == 0)
+                               tracknumber_ptr = tag->value;
+                       mask[metaptr] = 1;
+               } else if (!strcasecmp(tag->item, "totaltracks")) {
+                       if (totaltracks_ptr == 0)
+                               totaltracks_ptr = tag->value;
+                       mask[metaptr] = 1;
+               } else if (!strcasecmp(tag->item, "discnumber")
+                               || !strcasecmp(tag->item, "disc")) {
+                       if (discnumber_ptr == 0)
+                               discnumber_ptr = tag->value;
+                       mask[metaptr] = 1;
+               } else if (!strcasecmp(tag->item, "totaldiscs")) {
+                       if (totaldiscs_ptr == 0)
+                               totaldiscs_ptr = tag->value;
+                       mask[metaptr] = 1;
+               } else if (!strcasecmp(tag->item, "genre")) {
+                       if (genre_ptr == 0)
+                               genre_ptr = tag->value;
+                       mask[metaptr] = 1;
+               } else if (!strcasecmp(tag->item, "tempo")) {
+                       if (tempo_ptr == 0)
+                               tempo_ptr = tag->value;
+                       mask[metaptr] = 1;
                }
        }
 
+       if (tracknumber_ptr)
+               membuffer_write_track_tag(buf, "trkn",
+                                         myatoi(tracknumber_ptr),
+                                         myatoi(totaltracks_ptr));
+       if (discnumber_ptr)
+               membuffer_write_track_tag(buf, "disk",
+                                         myatoi(discnumber_ptr),
+                                         myatoi(totaldiscs_ptr));
+       if (tempo_ptr)
+               membuffer_write_int16_tag(buf, "tmpo", myatoi(tempo_ptr));
+
+       if (genre_ptr) {
+               uint32_t index = meta_genre_to_index(genre_ptr);
+               if (index == 0)
+                       membuffer_write_std_tag(buf, "©gen",
+                                               genre_ptr);
+               else
+                       membuffer_write_int16_tag(buf, "gnre", index);
+       }
        for (metaptr = 0; metaptr < data->count; metaptr++) {
                if (!mask[metaptr]) {
                        struct mp4ff_tag *tag = &data->tags[metaptr];
@@ -2157,7 +2149,7 @@ static int32_t meta_find_by_name(const struct mp4ff *f, const char *item,
        uint32_t i;
 
        for (i = 0; i < f->tags.count; i++) {
-               if (!stricmp(f->tags.tags[i].item, item)) {
+               if (!strcasecmp(f->tags.tags[i].item, item)) {
                        *value = para_strdup(f->tags.tags[i].value);
                        return 1;
                }