diff options
| author | Max Kellermann <max@duempel.org> | 2009-11-10 17:11:34 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-12-02 22:29:50 +0100 |
| commit | c412d6251e9cd3abe735b7622af4003502e54f72 (patch) | |
| tree | 7344c13f62e4cc788c830c05d21bb7b5b47f5866 /src/output/osx_plugin.c | |
| parent | 68c2cfbb4067b2292e1ff1d4e7716ff370903f84 (diff) | |
| download | mpd-c412d6251e9cd3abe735b7622af4003502e54f72.tar.gz mpd-c412d6251e9cd3abe735b7622af4003502e54f72.tar.xz mpd-c412d6251e9cd3abe735b7622af4003502e54f72.zip | |
audio_format: changed "bits" to "enum sample_format"
This patch prepares support for floating point samples (and probably
other formats). It changes the meaning of the "bits" attribute from a
bit count to a symbolic value.
Diffstat (limited to '')
| -rw-r--r-- | src/output/osx_plugin.c | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/src/output/osx_plugin.c b/src/output/osx_plugin.c index afcd143b3..22b742ee5 100644 --- a/src/output/osx_plugin.c +++ b/src/output/osx_plugin.c @@ -166,9 +166,6 @@ osx_output_open(void *data, struct audio_format *audio_format, GError **error) OSStatus status; ComponentResult result; - if (audio_format->bits > 16) - audio_format->bits = 16; - desc.componentType = kAudioUnitType_Output; desc.componentSubType = kAudioUnitSubType_DefaultOutput; desc.componentManufacturer = kAudioUnitManufacturer_Apple; @@ -226,7 +223,21 @@ osx_output_open(void *data, struct audio_format *audio_format, GError **error) stream_description.mFramesPerPacket = 1; stream_description.mBytesPerFrame = stream_description.mBytesPerPacket; stream_description.mChannelsPerFrame = audio_format->channels; - stream_description.mBitsPerChannel = audio_format->bits; + + switch (audio_format->format) { + case SAMPLE_FORMAT_S8: + stream_description.mBitsPerChannel = 8; + break; + + case SAMPLE_FORMAT_S16: + stream_description.mBitsPerChannel = 16; + break; + + default: + audio_format->format = SAMPLE_FORMAT_S16; + stream_description.mBitsPerChannel = 16; + break; + } result = AudioUnitSetProperty(od->au, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, 0, |