Better video remove code in videoCallActivity

This commit is contained in:
Sylvain Berfini 2012-04-11 11:36:59 +02:00
parent 9331e2ff0b
commit 74cbe2b71c

View file

@ -20,12 +20,10 @@ package org.linphone;
import java.util.Arrays;
import java.util.List;
import org.linphone.LinphoneSimpleListener.LinphoneOnCallStateChangedListener; import org.linphone.LinphoneSimpleListener.LinphoneOnCallStateChangedListener;
import org.linphone.core.LinphoneCall; import org.linphone.core.LinphoneCall;
import org.linphone.core.LinphoneCall.State; import org.linphone.core.LinphoneCall.State;
import org.linphone.core.LinphoneCallParams;
import org.linphone.core.Log; import org.linphone.core.Log;
import org.linphone.mediastream.Version; import org.linphone.mediastream.Version;
import org.linphone.mediastream.video.AndroidVideoWindowImpl; import org.linphone.mediastream.video.AndroidVideoWindowImpl;
@ -226,9 +224,9 @@ public class VideoCallActivity extends Activity implements LinphoneOnCallStateCh
synchronized (androidVideoWindowImpl) { synchronized (androidVideoWindowImpl) {
LinphoneManager.getLc().setVideoWindow(androidVideoWindowImpl); LinphoneManager.getLc().setVideoWindow(androidVideoWindowImpl);
} }
launched=true; launched=true;
LinphoneManager.addListener(this); LinphoneManager.addListener(this);
refreshHandler.postDelayed(mCallQualityUpdater=new Runnable(){ refreshHandler.postDelayed(mCallQualityUpdater=new Runnable(){
LinphoneCall mCurrentCall=LinphoneManager.getLc().getCurrentCall(); LinphoneCall mCurrentCall=LinphoneManager.getLc().getCurrentCall();
public void run() { public void run() {
@ -306,7 +304,7 @@ public class VideoCallActivity extends Activity implements LinphoneOnCallStateCh
} }
private void resizePreview() { private void resizePreview() {
Display display = ((WindowManager) mVideoCaptureViewReady.getContext().getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay(); Display display = ((WindowManager) getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
int rotation = display.getRotation(); int rotation = display.getRotation();
LayoutParams params; LayoutParams params;
@ -370,12 +368,14 @@ public class VideoCallActivity extends Activity implements LinphoneOnCallStateCh
break; break;
case R.id.conf_simple_pause: case R.id.conf_simple_pause:
finish(); finish();
LinphoneActivity.instance().startIncallActivity();
LinphoneManager.getLc().pauseCall(videoCall); LinphoneManager.getLc().pauseCall(videoCall);
//TODO Fix neon crash //TODO Fix neon crash
break; break;
case R.id.conf_simple_video: case R.id.conf_simple_video:
finish(); LinphoneCallParams params = videoCall.getCurrentParamsCopy();
LinphoneActivity.instance().startIncallActivity(); params.setVideoEnabled(false);
LinphoneManager.getLc().updateCall(videoCall, params);
break; break;
} }
} }