From a115f7a9d7b985c60858188875450d11a9ea1a1e Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 29 Nov 2010 10:53:03 +0100 Subject: [PATCH 1/2] fix bad merges and rename some methods --- LinphoneCoreImpl.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/LinphoneCoreImpl.java b/LinphoneCoreImpl.java index f0f4dc15d..c67c18dc9 100644 --- a/LinphoneCoreImpl.java +++ b/LinphoneCoreImpl.java @@ -385,9 +385,6 @@ class LinphoneCoreImpl implements LinphoneCore { return updateCall(nativePtr, ptrCall, ptrParams); } -<<<<<<< HEAD - - public void setUploadBandwidth(int bw) { setUploadBandwidth(nativePtr, bw); } @@ -406,14 +403,20 @@ class LinphoneCoreImpl implements LinphoneCore { VideoSize vSize = new VideoSize(); vSize.setWidth(nativeSize[0]); vSize.setHeight(nativeSize[1]); - return vSize; -======= + } public void setRing(String path) { setRing(nativePtr, path); } public String getRing() { return getRing(nativePtr); ->>>>>>> c95431295dc09c5558d38c6de49fa071c957d926 + } + public boolean isNetworkReachable() { + // TODO Auto-generated method stub + return false; + } + public void setNetworkReachable(boolean isReachable) { + // TODO Auto-generated method stub + } } From b091437c6f376a061b7994e0d98d9c311153113f Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Mon, 29 Nov 2010 12:01:44 +0100 Subject: [PATCH 2/2] fix setNetworkReachable --- AndroidCameraRecord.java | 8 +++++--- AndroidVideoWindowImpl.java | 1 + LinphoneCoreImpl.java | 6 +----- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/AndroidCameraRecord.java b/AndroidCameraRecord.java index 138912f57..eb6a10865 100644 --- a/AndroidCameraRecord.java +++ b/AndroidCameraRecord.java @@ -183,9 +183,11 @@ public abstract class AndroidCameraRecord { private static void stopPreview() { - camera.setPreviewCallback(null); // TODO check if used whatever the SDK version - camera.stopPreview(); - camera.release(); + if (camera!=null){ + camera.setPreviewCallback(null); // TODO check if used whatever the SDK version + camera.stopPreview(); + camera.release(); + } camera=null; previewStarted = false; } diff --git a/AndroidVideoWindowImpl.java b/AndroidVideoWindowImpl.java index ca9968e4c..9f6281bec 100644 --- a/AndroidVideoWindowImpl.java +++ b/AndroidVideoWindowImpl.java @@ -80,3 +80,4 @@ public class AndroidVideoWindowImpl { } } + diff --git a/LinphoneCoreImpl.java b/LinphoneCoreImpl.java index c67c18dc9..745c8c358 100644 --- a/LinphoneCoreImpl.java +++ b/LinphoneCoreImpl.java @@ -200,7 +200,7 @@ class LinphoneCoreImpl implements LinphoneCore { throw new RuntimeException("object already destroyed"); } } - public void setNetworkStateReachable(boolean isReachable) { + public void setNetworkReachable(boolean isReachable) { setNetworkStateReachable(nativePtr,isReachable); } public void setPlaybackGain(float gain) { @@ -415,8 +415,4 @@ class LinphoneCoreImpl implements LinphoneCore { // TODO Auto-generated method stub return false; } - public void setNetworkReachable(boolean isReachable) { - // TODO Auto-generated method stub - - } }