mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-01-24 22:58:13 +00:00
Merge branch 'master' of git.linphone.org:linphone
This commit is contained in:
Guillaume Beraudo
commit
b96b8e793e
8 changed files with 37 additions and 22 deletions
4
README
4
README
|
|
@ -33,10 +33,10 @@ This is Linphone, a free (GPL) video softphone based on the SIP protocol.
|
|||
|
||||
Here is the command line to get these dependencies installed for Ubuntu && Debian
|
||||
|
||||
$ sudo apt-get install libtool intltool libgtk2.0-dev libosip2-dev libexosip2-dev libspeexdsp-dev libavcodec-dev libswscale-dev libx11-dev libvx-dev ligl1-mesa-dev libglew-dev libv4l-dev
|
||||
$ sudo apt-get install libtool intltool libgtk2.0-dev libosip2-dev libexosip2-dev libspeexdsp-dev libavcodec-dev libswscale-dev libx11-dev libvxl1-dev libgl1-mesa-dev libglew1.6-dev libv4l-dev
|
||||
|
||||
+ for optional library
|
||||
$ sudo apt-get install libreadline-dev liggsm1-dev libtheora-dev libsoup2.4-dev libsqlit3-dev libupnp6-dev
|
||||
$ sudo apt-get install libreadline-dev libgsm1-dev libtheora-dev libsoup2.4-dev libsqlite3-dev libupnp4-dev
|
||||
|
||||
+ Install srtp (optional) for call encryption :
|
||||
$ git clone git://git.linphone.org/srtp.git
|
||||
|
|
|
|||
|
|
@ -2903,7 +2903,7 @@ int linphone_core_update_call(LinphoneCore *lc, LinphoneCall *call, const Linpho
|
|||
err = linphone_core_start_update_call(lc, call);
|
||||
}else{
|
||||
#ifdef VIDEO_ENABLED
|
||||
if (call->videostream!=NULL){
|
||||
if ((call->videostream != NULL) && (call->state == LinphoneCallStreamsRunning)) {
|
||||
video_stream_set_sent_video_size(call->videostream,linphone_core_get_preferred_video_size(lc));
|
||||
if (call->camera_active && call->videostream->cam!=lc->video_conf.device){
|
||||
video_stream_change_camera(call->videostream,lc->video_conf.device);
|
||||
|
|
@ -5276,6 +5276,8 @@ LpConfig *linphone_core_get_config(LinphoneCore *lc){
|
|||
static void linphone_core_uninit(LinphoneCore *lc)
|
||||
{
|
||||
linphone_core_free_hooks(lc);
|
||||
lc->video_conf.show_local = FALSE;
|
||||
|
||||
while(lc->calls)
|
||||
{
|
||||
LinphoneCall *the_call = lc->calls->data;
|
||||
|
|
@ -5676,11 +5678,11 @@ const char *linphone_core_get_zrtp_secrets_file(LinphoneCore *lc){
|
|||
return lc->zrtp_secrets_cache;
|
||||
}
|
||||
|
||||
const LinphoneCall* linphone_core_find_call_from_uri(LinphoneCore *lc, const char *uri) {
|
||||
LinphoneCall* linphone_core_find_call_from_uri(const LinphoneCore *lc, const char *uri) {
|
||||
if (uri == NULL) return NULL;
|
||||
MSList *calls=lc->calls;
|
||||
while(calls) {
|
||||
const LinphoneCall *c=(LinphoneCall*)calls->data;
|
||||
LinphoneCall *c=(LinphoneCall*)calls->data;
|
||||
calls=calls->next;
|
||||
const LinphoneAddress *address = linphone_call_get_remote_address(c);
|
||||
char *current_uri=linphone_address_as_string_uri_only(address);
|
||||
|
|
|
|||
|
|
@ -1460,7 +1460,7 @@ const char *linphone_core_get_zrtp_secrets_file(LinphoneCore *lc);
|
|||
* @param uri which should match call remote uri
|
||||
* @return LinphoneCall or NULL is no match is found
|
||||
*/
|
||||
const LinphoneCall* linphone_core_find_call_from_uri(LinphoneCore *lc, const char *uri);
|
||||
LinphoneCall* linphone_core_find_call_from_uri(const LinphoneCore *lc, const char *uri);
|
||||
|
||||
int linphone_core_add_to_conference(LinphoneCore *lc, LinphoneCall *call);
|
||||
int linphone_core_add_all_to_conference(LinphoneCore *lc);
|
||||
|
|
|
|||
|
|
@ -1932,13 +1932,13 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setVideoWindowId(JNIEnv*
|
|||
,jlong lc
|
||||
,jobject obj) {
|
||||
jobject oldWindow = (jobject) linphone_core_get_native_video_window_id((LinphoneCore*)lc);
|
||||
if (oldWindow != NULL) {
|
||||
env->DeleteGlobalRef(oldWindow);
|
||||
}
|
||||
if (obj != NULL) {
|
||||
obj = env->NewGlobalRef(obj);
|
||||
}
|
||||
linphone_core_set_native_video_window_id((LinphoneCore*)lc,(unsigned long)obj);
|
||||
if (oldWindow != NULL) {
|
||||
env->DeleteGlobalRef(oldWindow);
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setPreviewWindowId(JNIEnv* env
|
||||
|
|
@ -1946,13 +1946,13 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setPreviewWindowId(JNIEn
|
|||
,jlong lc
|
||||
,jobject obj) {
|
||||
jobject oldWindow = (jobject) linphone_core_get_native_preview_window_id((LinphoneCore*)lc);
|
||||
if (oldWindow != NULL) {
|
||||
env->DeleteGlobalRef(oldWindow);
|
||||
}
|
||||
if (obj != NULL) {
|
||||
obj = env->NewGlobalRef(obj);
|
||||
}
|
||||
linphone_core_set_native_preview_window_id((LinphoneCore*)lc,(unsigned long)obj);
|
||||
if (oldWindow != NULL) {
|
||||
env->DeleteGlobalRef(oldWindow);
|
||||
}
|
||||
}
|
||||
|
||||
extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setDeviceRotation(JNIEnv* env
|
||||
|
|
@ -2281,7 +2281,7 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setZrtpSecretsCache(JNIE
|
|||
|
||||
extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_findCallFromUri(JNIEnv *env,jobject thiz,jlong pCore, jstring jUri) {
|
||||
const char* cUri=env->GetStringUTFChars(jUri, NULL);
|
||||
LinphoneCall *call= (LinphoneCall *) linphone_core_find_call_from_uri((LinphoneCore *) pCore,cUri);
|
||||
LinphoneCall *call=linphone_core_find_call_from_uri((LinphoneCore *) pCore,cUri);
|
||||
env->ReleaseStringUTFChars(jUri, cUri);
|
||||
LinphoneCoreData *lcdata=(LinphoneCoreData*)linphone_core_get_user_data((LinphoneCore*)pCore);
|
||||
return (jobject) lcdata->getCall(env,call);
|
||||
|
|
|
|||
|
|
@ -7,17 +7,24 @@ echo bin
|
|||
find bin -name *.dll
|
||||
find lib/gtk-2.0
|
||||
find etc
|
||||
find share/locale/fr
|
||||
find share/locale/de
|
||||
find share/locale/sv
|
||||
find share/locale/cs
|
||||
find share/locale/de
|
||||
find share/locale/es
|
||||
find share/locale/fr
|
||||
find share/locale/he
|
||||
find share/locale/hu
|
||||
find share/locale/it
|
||||
find share/locale/ja
|
||||
find share/locale/nb
|
||||
find share/locale/nb_NO
|
||||
find share/locale/nl
|
||||
find share/locale/pl
|
||||
find share/locale/ru
|
||||
find share/locale/pt
|
||||
find share/locale/pt_BR
|
||||
find share/locale/ru
|
||||
find share/locale/sr
|
||||
find share/locale/sv
|
||||
find share/locale/zh
|
||||
find share/locale/zh_CN
|
||||
find share/locale/zh_TW
|
||||
find share/themes
|
||||
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ static int all_account_information_entered(GtkWidget *w) {
|
|||
if (gtk_entry_get_text_length(username) > 0 &&
|
||||
gtk_entry_get_text_length(domain) > 0 &&
|
||||
g_regex_match_simple("^[a-zA-Z]+[a-zA-Z0-9.\\-_]{2,}$", gtk_entry_get_text(username), 0, 0) &&
|
||||
g_regex_match_simple("^(sip:)?([a-z0-9]+([\\.-][a-z0-9]+)*)+\\.[a-z]{2,}$", gtk_entry_get_text(domain), 0, 0)) {
|
||||
g_regex_match_simple("^(sip:)?([a-zA-Z0-9]+([\\.-][a-zA-Z0-9]+)*)$", gtk_entry_get_text(domain), 0, 0)) {
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
|
|
@ -422,11 +422,17 @@ static void linphone_gtk_assistant_prepare(GtkWidget *assistant, GtkWidget *page
|
|||
|
||||
gchar *username = creator->username + 4;
|
||||
const gchar *needle = "@";
|
||||
username = g_strndup(username, (g_strrstr(username, needle) - username));
|
||||
const gchar *needle_ptr = g_strrstr(username, needle);
|
||||
if (needle_ptr != NULL) {
|
||||
username = g_strndup(username, needle_ptr - username);
|
||||
} else {
|
||||
username = g_strdup(username);
|
||||
}
|
||||
gchar domain[128];
|
||||
g_snprintf(domain, sizeof(domain), "\"%s\"", creator->domain + 4);
|
||||
LinphoneAuthInfo *info=linphone_auth_info_new(username, username, creator->password, NULL, domain);
|
||||
linphone_core_add_auth_info(linphone_gtk_get_core(),info);
|
||||
g_free(username);
|
||||
|
||||
if (linphone_core_add_proxy_config(linphone_gtk_get_core(),cfg)==-1)
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 4ccd8ca511eb46375699f5efaf8f41b655e0dbb8
|
||||
Subproject commit aebfe443e91aa1e1c1e32b2410cc1d9a5db629c1
|
||||
2
oRTP
2
oRTP
|
|
@ -1 +1 @@
|
|||
Subproject commit 020d921f876ed04d434425fb2176642bbe9b3004
|
||||
Subproject commit 49b16793b9ef8251a4c42434b57387c6e3c6d251
|
||||
Loading…
Add table
Reference in a new issue