aboutsummaryrefslogtreecommitdiffstats
path: root/src/decode.c
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-05-10 02:20:15 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-05-10 02:20:15 +0000
commitcd3180c70180ae49c0c5611850c18ce0cebdd464 (patch)
tree3998db9723352408f3feb2747bf2d5cd096cba9c /src/decode.c
parent9edafa886bc5d294c9f466d63c1d45876ce358d0 (diff)
downloadmpd-cd3180c70180ae49c0c5611850c18ce0cebdd464.tar.gz
mpd-cd3180c70180ae49c0c5611850c18ce0cebdd464.tar.xz
mpd-cd3180c70180ae49c0c5611850c18ce0cebdd464.zip
stuff for configuring the audio output format (sampling rate, channels, bits)
git-svn-id: https://svn.musicpd.org/mpd/trunk@967 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/decode.c')
-rw-r--r--src/decode.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/decode.c b/src/decode.c
index 221ca4a9b..d386a201a 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -124,7 +124,7 @@ int waitOnDecode(PlayerControl * pc, AudioFormat * af, DecoderControl * dc,
return -1;
}
- if(initAudio(af)<0) {
+ if(openAudioDevice(af)<0) {
strncpy(pc->erroredFile,pc->file,MAXPATHLEN);
pc->erroredFile[MAXPATHLEN] = '\0';
pc->error = PLAYER_ERROR_AUDIO;
@@ -190,7 +190,7 @@ void decodeSeek(PlayerControl * pc, AudioFormat * af, DecoderControl * dc,
pause = !pause; \
if(pause) pc->state = PLAYER_STATE_PAUSE; \
else { \
- if(initAudio(NULL)<0) { \
+ if(openAudioDevice(NULL)<0) { \
strncpy(pc->erroredFile,pc->file,MAXPATHLEN); \
pc->erroredFile[MAXPATHLEN] = '\0'; \
pc->error = PLAYER_ERROR_AUDIO; \
@@ -201,7 +201,7 @@ void decodeSeek(PlayerControl * pc, AudioFormat * af, DecoderControl * dc,
} \
pc->pause = 0; \
kill(getppid(),SIGUSR1); \
- if(pause) finishAudio(); \
+ if(pause) closeAudioDevice(); \
} \
if(pc->seek) { \
pc->totalPlayTime+= pc->elapsedTime-pc->beginTime; \