diff options
Diffstat (limited to 'src/output')
| -rw-r--r-- | src/output/OSXOutputPlugin.cxx | 7 | ||||
| -rw-r--r-- | src/output/OssOutputPlugin.cxx | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/output/OSXOutputPlugin.cxx b/src/output/OSXOutputPlugin.cxx index eee215b32..7debe6ab2 100644 --- a/src/output/OSXOutputPlugin.cxx +++ b/src/output/OSXOutputPlugin.cxx @@ -25,9 +25,9 @@ #include "util/Domain.hxx" #include "thread/Mutex.hxx" #include "thread/Cond.hxx" +#include "system/ByteOrder.hxx" #include "Log.hxx" -#include <glib.h> #include <CoreAudio/AudioHardware.h> #include <AudioUnit/AudioUnit.h> #include <CoreServices/CoreServices.h> @@ -342,9 +342,8 @@ osx_output_open(struct audio_output *ao, AudioFormat &audio_format, break; } -#if G_BYTE_ORDER == G_BIG_ENDIAN - stream_description.mFormatFlags |= kLinearPCMFormatFlagIsBigEndian; -#endif + if (IsBigEndian()) + stream_description.mFormatFlags |= kLinearPCMFormatFlagIsBigEndian; stream_description.mBytesPerPacket = audio_format.GetFrameSize(); stream_description.mFramesPerPacket = 1; diff --git a/src/output/OssOutputPlugin.cxx b/src/output/OssOutputPlugin.cxx index 147ad7975..68f2a38aa 100644 --- a/src/output/OssOutputPlugin.cxx +++ b/src/output/OssOutputPlugin.cxx @@ -25,10 +25,9 @@ #include "util/Error.hxx" #include "util/Domain.hxx" #include "util/Macros.hxx" +#include "system/ByteOrder.hxx" #include "Log.hxx" -#include <glib.h> - #include <sys/stat.h> #include <sys/ioctl.h> #include <fcntl.h> @@ -532,7 +531,7 @@ oss_probe_sample_format(int fd, SampleFormat sample_format, pcm_export.Open(sample_format, 0, false, false, oss_format == AFMT_S24_PACKED, oss_format == AFMT_S24_PACKED && - G_BYTE_ORDER != G_LITTLE_ENDIAN); + !IsLittleEndian()); #endif return SUCCESS; |