mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-21 04:58:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'video' of git.linphone.org:linphone-android-private into video

Browse source 
Conflicts:
	src/org/linphone/core/AndroidCameraRecord.java
This commit is contained in:
Guillaume Beraudo 2010-11-29 12:12:12 +01:00
commit d6402dcbc6
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
AndroidVideoWindowImpl.java
View file

@ -80,3 +80,4 @@ public class AndroidVideoWindowImpl {
}
}

13
LinphoneCoreImpl.java
View file

@ -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) {
@ -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,16 @@ 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;
}
}