diff options
| author | Max Kellermann <max@duempel.org> | 2010-03-28 19:31:47 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2010-03-28 19:31:47 +0200 |
| commit | e9beea072d17ec01a124c189c42df1a1350a4106 (patch) | |
| tree | 7334654ded3a281e53546671f9fcb8e4b1857545 /src/cue | |
| parent | e69bb3b337c8f805302a4ba9e46c7bc36d8df80c (diff) | |
| parent | d612e5e0ab27b93fcfdcf25eb3014ea4e17cd41c (diff) | |
Merge release 0.15.9 from branch 'v0.15.x'
Conflicts:
NEWS
configure.ac
src/cue/cue_tag.c
src/decoder/mpcdec_decoder_plugin.c
src/player_thread.c
Diffstat (limited to 'src/cue')
| -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 46dfb1b5..67919ce3 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; |