Commit f1a637a1 authored by yanmorin's avatar yanmorin

Add --enable-iax2 and libs/libiax2.sh to compile with IAX2 support
parent 9c3b5eeb
SFLphoned (0.7.0) / 2005-..-..
* add iax support - in development
* add account support
* remove callid string/int
* add account SIP0 (default) in sflphone-cli
* add account SIP0 (default) in sflphone-qt
* fix nat handling (use the same port that it test)
* add register/unregister in qt
SFLphoned (0.6.2) / 2005-11-29
* integral mono support
* libsamplerate added for macosx
......
This is SFLPhoned-0.6 release.
This is SFLPhoned-0.7 release.
You need
- commoncpp2 >= 1.3.20
......@@ -79,7 +79,14 @@ Why does it not compile ?
you have to export CXXFLAGS.
( example: export CXXFLAGS="-I/opt/include" )
How to enable iax support?
--------------------------
Go inside libs directory and execute ./libiax2.sh script.
Run ./configure with --enable-iax2 option.
Why does it not work ?
----------------------
- Portaudio don't detect your sound card because :
* artsd is running
* jackd is running
......@@ -93,7 +100,6 @@ Why does it not work ?
or
- killall sflphone
Short description of content of source tree:
-------------------------------------------
......@@ -141,6 +147,10 @@ How is structured SFLphone (>=0.5)
| ManagerImpl |
+---------------------------+
|
+---------------------------+
| Account |
+---------------------------+
|
+---------------------------+
| VoIPLink |
+---------------------------+
......
......@@ -129,6 +129,15 @@ if test "x$with_speex" = "xyes" ; then
)
fi
AM_CONDITIONAL(USE_SPEEX, test "x$with_speex" = "xyes" )
AC_ARG_ENABLE(iax2,
AC_HELP_STRING(
[--enable-iax2],
[compile with iax2 library support @<:@default=no@:>@]
),
[with_iax2=$enableval],
[with_iax2=no]
)
AM_CONDITIONAL(USE_IAX, test x$with_iax2 = xyes)
GNUPG_CHECK_READLINE
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -11,17 +11,25 @@ ZEROCONFLIB =
ZEROCONFFLAGS =
endif
if USE_IAX
IAX_LIBS = $(top_builddir)/libs/libiax2/src/libiax.la
IAX_FLAGS = -DUSE_IAX
IAX_CFLAGS = -I$(top_srcdir)/libs/libiax2/src/
IAXSOURCES = iaxvoiplink.cpp
IAXHEADERS = iaxvoiplink.h
IAXSOURCES = iaxaccount.cpp iaxvoiplink.cpp
IAXHEADERS = iaxaccount.h iaxvoiplink.h
else
IAX_LIBS =
IAX_FLAGS =
IAX_CFLAGS =
IAXSOURCES =
IAXHEADERS =
endif
SUBDIRS = audio config gui $(ZEROCONFDIR)
sflphoned_SOURCES = eventthread.cpp main.cpp voIPLink.cpp \
managerimpl.cpp observer.cpp \
account.cpp sipaccount.cpp iaxaccount.cpp accountcreator.cpp \
account.cpp sipaccount.cpp accountcreator.cpp \
sipvoiplink.cpp call.cpp sipcall.cpp \
$(IAXSOURCES)
......@@ -47,7 +55,7 @@ libsflphone_la_SOURCES =
noinst_LTLIBRARIES = libsflphone.la
noinst_HEADERS = managerimpl.h manager.h global.h observer.h eventthread.h user_cfg.h \
voIPLink.h \
account.h sipaccount.h iaxaccount.h accountcreator.h \
account.h sipaccount.h accountcreator.h \
sipvoiplink.h call.h sipcall.h \
$(IAXHEADERS)
......@@ -18,7 +18,9 @@
*/
#include "accountcreator.h"
#include "sipaccount.h"
#ifdef USE_IAX
#include "iaxaccount.h"
#endif
AccountCreator::AccountCreator()
{
......@@ -38,7 +40,9 @@ AccountCreator::createAccount(AccountType type, AccountID accountID)
break;
case IAX_ACCOUNT:
#ifdef USE_IAX
return new IAXAccount(accountID);
#endif
break;
}
return 0;
......
......@@ -1582,8 +1582,12 @@ ManagerImpl::loadAccountMap()
_accountMap[ACCOUNT_SIP0] = AccountCreator::createAccount(AccountCreator::SIP_ACCOUNT, ACCOUNT_SIP0);
nbAccount++;
_accountMap[ACCOUNT_IAX0] = AccountCreator::createAccount(AccountCreator::IAX_ACCOUNT, ACCOUNT_IAX0);
nbAccount++;
Account* account = AccountCreator::createAccount(AccountCreator::IAX_ACCOUNT, ACCOUNT_IAX0);
if (account != 0) {
_accountMap[ACCOUNT_IAX0] = account;
nbAccount++;
}
account = 0;
return nbAccount;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment