diff options
Diffstat (limited to 'src/cue/cue_tag.c')
| -rw-r--r-- | src/cue/cue_tag.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/cue/cue_tag.c b/src/cue/cue_tag.c index 46dfb1b50..67919ce37 100644 --- a/src/cue/cue_tag.c +++ b/src/cue/cue_tag.c @@ -155,22 +155,6 @@ cue_tag_track(struct Cdtext *cdtext, struct Rem *rem) return tag; } -static struct tag * -cue_tag_merge(struct tag *a, struct tag *b) -{ - if (a != NULL && b != NULL) { - struct tag *merge_tag = tag_merge(a, b); - tag_free(a); - tag_free(b); - return merge_tag; - } else if (a != NULL) - return a; - else if (b != NULL) - return b; - else - return NULL; -} - struct tag * cue_tag(struct Cd *cd, unsigned tnum) { @@ -190,7 +174,7 @@ cue_tag(struct Cd *cd, unsigned tnum) track_tag = cue_tag_track(track_get_cdtext(track), track_get_rem(track)); - tag = cue_tag_merge(cd_tag, track_tag); + tag = tag_merge_replace(cd_tag, track_tag); if (tag == NULL) return NULL; |