Always stop tone on hangup

This commit is contained in:
yanmorin
2005-11-05 19:27:28 +00:00
parent b39a205e20
commit fefef162d9
3 changed files with 16 additions and 11 deletions

19
README
View File

@ -1,14 +1,21 @@
This is SFLPhoned-0.5 release.
This is SFLPhoned-0.6 release.
You need ccrtp-1.3.5 which needs commoncpp2>=1.3.20
libeXosip2-1.9.1-pre17 needs libosip2-2.2.0
Note that commoncpp2 needs libxml2, libxml2-devel and pkgconfig to compile.
libeXosip2-1.9.1-pre17 needs libosip2-2.2.1
You also need PortAudio_v19
See http://www.sflphone.org/#downloads to download required libraries.
Dependencies build instructions:
--------------------------------
You can use the builds script in tools directory.
1. Change the default configuration in config.sh (~/sflphone) is the prefix
2. ./download.sh
3. ./install.sh
You can also compile each dependencies, one by one:
1/ For commoncpp2-1.3.20
1/ For commoncpp2-1.3.21
./configure [option]
make
make install
@ -48,9 +55,9 @@ How to use it ?
If you have the sflphone 0.3 or 0.4 release, copy the file sflphonerc to sflphonedrc
cp ~/.sflphone/sflphonerc ~/.sflphone/sflphonedrc
If you have an oldre version, remove your sflphonerc file located in $HOME/.sflphone
If you have an older version, remove your sflphonerc file located in $HOME/.sflphone
1. Lauch sflphone-qt interface, a setup window appears.
1. Lauch sflphone interface, a setup window appears.
2. If you do have a SIP account, fill the SIP stuff where related. You can use
STUN too.
@ -105,7 +112,7 @@ Short description of content of source tree:
to sflphone client. The slfphone client can be a console program or a graphical interface
How is structured SFLphone (>=0.4)
How is structured SFLphone (>=0.5)
----------------------------------
+------------+

View File

@ -285,17 +285,15 @@ int
ManagerImpl::hangupCall (CALLID id)
{
_debug("%10d: Hangup Call\n", id);
stopTone();
ost::MutexLock m(_mutex);
Call* call = getCall(id);
if (call == NULL) {
stopTone();
return -1;
}
int result = -1;
if (call->getState() != Call::Error) {
result = call->hangup();
} else {
stopTone();
}
deleteCall(id);
// current call id or no line selected

View File

@ -4,10 +4,10 @@ SFL_PREFIX=$HOME/sflphone
SFL_INSTALL_USER=$USER # could be root too...
LD_LIBRARY_PATH=$SFL_PREFIX/lib:$LD_LIBRARY_PATH
SFL_FILE_CCPP2=http://easynews.dl.sourceforge.net/sourceforge/gnutelephony/commoncpp2-1.3.20.tar.gz
SFL_FILE_CCPP2=http://easynews.dl.sourceforge.net/sourceforge/gnutelephony/commoncpp2-1.3.21.tar.gz
SFL_FILE_CCRTP=ftp://ftp.gnu.org/pub/gnu/ccrtp/ccrtp-1.3.5.tar.gz
SFL_FILE_LIBOSIP2=http://ftp.gnu.org/gnu/osip/libosip2-2.2.1.tar.gz
SFL_FILE_LIBEXOSIP2=http://www.antisip.com/download/libeXosip2-1.9.1-pre16.tar.gz
SFL_FILE_LIBEXOSIP2=http://www.antisip.com/download/libeXosip2-1.9.1-pre17.tar.gz
SFL_FILE_PA_V19=http://www.portaudio.com/archives/pa_snapshot_v19.tar.gz
SFL_DIR_PA='portaudio'