Skip to content

M
mpd
Commit b7356bc5 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

decoder/gme: convert runtime check to assertion

When gme_track_info() returns with success, then the gme_info_t pointer must be set.
parent 8ec8282f
Hide whitespace changes
Inline Side-by-side
Showing with 22 additions and 21 deletions
src/decoder/gme_decoder_plugin.c
View file @ b7356bc5
...@@ -202,29 +202,30 @@ gme_tag_dup(const char *path_fs) ...@@ -202,29 +202,30 @@ gme_tag_dup(const char *path_fs)
return NULL; return NULL;
} }
assert(ti != NULL);
struct tag *tag = tag_new(); struct tag *tag = tag_new();
if(ti != NULL){
if(ti->length > 0) if(ti->length > 0)
tag->time = ti->length / 1000; tag->time = ti->length / 1000;
if(ti->song != NULL){ if(ti->song != NULL){
if(gme_track_count(emu) > 1){ if(gme_track_count(emu) > 1){
/* start numbering subtunes from 1 */ /* start numbering subtunes from 1 */
char *tag_title=g_strdup_printf("%s (%d/%d)", char *tag_title=g_strdup_printf("%s (%d/%d)",
ti->song, song_num+1, gme_track_count(emu)); ti->song, song_num+1, gme_track_count(emu));
tag_add_item(tag, TAG_TITLE, tag_title); tag_add_item(tag, TAG_TITLE, tag_title);
g_free(tag_title); g_free(tag_title);
}else }else
tag_add_item(tag, TAG_TITLE, ti->song); tag_add_item(tag, TAG_TITLE, ti->song);
}
if(ti->author != NULL)
tag_add_item(tag, TAG_ARTIST, ti->author);
if(ti->game != NULL)
tag_add_item(tag, TAG_ALBUM, ti->game);
if(ti->comment != NULL)
tag_add_item(tag, TAG_COMMENT, ti->comment);
if(ti->copyright != NULL)
tag_add_item(tag, TAG_DATE, ti->copyright);
} }
if(ti->author != NULL)
tag_add_item(tag, TAG_ARTIST, ti->author);
if(ti->game != NULL)
tag_add_item(tag, TAG_ALBUM, ti->game);
if(ti->comment != NULL)
tag_add_item(tag, TAG_COMMENT, ti->comment);
if(ti->copyright != NULL)
tag_add_item(tag, TAG_DATE, ti->copyright);
gme_free_info(ti); gme_free_info(ti);
gme_delete(emu); gme_delete(emu);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment