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

Check sound lock on merge and pause/resume

Browse source
This commit is contained in:
Guillaume Beraudo 2011-11-28 15:48:14 +01:00
parent 4dd6039be3
commit c9564a7dbe
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/org/linphone/IncallActivity.java
View file

@ -260,7 +260,9 @@ public class IncallActivity extends AbstractCalleesActivity implements
showDialog(numpadDialogId); showDialog(numpadDialogId);
break; break;
case R.id.conf_simple_merge: case R.id.conf_simple_merge:
if (!lc().soundResourcesLocked()) {
lc().addAllToConference(); lc().addAllToConference();
}
break; break;
case R.id.conf_simple_pause: case R.id.conf_simple_pause:
LinphoneCall call = lc().getCurrentCall(); LinphoneCall call = lc().getCurrentCall();
@ -497,6 +499,9 @@ public class IncallActivity extends AbstractCalleesActivity implements
v.setOnClickListener(new OnClickListener() { v.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (lc().soundResourcesLocked()) {
return;
}
State actualState = call.getState(); State actualState = call.getState();
if (State.StreamsRunning == actualState) { if (State.StreamsRunning == actualState) {
lc().pauseCall(call); lc().pauseCall(call);