fix warning

add get_identity method to linphonecore.h
add ring-mono-30

diff --git a/console/commands.c b/console/commands.c
index 619746cda1ab53cc5a350f60fe579fbf1e448991..99e2b4ac82b19c7826e54ff8dcb495f18e6a3d75 100644 (file)
--- a/console/commands.c
+++ b/console/commands.c
@@ -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){

diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h
index f577ae9859163357f18dd8e50aa2fae75c677445..f34d7d4fd26e6f304ec9942d550d320efd9ab2a3 100644 (file)
--- a/coreapi/linphonecore.h
+++ b/coreapi/linphonecore.h
@@ -557,7 +557,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);
@@ -792,7 +792,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);

diff --git a/share/Makefile.am b/share/Makefile.am
index 57f26a8a19cc81ed18333726ec1a209adf29f1ef..aae65d4cebcb275ed233313431a17a61e0e4cad5 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -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 \

diff --git a/share/rings/oldphone-mono-30s.wav b/share/rings/oldphone-mono-30s.wav
new file mode 100644 (file)
index 0000000..98c8276
Binary files /dev/null and b/share/rings/oldphone-mono-30s.wav differ