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

Conflicts:
	src/org/linphone/core/LinphoneProxyConfigImpl.java
This commit is contained in:
Guillaume Beraudo 2010-12-13 16:11:01 +01:00
commit 294265ec27
4 changed files with 35 additions and 1 deletions

View file

@ -61,6 +61,9 @@ class LinphoneCallImpl implements LinphoneCall {
public LinphoneCallParams getCurrentParamsReadOnly() {
throw new RuntimeException("Not Implemenetd yet");
}
public void enableCamera(boolean enabled) {
throw new RuntimeException("Not Implemenetd yet");
}
}

View file

@ -179,7 +179,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) {
@ -344,6 +344,24 @@ class LinphoneCoreImpl implements LinphoneCore {
public LinphoneCallParams createDefaultCallParameters() {
throw new RuntimeException("Not Implemenetd yet");
}
public boolean isNetworkReachable() {
throw new RuntimeException("Not Implemenetd yet");
}
public void setUploadBandwidth(int bw) {
throw new RuntimeException("Not Implemenetd yet");
}
public void setDownloadBandwidth(int bw) {
throw new RuntimeException("Not Implemenetd yet");
}
public void setPreferredVideoSize(VideoSize vSize) {
throw new RuntimeException("Not Implemenetd yet");
}
public VideoSize getPreferredVideoSize() {
throw new RuntimeException("Not Implemenetd yet");
}
public PayloadType[] listVideoCodecs() {
throw new RuntimeException("Not Implemenetd yet");
}
}

View file

@ -73,6 +73,9 @@ class LinphoneProxyConfigImpl implements LinphoneProxyConfig {
private native String getRoute(long ptr);
private native int setRoute(long ptr,String uri);
private native void enablePublish(long ptr,boolean enable);
private native boolean publishEnabled(long ptr);
public void enableRegister(boolean value) {
enableRegister(nativePtr,value);
@ -127,6 +130,9 @@ class LinphoneProxyConfigImpl implements LinphoneProxyConfig {
throw new LinphoneCoreException("cannot set route ["+routeUri+"]");
}
}
public void enablePublish(boolean enable) {
enablePublish(nativePtr,enable);
}
public RegistrationState getState() {
return RegistrationState.fromInt(getState(nativePtr));
}
@ -134,4 +140,7 @@ class LinphoneProxyConfigImpl implements LinphoneProxyConfig {
public void setExpires(int delay) {
setExpires(nativePtr, delay);
}
public boolean publishEnabled() {
return publishEnabled(nativePtr);
}
}

View file

@ -31,4 +31,8 @@ class PayloadTypeImpl implements PayloadType {
public String toString() {
return toString(nativePtr);
}
public String getMime() {
throw new RuntimeException("Not Implemenetd yet");
}
}