Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix compilation problems with SILK on android

Browse source
This commit is contained in:
Simon Morlat 2011-10-31 14:57:01 +01:00
parent 30a03d235a
commit 1bb1a950d4
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
res/xml/preferences.xml
View file

@ -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"

4
src/org/linphone/LinphonePreferencesActivity.java
View file

@ -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);

2
submodules/mssilk

@ -1 +1 @@
Subproject commit bc123a53155d644067989fc70e62f75b44ae36b2
Subproject commit 3f5e0d7e3d8e3b402ee6b86b7b417751ed1942ff