mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-05-07 05:53:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix bad merges and rename some methods

Browse source
This commit is contained in:
Simon Morlat 2010-11-29 10:53:03 +01:00
parent 3b23c971ec
commit a115f7a9d7
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
LinphoneCoreImpl.java
View file

@ -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
}
}