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

player_thread: move cross-fading to output thread

Browse Source 
Remove cross_fade_apply(), and call pcm_mix() in the output thread,
mixing the chunk and chunk->other together.
This commit is contained in:
Max Kellermann
2010-05-02 15:31:31 +02:00
parent d093fb2441
commit 5399a72ec1
8 changed files with 50 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/player_thread.c
View File

@@ -651,10 +651,9 @@ play_next_chunk(struct player *player)
}
if (other_chunk != NULL) {
float mix_ratio;
chunk = music_pipe_shift(player->pipe);
assert(chunk != NULL);
assert(chunk->other == NULL);
/* don't send the tags of the new song (which
is being faded in) yet; postpone it until
@@ -665,16 +664,13 @@ play_next_chunk(struct player *player)
other_chunk->tag = NULL;
if (isnan(pc.mixramp_delay_seconds)) {
mix_ratio = ((float)cross_fade_position)
chunk->mix_ratio = ((float)cross_fade_position)
/ player->cross_fade_chunks;
} else {
mix_ratio = nan("");
chunk->mix_ratio = nan("");
}
cross_fade_apply(chunk, other_chunk,
&dc->out_audio_format,
mix_ratio);
music_buffer_return(player_buffer, other_chunk);
chunk->other = other_chunk;
} else {
/* there are not enough decoded chunks yet */