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

Fix mediastreamer2 build.

Browse source
This commit is contained in:
Guillaume Beraudo 2011-09-14 11:37:54 +02:00
parent 8ffc8319fe
commit 84ed7ab7fd
3 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/org/linphone/ConferenceActivity.java
View file

@ -23,9 +23,11 @@ import java.util.Comparator;
import java.util.List; import java.util.List;
import org.linphone.LinphoneSimpleListener.LinphoneOnCallStateChangedListener; import org.linphone.LinphoneSimpleListener.LinphoneOnCallStateChangedListener;
import org.linphone.core.Hacks;
import org.linphone.core.LinphoneCall; import org.linphone.core.LinphoneCall;
import org.linphone.core.LinphoneCore; import org.linphone.core.LinphoneCore;
import org.linphone.core.LinphoneCoreException; import org.linphone.core.LinphoneCoreException;
import org.linphone.core.Log;
import org.linphone.core.LinphoneCall.State; import org.linphone.core.LinphoneCall.State;
import android.app.AlertDialog; import android.app.AlertDialog;
@ -49,6 +51,11 @@ public class ConferenceActivity extends ListActivity implements
// Start Override to test block // Start Override to test block
protected LinphoneCore lc() { protected LinphoneCore lc() {
final int waitSlice=20;
while(!LinphoneManager.isInstanciated()) {
Log.d("LinphoneManager is not ready, waiting for ",waitSlice, "ms");
Hacks.sleep(waitSlice);
}
return LinphoneManager.getLc(); return LinphoneManager.getLc();
} }
@ -330,6 +337,8 @@ public class ConferenceActivity extends ListActivity implements
public void run() { public void run() {
CalleeListAdapter adapter = (CalleeListAdapter) getListAdapter(); CalleeListAdapter adapter = (CalleeListAdapter) getListAdapter();
String stateStr = call + " " + state.toString();
Log.d("ConferenceActivity received state ",stateStr);
switch (state.value()) { switch (state.value()) {
case State.ID_INCOMING_RECEIVED: case State.ID_INCOMING_RECEIVED:
case State.ID_OUTGOING_RINGING: case State.ID_OUTGOING_RINGING:

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

@ -1012,4 +1012,9 @@ public final class LinphoneManager implements LinphoneCoreListener {
} }
} }
public static final boolean isInstanciated() {
return instance != null;
}
} }

5
src/org/linphone/core/LinphoneCallImpl.java
View file

@ -128,4 +128,9 @@ class LinphoneCallImpl implements LinphoneCall {
LinphoneCallParamsImpl params = new LinphoneCallParamsImpl(getCurrentParamsCopy(nativePtr)); LinphoneCallParamsImpl params = new LinphoneCallParamsImpl(getCurrentParamsCopy(nativePtr));
return params.localConferenceMode(); return params.localConferenceMode();
} }
@Override
public String toString() {
return "Call " + nativePtr;
}
} }