MUAdvancedAudioPreferencesViewController, MUApplicationDelegate: add speakerphone mode.

2 files changed, 21 insertions, 1 deletions

diff --git a/Source/Classes/MUAdvancedAudioPreferencesViewController.m b/Source/Classes/MUAdvancedAudioPreferencesViewController.m
index c3e3ee6..b53d819 100644
--- a/Source/Classes/MUAdvancedAudioPreferencesViewController.m
+++ b/Source/Classes/MUAdvancedAudioPreferencesViewController.m
@@ -60,7 +60,7 @@
     } else if (section == 1) {
         return 2;
     } else if (section == 2) {
-        return 1;
+        return 2;
     }
     return 0;
 }
@@ -141,6 +141,15 @@
                 cell.detailTextLabel.text = NSLocalizedString(@"Off", nil);
             }
             cell.selectionStyle = UITableViewCellSelectionStyleGray;
+        } else if ([indexPath row] == 1) {
+            cell.textLabel.text = NSLocalizedString(@"Speakerphone Mode", nil);
+            cell.selectionStyle = UITableViewCellSelectionStyleNone;
+            UISwitch *speakerPhoneSwitch = [[[UISwitch alloc] init] autorelease];
+            speakerPhoneSwitch.onTintColor = [UIColor blackColor];
+            speakerPhoneSwitch.on = [defaults boolForKey:@"AudioSpeakerPhoneMode"];
+            speakerPhoneSwitch.enabled = YES;
+            [speakerPhoneSwitch addTarget:self action:@selector(speakerPhoneModeChanged:) forControlEvents:UIControlEventValueChanged];
+            cell.accessoryView = speakerPhoneSwitch;
         }
     }
     
@@ -231,6 +240,10 @@
     }
 }
 
+- (void) speakerPhoneModeChanged:(UISwitch *)sender {
+    [[NSUserDefaults standardUserDefaults] setBool:sender.on forKey:@"AudioSpeakerPhoneMode"];
+}
+
 - (void) audioSubsystemRestarted:(NSNotification *)notification {
     if ([[NSUserDefaults standardUserDefaults] boolForKey:@"AudioPreprocessor"]) {
         [self.tableView reloadSections:[NSIndexSet indexSetWithIndex:1] withRowAnimation:UITableViewRowAnimationNone];
diff --git a/Source/Classes/MUApplicationDelegate.m b/Source/Classes/MUApplicationDelegate.m
index 2eec755..621efd4 100644
--- a/Source/Classes/MUApplicationDelegate.m
+++ b/Source/Classes/MUApplicationDelegate.m
@@ -144,6 +144,7 @@
                                                                 @"balanced",                       @"AudioQualityKind",
                                                                 [NSNumber numberWithBool:NO],      @"AudioSidetone",
                                                                 [NSNumber numberWithFloat:0.2f],   @"AudioSidetoneVolume",
+                                                                [NSNumber numberWithBool:YES],     @"AudioSpeakerPhoneMode",
                                                                 // Network
                                                                 [NSNumber numberWithBool:NO],      @"NetworkForceTCP",
                                                                 @"MumbleUser",                     @"DefaultUserName",
@@ -299,6 +300,12 @@
     settings.enableSideTone = [defaults boolForKey:@"AudioSidetone"];
     settings.sidetoneVolume = [defaults floatForKey:@"AudioSidetoneVolume"];
     
+    if ([defaults boolForKey:@"AudioSpeakerPhoneMode"]) {
+        settings.preferReceiverOverSpeaker = NO;
+    } else {
+        settings.preferReceiverOverSpeaker = YES;
+    }
+    
     MKAudio *audio = [MKAudio sharedAudio];
     [audio updateAudioSettings:&settings];
     [audio restart];