mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-02-03 19:59:36 +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-09-24 13:13:24 +02:00
commit 87c480fdbc
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
console/commands.c
View file

@ -2167,10 +2167,10 @@ static int lpc_cmd_rtp_no_xmit_on_audio_mute(LinphoneCore *lc, char *args)
}
static int lpc_cmd_video_window(LinphoneCore *lc, char *args){
#ifdef VIDEO_ENABLED
char subcommand[64];
int a,b;
int err;
#ifdef VIDEO_ENABLED
err=sscanf(args,"%s %i %i",subcommand,&a,&b);
if (err>=1){
if (strcmp(subcommand,"pos")==0){

4
coreapi/linphonecore.h
View file

@ -595,7 +595,7 @@ bool_t linphone_core_ipv6_enabled(LinphoneCore *lc);
void linphone_core_enable_ipv6(LinphoneCore *lc, bool_t val);
LinphoneAddress *linphone_core_get_primary_contact_parsed(LinphoneCore *lc);
const char * linphone_core_get_identity(LinphoneCore *lc);
/*0= no bandwidth limit*/
void linphone_core_set_download_bandwidth(LinphoneCore *lc, int bw);
void linphone_core_set_upload_bandwidth(LinphoneCore *lc, int bw);
@ -830,7 +830,7 @@ void linphone_core_stop_dtmf(LinphoneCore *lc);
int linphone_core_get_current_call_duration(const LinphoneCore *lc);
const LinphoneAddress *linphone_core_get_remote_address(LinphoneCore *lc);
int linphone_core_get_mtu(const LinphoneCore *lc);
void linphone_core_set_mtu(LinphoneCore *lc, int mtu);

1
share/Makefile.am
View file

@ -5,6 +5,7 @@ LINPHONE_SOUNDS=ringback.wav hello8000.wav hello16000.wav
LINPHONE_RINGS=rings/orig.wav \
rings/oldphone.wav \
rings/oldphone-mono.wav \
rings/oldphone-mono-30s.wav \
rings/rock.wav \
rings/bigben.wav \
rings/toy.wav \

BIN
share/rings/oldphone-mono-30s.wav Normal file
View file

Binary file not shown.