From 6778d0992a79303e2c4e7971973456ca722254f3 Mon Sep 17 00:00:00 2001
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Tue, 6 Nov 2012 15:20:38 +0100
Subject: [PATCH] Working mic/playback gain settings

---
 Classes/LinphoneCoreSettingsStore.m       | 6 +++---
 Settings/InAppSettings.bundle/Audio.plist | 4 ++--
 submodules/linphone                       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m
index ac31a841b..6ec1bfe74 100644
--- a/Classes/LinphoneCoreSettingsStore.m
+++ b/Classes/LinphoneCoreSettingsStore.m
@@ -131,7 +131,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
     }
     {
         [self setFloat:linphone_core_get_playback_gain_db(lc) forKey:@"playback_gain_preference"];
-        //[self setFloat: linphone_core_get_microphone_gain_db(lc) forKey:@"microphone_gain_preference"];
+        [self setFloat:linphone_core_get_mic_gain_db(lc) forKey:@"microphone_gain_preference"];
     }
 	{
 		LCSipTransports tp;
@@ -499,8 +499,8 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args);
     float playback_gain = [self floatForKey:@"playback_gain_preference"];
     linphone_core_set_playback_gain_db(lc, playback_gain);
     
-    //float microphone_gain = [self floatForKey:@"microphone_gain_preference"];
-    //linphone_core_set_microphone_gain_db(lc, microphone_gain);
+    float mic_gain = [self floatForKey:@"microphone_gain_preference"];
+    linphone_core_set_mic_gain_db(lc, mic_gain);
     
 	UIDevice* device = [UIDevice currentDevice];
 	bool backgroundSupported = false;
diff --git a/Settings/InAppSettings.bundle/Audio.plist b/Settings/InAppSettings.bundle/Audio.plist
index edaea9439..422f9fc29 100644
--- a/Settings/InAppSettings.bundle/Audio.plist
+++ b/Settings/InAppSettings.bundle/Audio.plist
@@ -136,7 +136,7 @@
 			<key>Type</key>
 			<string>PSTextFieldSpecifier</string>
 			<key>KeyboardType</key>
-			<string>DecimalPad</string>
+			<string>NumbersAndPunctuation</string>
 			<key>DefaultValue</key>
 			<integer>0</integer>
 			<key>IASKTextAlignment</key>
@@ -150,7 +150,7 @@
 			<key>Type</key>
 			<string>PSTextFieldSpecifier</string>
 			<key>KeyboardType</key>
-			<string>DecimalPad</string>
+			<string>NumbersAndPunctuation</string>
 			<key>DefaultValue</key>
 			<integer>0</integer>
 			<key>IASKTextAlignment</key>
diff --git a/submodules/linphone b/submodules/linphone
index b8dd01740..42b4cb544 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit b8dd0174013ef5327bbac5d9f230d23a7d0c23d3
+Subproject commit 42b4cb544661f129d2959ca9faf492b9b90cf197