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

Few changes

Browse source
This commit is contained in:
Sylvain Berfini 2012-12-03 17:07:12 +01:00
parent 07e5982fc8
commit eee0b18507
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -103,11 +103,11 @@ run-linphone:
ant run ant run
run-tests: run-tests:
ant partial-clean && \
$(SDK_PLATFORM_TOOLS_PATH)/adb uninstall org.linphone.test $(SDK_PLATFORM_TOOLS_PATH)/adb uninstall org.linphone.test
$(SDK_PLATFORM_TOOLS_PATH)/adb uninstall org.linphone $(SDK_PLATFORM_TOOLS_PATH)/adb uninstall org.linphone
@cd $(TOPDIR)/tests/ && \ @cd $(TOPDIR)/tests/ && \
$(SDK_PATH)/android update test-project --path . -m ../ && \ $(SDK_PATH)/android update test-project --path . -m ../ && \
ant partial-clean && \
ant debug && \ ant debug && \
ant installd && \ ant installd && \
ant test ant test

10
res/xml/preferences.xml
View file

@ -75,26 +75,22 @@
android:key="@string/pref_codec_ilbc_key" android:key="@string/pref_codec_ilbc_key"
android:title="@string/pref_codec_ilbc" android:title="@string/pref_codec_ilbc"
android:defaultValue="@bool/pref_codec_ilbc_default" android:defaultValue="@bool/pref_codec_ilbc_default"
android:shouldDisableView="true"
android:summary="@string/pref_ilbc_summary"/> android:summary="@string/pref_ilbc_summary"/>
<CheckBoxPreference <CheckBoxPreference
android:key="@string/pref_codec_amr_key" android:key="@string/pref_codec_amr_key"
android:title="@string/pref_codec_amr" android:title="@string/pref_codec_amr"
android:defaultValue="@bool/pref_codec_amr_default" android:defaultValue="@bool/pref_codec_amr_default" />
android:shouldDisableView="true" />
<CheckBoxPreference <CheckBoxPreference
android:key="@string/pref_codec_g729_key" android:key="@string/pref_codec_g729_key"
android:title="@string/pref_codec_g729" android:title="@string/pref_codec_g729"
android:defaultValue="@bool/pref_codec_g729_default" android:defaultValue="@bool/pref_codec_g729_default" />
android:shouldDisableView="true" />
<CheckBoxPreference <CheckBoxPreference
android:key="@string/pref_codec_amrwb_key" android:key="@string/pref_codec_amrwb_key"
android:title="@string/pref_codec_amrwb" android:title="@string/pref_codec_amrwb"
android:defaultValue="@bool/pref_codec_amrwb_default" android:defaultValue="@bool/pref_codec_amrwb_default" />
android:shouldDisableView="true" />
<CheckBoxPreference <CheckBoxPreference
android:key="@string/pref_codec_gsm_key" android:key="@string/pref_codec_gsm_key"

1
src/org/linphone/PreferencesFragment.java
View file

@ -299,6 +299,7 @@ public class PreferencesFragment extends PreferencesListFragment implements EcCa
} }
private void detectAudioCodec(int id, String mime, int rate, int channels, boolean hide) { private void detectAudioCodec(int id, String mime, int rate, int channels, boolean hide) {
Log.w("Payload type for codec " + mime + " = " + LinphoneManager.getLc().findPayloadType(mime, rate, channels));
boolean enable = LinphoneService.isReady() && LinphoneManager.getLc().findPayloadType(mime, rate, channels)!=null; boolean enable = LinphoneService.isReady() && LinphoneManager.getLc().findPayloadType(mime, rate, channels)!=null;
Preference cb = findPreference(id); Preference cb = findPreference(id);
cb.setEnabled(enable); cb.setEnabled(enable);