From ccce719c6fa3a515e0a697c74e5cc102865ee560 Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Fri, 23 Sep 2011 16:54:52 +0200 Subject: [PATCH] Fix video sending problem --- src/org/linphone/DialerActivity.java | 7 +++---- src/org/linphone/LinphoneManager.java | 2 +- src/org/linphone/VideoCallActivity.java | 5 +---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/org/linphone/DialerActivity.java b/src/org/linphone/DialerActivity.java index bc405ab7b..acc882c4d 100644 --- a/src/org/linphone/DialerActivity.java +++ b/src/org/linphone/DialerActivity.java @@ -394,6 +394,7 @@ public class DialerActivity extends SoftVolumeActivity implements LinphoneGuiLis public void onCallStateChanged(LinphoneCall call, State state, String message) { + Log.i("OnCallStateChanged: call=", call, ", state=", state, ", message=", message, ", currentCall=", mCurrentCall); LinphoneCore lc = LinphoneManager.getLcIfManagerNotDestroyedOrNull(); if (lc==null) { /* we are certainly exiting, ignore then.*/ @@ -402,15 +403,13 @@ public class DialerActivity extends SoftVolumeActivity implements LinphoneGuiLis if (state==LinphoneCall.State.OutgoingInit){ mCurrentCall=call; + call.enableCamera(LinphoneManager.getInstance().shareMyCamera()); enterIncallMode(lc); - if (!LinphoneManager.getInstance().shareMyCamera()) - call.enableCamera(false); LinphoneActivity.instance().startOrientationSensor(); }else if (state==LinphoneCall.State.IncomingReceived){ mCurrentCall=call; callPending(call); - if (!LinphoneManager.getInstance().shareMyCamera()) - call.enableCamera(false); + call.enableCamera(LinphoneManager.getInstance().shareMyCamera()); LinphoneActivity.instance().startOrientationSensor(); }else if (state==LinphoneCall.State.Connected){ if (call.getDirection() == CallDirection.Incoming) { diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index 7dd9f738b..0fa9acef7 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -847,7 +847,7 @@ public final class LinphoneManager implements LinphoneCoreListener { } public boolean shareMyCamera() { - return mPref.getBoolean(getString(R.string.pref_video_automatically_share_my_video), false); + return mPref.getBoolean(getString(R.string.pref_video_automatically_share_my_video_key), false); } public void setAudioModeIncallForGalaxyS() { diff --git a/src/org/linphone/VideoCallActivity.java b/src/org/linphone/VideoCallActivity.java index 408c82bf6..96f1fcbb5 100644 --- a/src/org/linphone/VideoCallActivity.java +++ b/src/org/linphone/VideoCallActivity.java @@ -103,10 +103,7 @@ public class VideoCallActivity extends SoftVolumeActivity { if (LinphoneManager.getLc().isIncall()) { LinphoneCall call = LinphoneManager.getLc().getCurrentCall(); if (call != null) { - boolean camEnabled = call.cameraEnabled(); - - LinphoneManager.getInstance().sendStaticImage(!camEnabled); - updatePreview(camEnabled); + updatePreview(call.cameraEnabled()); } }