Fix for: Surround sound audio on Apple TV #371

Added audio configuration option to the settings menu to allow users to select their speaker setup.

Limelight/Database/DataManager.h

@@ -17,6 +17,7 @@
                        framerate:(NSInteger)framerate
                           height:(NSInteger)height
                            width:(NSInteger)width
+                audioConfig:(NSInteger)audioConfig
                 onscreenControls:(NSInteger)onscreenControls
                    optimizeGames:(BOOL)optimizeGames
                  multiController:(BOOL)multiController

Limelight/Database/DataManager.m

@@ -56,6 +56,7 @@
                        framerate:(NSInteger)framerate
                           height:(NSInteger)height
                            width:(NSInteger)width
+                     audioConfig:(NSInteger)audioConfig
                 onscreenControls:(NSInteger)onscreenControls
                    optimizeGames:(BOOL)optimizeGames
                  multiController:(BOOL)multiController
@@ -73,6 +74,7 @@
         settingsToSave.bitrate = [NSNumber numberWithInteger:bitrate];
         settingsToSave.height = [NSNumber numberWithInteger:height];
         settingsToSave.width = [NSNumber numberWithInteger:width];
+        settingsToSave.audioConfig = [NSNumber numberWithInteger:audioConfig];
         settingsToSave.onscreenControls = [NSNumber numberWithInteger:onscreenControls];
         settingsToSave.optimizeGames = optimizeGames;
         settingsToSave.multiController = multiController;

Limelight/Database/TemporarySettings.h

@@ -16,6 +16,7 @@
 @property (nonatomic, retain) NSNumber * framerate;
 @property (nonatomic, retain) NSNumber * height;
 @property (nonatomic, retain) NSNumber * width;
+@property (nonatomic, retain) NSNumber * audioConfig;
 @property (nonatomic, retain) NSNumber * onscreenControls;
 @property (nonatomic, retain) NSString * uniqueId;
 @property (nonatomic) BOOL useHevc;

Limelight/Database/TemporarySettings.m

@@ -34,6 +34,8 @@
     assert([self.bitrate intValue] != 0);
     self.framerate = [NSNumber numberWithInteger:[[NSUserDefaults standardUserDefaults] integerForKey:@"framerate"]];
     assert([self.framerate intValue] != 0);
+    self.audioConfig = [NSNumber numberWithInteger:[[NSUserDefaults standardUserDefaults] integerForKey:@"audioConfig"]];
+    assert([self.audioConfig intValue] != 0);
     self.useHevc = [[NSUserDefaults standardUserDefaults] boolForKey:@"useHevc"];
     self.useFramePacing = [[NSUserDefaults standardUserDefaults] integerForKey:@"useFramePacing"] != 0;
     self.playAudioOnPC = [[NSUserDefaults standardUserDefaults] boolForKey:@"audioOnPC"];
@@ -66,6 +68,7 @@
     self.framerate = settings.framerate;
     self.height = settings.height;
     self.width = settings.width;
+    self.audioConfig = settings.audioConfig;
     self.useHevc = settings.useHevc;
     self.useFramePacing = settings.useFramePacing;
     self.playAudioOnPC = settings.playAudioOnPC;

Limelight/Limelight.xcdatamodeld/Moonlight v1.7.xcdatamodel/contents

@@ -22,6 +22,7 @@
     </entity>
     <entity name="Settings" representedClassName="Settings" syncable="YES" codeGenerationType="class">
         <attribute name="absoluteTouchMode" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
+        <attribute name="audioConfig" attributeType="Integer 32" defaultValueString="2" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="bitrate" attributeType="Integer 32" defaultValueString="10000" usesScalarValueType="NO" syncable="YES"/>
         <attribute name="btMouseSupport" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="enableHdr" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES" syncable="YES"/>

Limelight/ViewControllers/MainFrameViewController.m

@@ -631,15 +631,13 @@ static NSMutableSet* hostList;
     // multiController must be set before calling getConnectedGamepadMask
     _streamConfig.multiController = streamSettings.multiController;
     _streamConfig.gamepadMask = [ControllerSupport getConnectedGamepadMask:_streamConfig];
-    
 
-    // Probe for supported channel configurations
+    int numberOfChannels = [streamSettings.audioConfig intValue];
-    long outputChannels = [AVAudioSession sharedInstance].maximumOutputNumberOfChannels;
+    Log(LOG_I, @"Number of audio channels %d", numberOfChannels);
-    Log(LOG_I, @"Audio device supports %d channels", outputChannels);
+    if (numberOfChannels >= 8) {
-    if (outputChannels >= 8) {
         _streamConfig.audioConfiguration = AUDIO_CONFIGURATION_71_SURROUND;
     }
-    else if (outputChannels >= 6) {
+    else if (numberOfChannels >= 6) {
         _streamConfig.audioConfiguration = AUDIO_CONFIGURATION_51_SURROUND;
     }
     else {

Moonlight TV/Settings.bundle/Root.plist

@@ -90,6 +90,28 @@
 				<string>150000</string>
 			</array>
 		</dict>
+		<dict>
+			<key>Type</key>
+			<string>PSMultiValueSpecifier</string>
+			<key>Title</key>
+			<string>Audio Configuration</string>
+			<key>Key</key>
+			<string>audioConfig</string>
+			<key>DefaultValue</key>
+			<string>2</string>
+			<key>Titles</key>
+			<array>
+				<string>Stereo</string>
+				<string>5.1</string>
+				<string>7.1</string>
+			</array>
+			<key>Values</key>
+			<array>
+				<string>2</string>
+				<string>6</string>
+				<string>8</string>
+			</array>
+		</dict>
 		<dict>
 			<key>Type</key>
 			<string>PSGroupSpecifier</string>