From b9d50caef2f61d64b1698367b2966f63faebf58a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Thu, 16 Oct 2014 10:55:35 +0200 Subject: [PATCH] Make Linphone Android to use the new API of AndroidVideoWindowImpl class --- src/org/linphone/VideoCallFragment.java | 4 +--- submodules/linphone | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/org/linphone/VideoCallFragment.java b/src/org/linphone/VideoCallFragment.java index cb32628b5..51744e887 100644 --- a/src/org/linphone/VideoCallFragment.java +++ b/src/org/linphone/VideoCallFragment.java @@ -66,8 +66,7 @@ public class VideoCallFragment extends Fragment implements OnGestureListener, On fixZOrder(mVideoView, mCaptureView); - androidVideoWindowImpl = new AndroidVideoWindowImpl(mVideoView, mCaptureView); - androidVideoWindowImpl.setListener(new AndroidVideoWindowImpl.VideoWindowListener() { + androidVideoWindowImpl = new AndroidVideoWindowImpl(mVideoView, mCaptureView, new AndroidVideoWindowImpl.VideoWindowListener() { public void onVideoRenderingSurfaceReady(AndroidVideoWindowImpl vw, SurfaceView surface) { LinphoneManager.getLc().setVideoWindow(vw); mVideoView = surface; @@ -90,7 +89,6 @@ public class VideoCallFragment extends Fragment implements OnGestureListener, On LinphoneManager.getLc().setPreviewWindow(null); } }); - androidVideoWindowImpl.init(); mVideoView.setOnTouchListener(new OnTouchListener() { public boolean onTouch(View v, MotionEvent event) { diff --git a/submodules/linphone b/submodules/linphone index a6c013bdb..ee2a23530 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit a6c013bdb7a2b4a837763899178e44065fd0b27c +Subproject commit ee2a235302d7188a596e972a04285bc65797a98a