oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge release 0.15.9 from branch 'v0.15.x'

Browse Source 
Conflicts:
	NEWS
	configure.ac
	src/cue/cue_tag.c
	src/decoder/mpcdec_decoder_plugin.c
	src/player_thread.c
This commit is contained in:
Max Kellermann
2010-03-28 19:31:47 +02:00
parent e69bb3b337 d612e5e0ab
commit e9beea072d
8 changed files with 74 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/cue/cue_tag.c
View File

@@ -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;