diff --git a/linphone/NEWS b/linphone/NEWS index dac6ea015..3ecee9123 100644 --- a/linphone/NEWS +++ b/linphone/NEWS @@ -1,4 +1,4 @@ -linphone-3.1.0 -- January 19, 2009 +linphone-3.1.0 -- March 16, 2009 * linphone can now send large video pictures: up to SVGA, configurable via the user interface * automatic rescaling of the video windows to the video size of incoming stream * improved webcam support on windows @@ -7,6 +7,7 @@ linphone-3.1.0 -- January 19, 2009 * linphonec can compile and work without libreadline * enable translations on windows * enable lookups of SRV records + * new 'linphonecsh' program to send commands to a linphonec running as daemon using unix sockets or tcp. * bugfixing as usual linphone-3.0.0 -- October 13, 2008 diff --git a/linphone/configure.in b/linphone/configure.in index a390e9bcc..28ad388ea 100644 --- a/linphone/configure.in +++ b/linphone/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([linphone],[3.0.0],[linphone-developers@nongnu.org]) +AC_INIT([linphone],[3.1.0],[linphone-developers@nongnu.org]) dnl Source packaging numbers diff --git a/linphone/gtk-glade/linphone.h b/linphone/gtk-glade/linphone.h index 7bfb1be8b..22b8ca5b1 100644 --- a/linphone/gtk-glade/linphone.h +++ b/linphone/gtk-glade/linphone.h @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define PACKAGE_DATA_DIR "./" #ifndef LINPHONE_VERSION -#define LINPHONE_VERSION "3.0.0-20090311" +#define LINPHONE_VERSION "3.1.0" #endif #endif diff --git a/linphone/mediastreamer2/src/msrtp.c b/linphone/mediastreamer2/src/msrtp.c index 2925966f4..804698e96 100644 --- a/linphone/mediastreamer2/src/msrtp.c +++ b/linphone/mediastreamer2/src/msrtp.c @@ -196,20 +196,18 @@ static void sender_process(MSFilter * f) } freemsg(im); }else{ - if (d->mute_mic==FALSE) - { - int pt = mblk_get_payload_type(im); - header = rtp_session_create_packet(s, 12, NULL, 0); - if (pt>0) - rtp_set_payload_type(header, pt); - rtp_set_markbit(header, mblk_get_marker_info(im)); - header->b_cont = im; - rtp_session_sendm_with_ts(s, header, timestamp); - } - else - { - freemsg(im); - } + if (d->mute_mic==FALSE){ + int pt = mblk_get_payload_type(im); + header = rtp_session_create_packet(s, 12, NULL, 0); + if (pt>0) + rtp_set_payload_type(header, pt); + rtp_set_markbit(header, mblk_get_marker_info(im)); + header->b_cont = im; + rtp_session_sendm_with_ts(s, header, timestamp); + } + else{ + freemsg(im); + } } ms_filter_unlock(f); } diff --git a/linphone/share/C/linphonecsh.1 b/linphone/share/C/linphonecsh.1 index 26b83e749..6c7b77f27 100644 --- a/linphone/share/C/linphonecsh.1 +++ b/linphone/share/C/linphonecsh.1 @@ -5,8 +5,20 @@ linphonecsh \- Sends a command to a linphonec running in daemon mode, and exits. .SH "SYNTAX" .LP -linphonec <\fIaction\fP> <\fIARGS...\fP> +linphonecsh \fIinit\fP <\fIoptional linphonec args\fP> .br +linphonecsh \fIexit\fP +.br +linphonecsh \fIgeneric\fP <\fIlinphonec command line surrounded by quotes\fP> +.br +linphonecsh \fIregister\fP \fI--username\fP <\fIusername\fP> \fI--host\fP <\fIproxy\fP> \fI--password\fP <\fIpassword\fP> +.br +linphonecsh \fIunregister\fP +.br +linphonecsh \fIdial\fP <\fIsip address or number\fP> +.br +linphonecsh \fIstatus\fP <\fIdomain = one of 'register', 'hook', 'autoanswer'\fP> +.br linphonecsh \fI\--help\fP .SH "DESCRIPTION" .LP @@ -20,12 +32,14 @@ The very first thing to do before doing actions is to ask linphonecsh to spawn a .TP \fBlinphonecsh init\fR .br +The resulting linphonec daemon does not read or write any configuration file. When the linphonec daemon is no more needed, the following commands makes it exit properly: .TP \fBlinphonecsh exit\fR .br + .SH "FILES" .LP By default a linphonec started as a daemon by 'linphonecsh init' does not use a config file.