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

Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

Browse source
This commit is contained in:
Simon Morlat 2010-11-25 17:40:51 +01:00
commit 4f54ca58f6
4 changed files with 36 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
coreapi/callbacks.c
View file

@ -177,7 +177,7 @@ static void call_received(SalOp *h){
lc->ringstream=NULL;
lc->dmfs_playing_start_time=0;
}
if(lc->ringstream==NULL){
if(lc->ringstream==NULL && lc->sound_conf.local_ring){
MSSndCard *ringcard=lc->sound_conf.lsd_card ?lc->sound_conf.lsd_card : lc->sound_conf.ring_sndcard;
ms_message("Starting local ring...");
lc->ringstream=ring_start(lc->sound_conf.local_ring,2000,ringcard);

2
coreapi/linphonecore.c
View file

@ -2827,7 +2827,7 @@ void linphone_core_set_sound_source(LinphoneCore *lc, char source)
/**
* Sets the path to a wav file used for ringing.
*
* The file must be a wav 16bit linear.
* @param path The file must be a wav 16bit linear. Local ring is disabled if null
*
* @ingroup media_parameters
**/

22
coreapi/linphonecore_jni.cc
View file

@ -580,6 +580,26 @@ extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_isVideoEnabled(JNIEn
,jlong lc) {
return linphone_core_video_enabled((LinphoneCore*)lc);
}
extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setRing(JNIEnv* env
,jobject thiz
,jlong lc
,jstring jpath) {
const char* path = jpath?env->GetStringUTFChars(jpath, NULL):NULL;
linphone_core_set_ring((LinphoneCore*)lc,path);
if (path) env->ReleaseStringUTFChars(jpath, path);
}
extern "C" jstring Java_org_linphone_core_LinphoneCoreImpl_getRing(JNIEnv* env
,jobject thiz
,jlong lc
) {
const char* path = linphone_core_get_ring((LinphoneCore*)lc);
if (path) {
return env->NewStringUTF(path);
} else {
return NULL;
}
}
//ProxyConfig
@ -1001,4 +1021,4 @@ extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_updateAddressWithParams(
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);
}
}

14
java/common/org/linphone/core/LinphoneCore.java
View file

@ -115,7 +115,7 @@ public interface LinphoneCore {
}
}
/**
* Describes proxy registration states.
* Describes firewall policy.
*
*/
static public class FirewallPolicy {
@ -461,4 +461,16 @@ public interface LinphoneCore {
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();
}