aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWarren Dukes <warren.dukes@gmail.com>2004-11-20 14:44:01 +0000
committerWarren Dukes <warren.dukes@gmail.com>2004-11-20 14:44:01 +0000
commit26e943c02500194c4bb33b7062ca5add5ab0895f (patch)
treefd62c0071e7c11be2d33062731f5a4a78f3b25b1
parentcd6af0948c96834c780b49161e89f3bd9701dc0f (diff)
downloadmpd-26e943c02500194c4bb33b7062ca5add5ab0895f.tar.gz
mpd-26e943c02500194c4bb33b7062ca5add5ab0895f.tar.xz
mpd-26e943c02500194c4bb33b7062ca5add5ab0895f.zip
fix oss_openDevice() to match the new openDevice callback protocol (w/o a audioFormat argument)
git-svn-id: https://svn.musicpd.org/mpd/trunk@2715 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--src/audioOutputs/audioOutput_oss.c3
-rw-r--r--src/inputStream_http.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/src/audioOutputs/audioOutput_oss.c b/src/audioOutputs/audioOutput_oss.c
index c8e86b7a4..e0746271e 100644
--- a/src/audioOutputs/audioOutput_oss.c
+++ b/src/audioOutputs/audioOutput_oss.c
@@ -106,9 +106,10 @@ static void oss_finishDriver(AudioOutput * audioOutput) {
freeOssData(od);
}
-static int oss_openDevice(AudioOutput * audioOutput, AudioFormat * audioFormat)
+static int oss_openDevice(AudioOutput * audioOutput)
{
OssData * od = audioOutput->data;
+ AudioFormat * audioFormat = &audioOutput->outAudioFormat;
#ifdef WORDS_BIGENDIAN
int i = AFMT_S16_BE;
#else
diff --git a/src/inputStream_http.c b/src/inputStream_http.c
index f441bf14f..cfbe88e60 100644
--- a/src/inputStream_http.c
+++ b/src/inputStream_http.c
@@ -604,9 +604,10 @@ static int getHTTPHello(InputStream * inStream) {
return 0;
}
}
- case 404:
case 400:
case 401:
+ case 403:
+ case 404:
default:
close(data->sock);
data->connState = HTTP_CONN_STATE_CLOSED;