Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone

Conflicts:
	java/common/org/linphone/core/LinphoneCore.java

diff --cc coreapi/callbacks.c
Simple merge

diff --cc coreapi/linphonecore.c
Simple merge

diff --cc coreapi/linphonecore_jni.cc
index 552129acc69e53ae68767db0736d026dc0857a4e,3ed73fd4c8c0b462693dfa529f045ac4192af042..2e883d56ba497bc37dc40436d1666fdccf1d17ca
--- 1/coreapi/linphonecore_jni.cc
--- 2/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@@ -993,5 -973,32 +993,32 @@@ extern "C" jstring Java_org_linphone_co
        return jvalue;
  }
  
+ extern "C" void Java_org_linphone_core_LinphoneCallParamsImpl_enableVideo(JNIEnv *env, jobject thiz, jlong lcp, jboolean b){
+       linphone_call_params_enable_video((LinphoneCallParams*)lcp, b);
+ }
+ 
+ extern "C" jboolean Java_org_linphone_core_LinphoneCallParamsImpl_getVideoEnabled(JNIEnv *env, jobject thiz, jlong lcp){
+       return linphone_call_params_video_enabled((LinphoneCallParams*)lcp);
+ }
+ extern "C" jlong Java_org_linphone_core_LinphoneCallParamsImpl_copy(JNIEnv *env, jobject thiz, jlong lcp){
+       return (jlong) linphone_call_params_copy((LinphoneCallParams*)lcp);
+ }
+ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_createDefaultCallParams(JNIEnv *env, jobject thiz, jlong lc){
+       return (jlong) linphone_core_create_default_call_parameters((LinphoneCore*)lc);
+ }
  
+ extern "C" jlong Java_org_linphone_core_LinphoneCallImpl_getCurrentParams(JNIEnv *env, jobject thiz, jlong lc){
+       return (jlong) linphone_call_get_current_params((LinphoneCall*)lc);
+ }
  
 -}
+ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_inviteAddressWithParams(JNIEnv *env, jobject thiz, jlong lc, jlong addr, jlong params){
+       return (jlong) linphone_core_invite_address_with_params((LinphoneCore *)lc, (const LinphoneAddress *)addr, (const LinphoneCallParams *)params);
+ }
+ 
+ extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_updateAddressWithParams(JNIEnv *env, jobject thiz, jlong lc, jlong call, jlong params){
+       return (jint) linphone_core_update_call((LinphoneCore *)lc, (LinphoneCall *)call, (LinphoneCallParams *)params);
+ }
+ 
+ extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_updateCall(JNIEnv *env, jobject thiz, jlong lc, jlong call, jlong params){
+       return (jint) linphone_core_update_call((LinphoneCore *)lc, (LinphoneCall *)call, (LinphoneCallParams *)params);
++}

diff --cc java/common/org/linphone/core/LinphoneCore.java
index fae83ffacfcdacd017b3cc3c4b9e6621b3ee3e34,94705b49dcf2a1d030500ca777950af56f1ea013..874fc82d9f925d00cc8fc638b2faac25b6c0d32d
--- 1/java/common/org/linphone/core/LinphoneCore.java
--- 2/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@@ -454,16 -454,11 +454,23 @@@ public interface LinphoneCore 
         * @return previously set firewall policy.
         */
        public FirewallPolicy getFirewallPolicy();
+ 
+       public LinphoneCall inviteAddressWithParams(LinphoneAddress destination, LinphoneCallParams params) throws LinphoneCoreException ;
+       
+       public int updateCall(LinphoneCall call, LinphoneCallParams params);
+ 
+       public LinphoneCallParams createDefaultCallParameters();
+ 
 +      /**
 +       * Sets the path to a wav file used for ringing.
 +       *
 +       * @param path The file must be a wav 16bit linear. Local ring is disabled if null
 +       */
 +      public void setRing(String path);
 +      /**
 +       * gets the path to a wav file used for ringing.
 +       *
 +       * @param null if not set
 +       */
 +      public String getRing();
  }