Fix exiting issue + AMRNB codec by default

This commit is contained in:
Sylvain Berfini 2012-07-27 17:46:32 +02:00
parent 4f373c07e7
commit 47f8aa2e85
2 changed files with 15 additions and 12 deletions

View file

@ -48,7 +48,7 @@ prepare-mediastreamer2:
prepare-sources: prepare-ffmpeg prepare-ilbc prepare-vpx prepare-silk prepare-srtp prepare-mediastreamer2
generate-libs:
$(NDK_PATH)/ndk-build BUILD_SILK=1 -j$(NUMCPUS)
$(NDK_PATH)/ndk-build BUILD_SILK=1 BUILD_AMRNB=full -j$(NUMCPUS)
update-project:
$(SDK_PATH)/android update project --path .

View file

@ -137,9 +137,10 @@ public class StatusFragment extends Fragment {
}
private void populateSliderContent() {
sliderContent.setDividerHeight(0);
AccountsListAdapter adapter = new AccountsListAdapter(LinphoneManager.getLc().getProxyConfigList());
sliderContent.setAdapter(adapter);
if (LinphoneManager.isInstanciated() && LinphoneManager.getLc() != null) {
AccountsListAdapter adapter = new AccountsListAdapter(LinphoneManager.getLc().getProxyConfigList());
sliderContent.setAdapter(adapter);
}
}
public void registrationStateChanged(final RegistrationState state) {
@ -160,14 +161,16 @@ public class StatusFragment extends Fragment {
if (allAccountsLed == null)
return;
allAccountsLed.removeAllViews();
for (LinphoneProxyConfig lpc : LinphoneManager.getLc().getProxyConfigList()) {
ImageView led = new ImageView(getActivity());
LinearLayout.LayoutParams params = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT);
led.setLayoutParams(params);
led.setAdjustViewBounds(true);
led.setImageResource(getStatusIconResource(lpc.getState(), false));
allAccountsLed.addView(led);
if (LinphoneManager.isInstanciated() && LinphoneManager.getLc() != null) {
allAccountsLed.removeAllViews();
for (LinphoneProxyConfig lpc : LinphoneManager.getLc().getProxyConfigList()) {
ImageView led = new ImageView(getActivity());
LinearLayout.LayoutParams params = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT);
led.setLayoutParams(params);
led.setAdjustViewBounds(true);
led.setImageResource(getStatusIconResource(lpc.getState(), false));
allAccountsLed.addView(led);
}
}
}