diff options
| author | Max Kellermann <max@duempel.org> | 2013-12-14 12:37:16 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-12-14 12:37:16 +0100 |
| commit | c7b1038a9de21d73a229ff68b58daa1824bfd643 (patch) | |
| tree | c70ca2e91daf69ca23bb82d80341302731be98a1 /src/output | |
| parent | d43aa1298728f856d3d3a29477a91b79633022fe (diff) | |
| parent | c170fed6f9a747bfe9e4e53a85ebc2e92a70bab6 (diff) | |
| download | mpd-c7b1038a9de21d73a229ff68b58daa1824bfd643.tar.gz mpd-c7b1038a9de21d73a229ff68b58daa1824bfd643.tar.xz mpd-c7b1038a9de21d73a229ff68b58daa1824bfd643.zip | |
Merge branch 'v0.18.x'
Diffstat (limited to 'src/output')
| -rw-r--r-- | src/output/OSXOutputPlugin.cxx | 6 | ||||
| -rw-r--r-- | src/output/OpenALOutputPlugin.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/output/OSXOutputPlugin.cxx b/src/output/OSXOutputPlugin.cxx index 7debe6ab2..97ebae056 100644 --- a/src/output/OSXOutputPlugin.cxx +++ b/src/output/OSXOutputPlugin.cxx @@ -363,9 +363,9 @@ osx_output_open(struct audio_output *ao, AudioFormat &audio_format, OSStatus status = AudioUnitInitialize(od->au); if (status != noErr) { - error.Set(osx_output_domain, status, - "Unable to initialize OS X audio unit: %s", - GetMacOSStatusCommentString(status)); + error.Format(osx_output_domain, status, + "Unable to initialize OS X audio unit: %s", + GetMacOSStatusCommentString(status)); return false; } diff --git a/src/output/OpenALOutputPlugin.cxx b/src/output/OpenALOutputPlugin.cxx index e753b206f..268cf17cc 100644 --- a/src/output/OpenALOutputPlugin.cxx +++ b/src/output/OpenALOutputPlugin.cxx @@ -25,7 +25,7 @@ #include <glib.h> -#ifndef HAVE_OSX +#ifndef __APPLE__ #include <AL/al.h> #include <AL/alc.h> #else |