mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-07 14:18:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	coreapi/linphonecore_jni.cc
	java/common/org/linphone/core/LinphoneCore.java
This commit is contained in:
Guillaume Beraudo 2010-11-26 15:01:08 +01:00
commit d892fce8c0
6 changed files with 56 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
**/

20
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

20
gtk/main.c
View file

@ -512,6 +512,7 @@ static gboolean linphone_gtk_iterate(LinphoneCore *lc){
static gboolean first_time=TRUE;
unsigned long id;
static unsigned long previd=0;
static unsigned long preview_previd=0;
static gboolean in_iterate=FALSE;
/*avoid reentrancy*/
@ -534,6 +535,25 @@ static gboolean linphone_gtk_iterate(LinphoneCore *lc){
w=gdk_window_foreign_new(id);
#else
w=gdk_window_foreign_new((HANDLE)id);
#endif
if (w) {
set_video_window_decorations(w);
g_object_unref(G_OBJECT(w));
}
else ms_error("gdk_window_foreign_new() failed");
if (video_needs_update) video_needs_update=FALSE;
}
}
id=linphone_core_get_native_preview_window_id (lc);
if (id!=preview_previd ){
GdkWindow *w;
preview_previd=id;
if (id!=0){
ms_message("Updating window decorations for preview");
#ifndef WIN32
w=gdk_window_foreign_new(id);
#else
w=gdk_window_foreign_new((HANDLE)id);
#endif
if (w) {
set_video_window_decorations(w);

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,6 +461,18 @@ 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();
public void setUploadBandwidth(int bw);
public void setDownloadBandwidth(int bw);

2
mediastreamer2

@ -1 +1 @@
Subproject commit b1a4c2b6470a6de62a8e58d4f2874eda091a8db3
Subproject commit 28a6e7f22fbdd93a01676fc9cc47a2605c846d75