r1081 - trunk/Audio/Properties

[noti...@svn.sbooth.org]

Author: stephen_booth
Date: 2008-07-22 11:17:15 -0700 (Tue, 22 Jul 2008)
New Revision: 1081

Modified:
trunk/Audio/Properties/CoreAudioPropertiesReader.m
Log:
Correctly determine the source bit depth for Apple Lossless

Modified: trunk/Audio/Properties/CoreAudioPropertiesReader.m
===================================================================
--- trunk/Audio/Properties/CoreAudioPropertiesReader.m 2008-04-15 19:03:07 UTC (rev 1080)
+++ trunk/Audio/Properties/CoreAudioPropertiesReader.m 2008-07-22 18:17:15 UTC (rev 1081)
@@ -98,13 +98,13 @@

if(0 != asbd.mBitsPerChannel)
[propertiesDictionary setValue:[NSNumber numberWithUnsignedInt:asbd.mBitsPerChannel] forKey:PropertiesBitsPerChannelKey];
- else if(kAudioFormatAppleLossless == asbd.mFormatID && kAppleLosslessFormatFlag_16BitSourceData & asbd.mFormatFlags)
+ else if(kAudioFormatAppleLossless == asbd.mFormatID && kAppleLosslessFormatFlag_16BitSourceData == asbd.mFormatFlags)
[propertiesDictionary setValue:[NSNumber numberWithUnsignedInt:16] forKey:PropertiesBitsPerChannelKey];
- else if(kAudioFormatAppleLossless == asbd.mFormatID && kAppleLosslessFormatFlag_20BitSourceData & asbd.mFormatFlags)
+ else if(kAudioFormatAppleLossless == asbd.mFormatID && kAppleLosslessFormatFlag_20BitSourceData == asbd.mFormatFlags)
[propertiesDictionary setValue:[NSNumber numberWithUnsignedInt:20] forKey:PropertiesBitsPerChannelKey];
- else if(kAudioFormatAppleLossless == asbd.mFormatID && kAppleLosslessFormatFlag_24BitSourceData & asbd.mFormatFlags)
+ else if(kAudioFormatAppleLossless == asbd.mFormatID && kAppleLosslessFormatFlag_24BitSourceData == asbd.mFormatFlags)
[propertiesDictionary setValue:[NSNumber numberWithUnsignedInt:24] forKey:PropertiesBitsPerChannelKey];
- else if(kAudioFormatAppleLossless == asbd.mFormatID && kAppleLosslessFormatFlag_32BitSourceData & asbd.mFormatFlags)
+ else if(kAudioFormatAppleLossless == asbd.mFormatID && kAppleLosslessFormatFlag_32BitSourceData == asbd.mFormatFlags)
[propertiesDictionary setValue:[NSNumber numberWithUnsignedInt:32] forKey:PropertiesBitsPerChannelKey];
[propertiesDictionary setValue:[NSNumber numberWithUnsignedInt:asbd.mChannelsPerFrame] forKey:PropertiesChannelsPerFrameKey];
[propertiesDictionary setValue:[NSNumber numberWithDouble:asbd.mSampleRate] forKey:PropertiesSampleRateKey];