From 1bb1a950d4c9f24ddbb92d1a529f2f3c9c99e72b Mon Sep 17 00:00:00 2001
From: Simon Morlat <simon.morlat@linphone.org>
Date: Mon, 31 Oct 2011 14:57:01 +0100
Subject: [PATCH] fix compilation problems with SILK on android

---
 res/xml/preferences.xml                           | 4 ++--
 src/org/linphone/LinphonePreferencesActivity.java | 4 ++--
 submodules/mssilk                                 | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 7e19d07b9..b018cb393 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -71,9 +71,9 @@
 			<CheckBoxPreference android:key="@string/pref_codec_silk16_key"
 				android:title="@string/pref_codec_silk16"/>
 			<CheckBoxPreference android:key="@string/pref_codec_silk12_key"
-				android:title="@string/pref_codec_silk12"/>
+				android:title="@string/pref_codec_silk12" android:shouldDisableView="true"/>
 			<CheckBoxPreference android:key="@string/pref_codec_silk8_key"
-				android:title="@string/pref_codec_silk8"/>
+				android:title="@string/pref_codec_silk8" android:shouldDisableView="true"/>
 			<CheckBoxPreference android:key="@string/pref_codec_pcmu_key"
 				android:title="@string/pref_codec_pcmu"/>
 			<CheckBoxPreference android:key="@string/pref_codec_pcma_key"
diff --git a/src/org/linphone/LinphonePreferencesActivity.java b/src/org/linphone/LinphonePreferencesActivity.java
index 9086b0a30..116fbb73b 100644
--- a/src/org/linphone/LinphonePreferencesActivity.java
+++ b/src/org/linphone/LinphonePreferencesActivity.java
@@ -100,8 +100,8 @@ public class LinphonePreferencesActivity extends PreferenceActivity implements E
 		}
 		
 		detectAudioCodec(pref_codec_amr_key,"AMR",8000, false);
-		detectAudioCodec(R.string.pref_codec_silk8_key,"SILK",8000, true);
-		detectAudioCodec(R.string.pref_codec_silk12_key,"SILK",12000, true);
+		//detectAudioCodec(R.string.pref_codec_silk8_key,"SILK",8000, true);
+		//detectAudioCodec(R.string.pref_codec_silk12_key,"SILK",12000, true);
 		detectAudioCodec(R.string.pref_codec_silk16_key,"SILK",16000, true);
 		detectAudioCodec(R.string.pref_codec_silk24_key,"SILK",24000, true);
 
diff --git a/submodules/mssilk b/submodules/mssilk
index bc123a531..3f5e0d7e3 160000
--- a/submodules/mssilk
+++ b/submodules/mssilk
@@ -1 +1 @@
-Subproject commit bc123a53155d644067989fc70e62f75b44ae36b2
+Subproject commit 3f5e0d7e3d8e3b402ee6b86b7b417751ed1942ff