diff options
| author | Max Kellermann <max@duempel.org> | 2010-05-02 15:31:31 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2010-05-02 17:46:07 +0200 |
| commit | 5399a72ec1141307e79970993e4a90a8d643ac50 (patch) | |
| tree | 87f3ecbbb6c4875f2754dd72b0a577a7b81d652d /src/output_init.c | |
| parent | d093fb2441ee99722670f0401215031fc324bb31 (diff) | |
player_thread: move cross-fading to output thread
Remove cross_fade_apply(), and call pcm_mix() in the output thread,
mixing the chunk and chunk->other together.
Diffstat (limited to 'src/output_init.c')
| -rw-r--r-- | src/output_init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/output_init.c b/src/output_init.c index 6ee340ed..a091e749 100644 --- a/src/output_init.c +++ b/src/output_init.c @@ -191,6 +191,8 @@ audio_output_init(struct audio_output *ao, const struct config_param *param, ao->pause = false; ao->fail_timer = NULL; + pcm_buffer_init(&ao->cross_fade_buffer); + /* set up the filter chain */ ao->filter = filter_chain_new(); |