Call duration accessor

Revert speaker on dtmf
Remove useless public on interfaces.

diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index d3935700d73fb3d66fcdddf03e9b227ce40d11c7..899cb66cbcdfb98bc9eef704671cd1bb2faf58a5 100644 (file)
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -623,7 +623,7 @@ static void video_stream_event_cb(void *user_pointer, const MSFilter *f, const u
        ms_warning("In linphonecall.c: video_stream_event_cb");
        switch (event_id) {
                case MS_VIDEO_DECODER_DECODING_ERRORS:
-                       ms_warning("CAse is MS_VIDEO_DECODER_DECODING_ERRORS");
+                       ms_warning("Case is MS_VIDEO_DECODER_DECODING_ERRORS");
                        linphone_call_send_vfu_request((LinphoneCall*) user_pointer);
                        break;
                default:

diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 167630e1a8e241895f9beed8c35e3c04e7b48193..6815a833d3589a297240bda46f2a0ec8d8c0e314 100644 (file)
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -3584,16 +3584,15 @@ static MSFilter *get_dtmf_gen(LinphoneCore *lc){
 /**
  * Plays a dtmf to the local user.
 **/
-void linphone_core_play_dtmf(LinphoneCore *lc, char dtmf, int duration_ms, bool_t speaker){
+void linphone_core_play_dtmf(LinphoneCore *lc, char dtmf, int duration_ms){
        MSFilter *f=get_dtmf_gen(lc);
        if (f==NULL){
                ms_error("No dtmf generator at this time !");
                return;
        }
 
-       if (!speaker && !linphone_core_in_call(lc)) {
-               // If not in call and user doesn't want sound to go out from speaker
-               // TODO: update dtmf generator to only output on output stream if speaker is false.
+       // Play DTMF only when in call
+       if (!linphone_core_in_call(lc)) {
                return;
        }
 

diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index 5e83ba462b8b6ffd7691343611d905ec3bd071ca..81ab3e949948770cfd2d3446fb0b07d20f8c747d 100644 (file)
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -911,7 +911,7 @@ void linphone_core_use_files(LinphoneCore *lc, bool_t yesno);
 void linphone_core_set_play_file(LinphoneCore *lc, const char *file);
 void linphone_core_set_record_file(LinphoneCore *lc, const char *file);
 
-void linphone_core_play_dtmf(LinphoneCore *lc, char dtmf, int duration_ms, bool_t speaker);
+void linphone_core_play_dtmf(LinphoneCore *lc, char dtmf, int duration_ms);
 void linphone_core_stop_dtmf(LinphoneCore *lc);
 
 int linphone_core_get_current_call_duration(const LinphoneCore *lc);

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 1876fb9ee8223715f168362f09b3e50b160e8a8c..df1583c7bc8b6b2b81fa951ddde51018b799bca8 100644 (file)
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -508,9 +508,8 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_playDtmf(   JNIEnv*  env
                ,jobject  thiz
                ,jlong lc
                ,jchar dtmf
-               ,jint duration
-               ,jboolean speaker) {
-       linphone_core_play_dtmf((LinphoneCore*)lc,dtmf,duration,speaker);
+               ,jint duration) {
+       linphone_core_play_dtmf((LinphoneCore*)lc,dtmf,duration);
 }
 extern "C" void Java_org_linphone_core_LinphoneCoreImpl_stopDtmf(      JNIEnv*  env
                ,jobject  thiz
@@ -1174,3 +1173,6 @@ extern "C" void Java_org_linphone_core_LinphoneProxyConfigImpl_setExpires(JNIEnv
        linphone_proxy_config_expires((LinphoneProxyConfig *) ptr, (int) delay);
 }
 
+extern "C" jint Java_org_linphone_core_LinphoneCallImpl_getDuration(JNIEnv*  env,jobject thiz,jlong ptr) {
+       linphone_call_get_duration((LinphoneCall *) ptr);
+}
\ No newline at end of file

diff --git a/java/common/org/linphone/core/LinphoneCall.java b/java/common/org/linphone/core/LinphoneCall.java
index 171e2e6b485240d26be4df0656b9d2e450f4a4cd..b8e03ac1db6640223a3bb4d3486148a8817df24b 100644 (file)
--- a/java/common/org/linphone/core/LinphoneCall.java
+++ b/java/common/org/linphone/core/LinphoneCall.java
@@ -137,50 +137,55 @@ public interface LinphoneCall {
        /**
         * Retrieves the call's current state.
        **/
-       public State getState();
+       State getState();
        
        /**
         * Returns the remote address associated to this call
         *
        **/
-       public LinphoneAddress  getRemoteAddress();
+       LinphoneAddress  getRemoteAddress();
        /**
         * get direction of the call (incoming or outgoing).
         * @return CallDirection 
         */
-       public CallDirection getDirection();
+       CallDirection getDirection();
        /**
         * get the call log associated to this call.
         * @Return LinphoneCallLog
        **/
-       public LinphoneCallLog getCallLog();
+       LinphoneCallLog getCallLog();
 
-       public LinphoneCallParams getCurrentParamsCopy();
+       LinphoneCallParams getCurrentParamsCopy();
        
-       public void enableCamera(boolean enabled);
+       void enableCamera(boolean enabled);
        /**
         * Enables or disable echo cancellation.
         * @param enable
         */
-       public void enableEchoCancellation(boolean enable);
+       void enableEchoCancellation(boolean enable);
        /**
         * get EC status 
         * @return true if echo cancellation is enabled.
         */
-       public boolean isEchoCancellationEnabled();
+       boolean isEchoCancellationEnabled();
        /**
         * Enables or disable echo limiter cancellation.
         * @param enable
         */
-       public void enableEchoLimiter(boolean enable);
+       void enableEchoLimiter(boolean enable);
        /**
         * get EL status 
         * @return true if echo limiter is enabled.
         */
-       public boolean isEchoLimiterEnabled();
+       boolean isEchoLimiterEnabled();
        /**
         * Returns the object associated to a call this one is replacing.
         * Call replacement can occur during transfer scenarios.
         */
-       public LinphoneCall getReplacedCall();
+       LinphoneCall getReplacedCall();
+
+       /**
+        * @return call duration computed from media start
+        */
+       int getDuration();
 }

diff --git a/java/common/org/linphone/core/LinphoneCore.java b/java/common/org/linphone/core/LinphoneCore.java
index 3b63d0a148e8bc19eb1c1b09e98312bacef87063..db378d1ce0cfaac3668761283e6560c23aa90849 100644 (file)
--- a/java/common/org/linphone/core/LinphoneCore.java
+++ b/java/common/org/linphone/core/LinphoneCore.java
@@ -391,12 +391,12 @@ public interface LinphoneCore {
         */
        public void sendDtmf(char number);
        /**
-        * Initiate a dtmf signal to the speqker if not in call
+        * Initiate a dtmf signal to the speaker if not in call.
+        * Sending of the DTMF is done in another function.
         * @param number
         * @param duration in ms , -1 for unlimited
-        * @param speaker play dtmf on speaker
         */
-       public void playDtmf(char number,int duration, boolean speaker);
+       public void playDtmf(char number,int duration);
        /**
         * stop current dtmf
         */