diff options
| author | Warren Dukes <warren.dukes@gmail.com> | 2004-03-26 22:25:01 +0000 |
|---|---|---|
| committer | Warren Dukes <warren.dukes@gmail.com> | 2004-03-26 22:25:01 +0000 |
| commit | 12d19cccd284457be9f5be8fcdac5b9d9b894b3f (patch) | |
| tree | 37519ef3164ba7aacb1b747acbd4b37c3488a453 | |
| parent | 7c861b334b9b78d6f87aad88443a82331fbe5955 (diff) | |
| download | mpd-12d19cccd284457be9f5be8fcdac5b9d9b894b3f.tar.gz mpd-12d19cccd284457be9f5be8fcdac5b9d9b894b3f.tar.xz mpd-12d19cccd284457be9f5be8fcdac5b9d9b894b3f.zip | |
close audio device on pause, after we say we have paused, makes pause seem
more responsive
git-svn-id: https://svn.musicpd.org/mpd/trunk@504 09075e82-0dd4-0310-85a5-a0d7c8717e4f
| -rw-r--r-- | src/decode.c | 6 | ||||
| -rw-r--r-- | src/playlist.c | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/src/decode.c b/src/decode.c index 6e3826951..ac4fcb08a 100644 --- a/src/decode.c +++ b/src/decode.c @@ -180,10 +180,7 @@ void decodeSeek(PlayerControl * pc, AudioFormat * af, DecoderControl * dc, } \ if(pc->pause) { \ pause = !pause; \ - if(pause) { \ - finishAudio(); \ - pc->state = PLAYER_STATE_PAUSE; \ - } \ + if(pause) pc->state = PLAYER_STATE_PAUSE; \ else { \ if(initAudio(NULL)<0) { \ strncpy(pc->erroredFile,pc->file,MAXPATHLEN); \ @@ -195,6 +192,7 @@ void decodeSeek(PlayerControl * pc, AudioFormat * af, DecoderControl * dc, } \ pc->pause = 0; \ kill(getppid(),SIGUSR1); \ + if(pause) finishAudio(); \ } \ if(pc->seek) { \ pc->totalPlayTime+= pc->elapsedTime-pc->beginTime; \ diff --git a/src/playlist.c b/src/playlist.c index 1d30fe9cb..2ca7cadcb 100644 --- a/src/playlist.c +++ b/src/playlist.c @@ -23,7 +23,6 @@ #include "tag.h" #include "conf.h" #include "directory.h" -#include "stats.h" #include "log.h" #include "path.h" #include "utils.h" @@ -642,13 +641,11 @@ int stopPlaylist(FILE * fp) { playlist.queued = -1; playlist_state = PLAYLIST_STATE_STOP; playlist_noGoToNext = 0; - /*stats.playTime+=getPlayerElapsedTime();*/ if(playlist.random) randomizeOrder(0,playlist.length-1); return 0; } int playPlaylistOrderNumber(FILE * fp, int orderNum) { - /*stats.songsPlayed++;*/ if(playerStop(fp)<0) return -1; @@ -743,11 +740,9 @@ int nextSongInPlaylist(FILE * fp) { playlist_stopOnError = 0; if(playlist.current<playlist.length-1) { - /*stats.playTime+=getPlayerElapsedTime();*/ return playPlaylistOrderNumber(fp,playlist.current+1); } else if(playlist.length && playlist.repeat) { - /*stats.playTime+=getPlayerElapsedTime();*/ if(playlist.random) randomizeOrder(0,playlist.length-1); return playPlaylistOrderNumber(fp,0); } |