diff options
| author | Eric Wong <normalperson@yhbt.net> | 2005-12-31 04:11:03 +0000 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2005-12-31 04:11:03 +0000 |
| commit | ea5d367ecf00f9ac4a5e8f0d8cc8909538f42640 (patch) | |
| tree | 306ea7e269c2f6d520dddd2b1d8c5c4366b8ef21 /src/decode.c | |
| parent | 18e5825cae10e3500ff75fdbbb7a768b8387a1c2 (diff) | |
| download | mpd-ea5d367ecf00f9ac4a5e8f0d8cc8909538f42640.tar.gz mpd-ea5d367ecf00f9ac4a5e8f0d8cc8909538f42640.tar.xz mpd-ea5d367ecf00f9ac4a5e8f0d8cc8909538f42640.zip | |
r1071@BL4ST: normalperson | 2005-12-30 20:05:16 -0800
merge with trunk:
* potential fix for bug #466 (shank, ALSA)
* Configure fix, so when no glib found it gives a error, and another race
condition fix in the master proces patch. (qball)
* call dropBufferedAudio() when pausing (shank)
* flac_plugin: revert the performance optimization we did a while ago
the performance optimization was broken for big-endian architectures.
mpd-uclinux is doing using a slightly different optimization to flacWrite()
that we may end up using here in the future. (me/qball)
----------------------------------------------------------------------
git-svn-id: https://svn.musicpd.org/mpd/branches/oggflac@3754 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/decode.c')
| -rw-r--r-- | src/decode.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/decode.c b/src/decode.c index 28a64e169..ccca3b204 100644 --- a/src/decode.c +++ b/src/decode.c @@ -243,7 +243,10 @@ int decodeSeek(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb, } \ pc->pause = 0; \ kill(getppid(),SIGUSR1); \ - if(pause) closeAudioDevice(); \ + if(pause) { \ + dropBufferedAudio(); \ + closeAudioDevice(); \ + } \ } \ if(pc->seek) { \ dropBufferedAudio(); \ |