diff options
| -rw-r--r-- | macosx/English.lproj/MainMenu.xib | 69 | ||||
| -rw-r--r-- | macosx/HBAudio.m | 20 |
2 files changed, 55 insertions, 34 deletions
diff --git a/macosx/English.lproj/MainMenu.xib b/macosx/English.lproj/MainMenu.xib index 627a67a88..8259003cc 100644 --- a/macosx/English.lproj/MainMenu.xib +++ b/macosx/English.lproj/MainMenu.xib @@ -12,7 +12,7 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="5688"/> + <integer value="5684"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -4319,6 +4319,7 @@ <string>bitRates</string> <string>bitRates.keyAudioBitrateName</string> <string>bitRate</string> + <string>AC3Enabled</string> </object> <bool key="NSEditable">YES</bool> <object class="_NSManagedProxy" key="_NSManagedProxy"/> @@ -5948,38 +5949,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">enabled: arrangedObjects.mixdownEnabled</string> - <reference key="source" ref="393032802"/> - <reference key="destination" ref="141316080"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="393032802"/> - <reference key="NSDestination" ref="141316080"/> - <string key="NSLabel">enabled: arrangedObjects.mixdownEnabled</string> - <string key="NSBinding">enabled</string> - <string key="NSKeyPath">arrangedObjects.mixdownEnabled</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">5782</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">enabled: arrangedObjects.mixdownEnabled</string> - <reference key="source" ref="581296833"/> - <reference key="destination" ref="141316080"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="581296833"/> - <reference key="NSDestination" ref="141316080"/> - <string key="NSLabel">enabled: arrangedObjects.mixdownEnabled</string> - <string key="NSBinding">enabled</string> - <string key="NSKeyPath">arrangedObjects.mixdownEnabled</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">5784</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> <string key="label">selectedObject: arrangedObjects.track</string> <reference key="source" ref="33212493"/> <reference key="destination" ref="141316080"/> @@ -6132,6 +6101,38 @@ </object> <int key="connectionID">5791</int> </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: arrangedObjects.AC3Enabled</string> + <reference key="source" ref="393032802"/> + <reference key="destination" ref="141316080"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="393032802"/> + <reference key="NSDestination" ref="141316080"/> + <string key="NSLabel">enabled: arrangedObjects.AC3Enabled</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">arrangedObjects.AC3Enabled</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">5792</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">enabled: arrangedObjects.AC3Enabled</string> + <reference key="source" ref="581296833"/> + <reference key="destination" ref="141316080"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="581296833"/> + <reference key="NSDestination" ref="141316080"/> + <string key="NSLabel">enabled: arrangedObjects.AC3Enabled</string> + <string key="NSBinding">enabled</string> + <string key="NSKeyPath">arrangedObjects.AC3Enabled</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">5793</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -10308,7 +10309,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">5791</int> + <int key="maxID">5793</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> diff --git a/macosx/HBAudio.m b/macosx/HBAudio.m index 8d226d33e..c3598da3f 100644 --- a/macosx/HBAudio.m +++ b/macosx/HBAudio.m @@ -625,6 +625,20 @@ static NSDictionary *bitRate384 = nil; return retval; } +- (BOOL) AC3Enabled + +{ + BOOL retval = [self enabled]; + + if (YES == retval) { + int myTrackCodec = [[[self track] objectForKey: keyAudioInputCodec] intValue]; + if (HB_ACODEC_AC3 != myTrackCodec) { + retval = NO; + } + } + return retval; +} + + (NSSet *) keyPathsForValuesAffectingEnabled { @@ -637,4 +651,10 @@ static NSDictionary *bitRate384 = nil; return [NSSet setWithObjects: @"track", @"mixdown", nil]; } ++ (NSSet *) keyPathsForValuesAffectingAC3Enabled + +{ + return [NSSet setWithObjects: @"track", nil]; +} + @end |