Commit e4d62dc2 authored by Alexandre Bourget's avatar Alexandre Bourget
Browse files

Move header requirements (use the globally installed ones)

Use iax/iax-client.h instead of iax-client.h (from libs/libiax2)

Must be fixed, with bug #10
parent 9775d1c9
...@@ -29,12 +29,12 @@ class Account; ...@@ -29,12 +29,12 @@ class Account;
*/ */
class AccountCreator{ class AccountCreator{
public: public:
~AccountCreator(); ~AccountCreator();
/** /**
* Public account type * Public account type
*/ */
enum AccountType {SIP_ACCOUNT, IAX_ACCOUNT }; enum AccountType {SIP_ACCOUNT, IAX_ACCOUNT };
/** /**
* Create a new account or null * Create a new account or null
* @param type type of the account * @param type type of the account
...@@ -43,8 +43,8 @@ public: ...@@ -43,8 +43,8 @@ public:
static Account* createAccount(AccountType type, AccountID accountID); static Account* createAccount(AccountType type, AccountID accountID);
private: private:
/** Hidden creator */ /** Hidden creator */
AccountCreator(); AccountCreator();
}; };
#endif #endif
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define IAXCALL_H #define IAXCALL_H
#include "call.h" #include "call.h"
#include <iax-client.h> #include <iax/iax-client.h>
/** /**
* IAXCall are IAX implementation of a normal Call * IAXCall are IAX implementation of a normal Call
......
...@@ -26,6 +26,11 @@ ...@@ -26,6 +26,11 @@
#include "audio/audiolayer.h" #include "audio/audiolayer.h"
#include <samplerate.h> #include <samplerate.h>
#include <iax/iax-client.h>
#define IAX_BLOCKING 1
#define IAX_NONBLOCKING 0
#define IAX_SUCCESS 0 #define IAX_SUCCESS 0
#define IAX_FAILURE -1 #define IAX_FAILURE -1
...@@ -178,7 +183,7 @@ IAXVoIPLink::getEvent() ...@@ -178,7 +183,7 @@ IAXVoIPLink::getEvent()
iax_event* event = NULL; iax_event* event = NULL;
IAXCall* call = NULL; IAXCall* call = NULL;
while ( (event = iax_get_event(TRUE)) != NULL ) { while ( (event = iax_get_event(IAX_BLOCKING)) != NULL ) {
//_debug ("Receive IAX Event: %d\n", event->etype); //_debug ("Receive IAX Event: %d\n", event->etype);
call = iaxFindCallBySession(event->session); call = iaxFindCallBySession(event->session);
if (call != 0) { if (call != 0) {
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define IAXVOIPLINK_H #define IAXVOIPLINK_H
#include "voIPLink.h" #include "voIPLink.h"
#include <iax-client.h> #include <iax/iax-client.h>
#include "global.h" #include "global.h"
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
#define CODEC3 "Codecs.codec3" #define CODEC3 "Codecs.codec3"
#define RING_CHOICE "Rings.ringChoice" #define RING_CHOICE "Rings.ringChoice"
#define ACCOUNT_SIP_COUNT_DEFAULT 4 #define ACCOUNT_SIP_COUNT_DEFAULT 4
#define ACCOUNT_IAX_COUNT_DEFAULT 1 #define ACCOUNT_IAX_COUNT_DEFAULT 4
// speakers and volume 0 to 100 // speakers and volume 0 to 100
#define VOLUME_SPKR "Volume.speakers" #define VOLUME_SPKR "Volume.speakers"
......
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