diff options
Diffstat (limited to 'macosx/HBAudioController.m')
| -rw-r--r-- | macosx/HBAudioController.m | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/macosx/HBAudioController.m b/macosx/HBAudioController.m index 235e39f43..b9b80bd53 100644 --- a/macosx/HBAudioController.m +++ b/macosx/HBAudioController.m @@ -90,9 +90,9 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification"; if ([anAudio enabled]) { NSString *prefix = [NSString stringWithFormat: @"Audio%d", counter + 1]; - NSNumber *sampleRateToUse = (0 == [[[anAudio sampleRate] objectForKey: keyAudioSamplerate] intValue]) ? - [[anAudio track] objectForKey: keyAudioInputSampleRate] : - [[anAudio sampleRate] objectForKey: keyAudioSamplerate]; + NSNumber *sampleRateToUse = ([[[anAudio sampleRate] objectForKey: keyAudioSamplerate] intValue] == 0 ? + [[anAudio track] objectForKey: keyAudioInputSampleRate] : + [[anAudio sampleRate] objectForKey: keyAudioSamplerate]); [aDict setObject: [[anAudio track] objectForKey: keyAudioTrackIndex] forKey: [prefix stringByAppendingString: @"Track"]]; [aDict setObject: [[anAudio track] objectForKey: keyAudioTrackName] forKey: [prefix stringByAppendingString: @"TrackDescription"]]; @@ -345,7 +345,7 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification"; [dict setObject:[NSNumber numberWithFloat:0.0] forKey:@"AudioTrackGainSlider"]; } - // map legacy passthru mixdowns + // map legacy mixdowns key = [dict objectForKey: @"AudioMixdown"]; if ([key isEqualToString: @"AC3 Passthru"] || [key isEqualToString: @"DTS Passthru"] || @@ -353,6 +353,10 @@ NSString *HBMixdownChangedNotification = @"HBMixdownChangedNotification"; { [dict setObject: @"None" forKey: @"AudioMixdown"]; } + else if ([key isEqualToString: @"6-channel discrete"]) + { + [dict setObject: @"5.1 Channels" forKey: @"AudioMixdown"]; + } // If our preset wants us to support a codec that the track does not support, instead // of changing the codec we remove the audio instead. |