Preston_PLB
/
freeswitch
forked from Mirrors/freeswitch
1
0
Fork 0
Code Pull Requests Activity

Two stage renaming: Stage 2 completed. 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16145 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
João Mesquita 2010-01-04 22:07:20 +00:00
parent 35c53d5b1a
commit 58298f9903
8 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fscomm/call.cpp
View File

@ -33,7 +33,7 @@ Call::Call()
{ {
} }
Call::Call(int call_id, QString cid_name, QString cid_number, fsphone_call_direction_t direction, QString uuid) : Call::Call(int call_id, QString cid_name, QString cid_number, fscomm_call_direction_t direction, QString uuid) :
_call_id(call_id), _call_id(call_id),
_cid_name(cid_name), _cid_name(cid_name),
_cid_number(cid_number), _cid_number(cid_number),

26
fscomm/call.h
View File

@ -34,38 +34,38 @@
#include <fshost.h> #include <fshost.h>
typedef enum { typedef enum {
FSPHONE_CALL_STATE_RINGING = 0, FSCOMM_CALL_STATE_RINGING = 0,
FSPHONE_CALL_STATE_TRYING = 1, FSCOMM_CALL_STATE_TRYING = 1,
FSPHONE_CALL_STATE_ANSWERED = 2 FSCOMM_CALL_STATE_ANSWERED = 2
} fsphone_call_state_t; } fscomm_call_state_t;
typedef enum { typedef enum {
FSPHONE_CALL_DIRECTION_INBOUND = 0, FSCOMM_CALL_DIRECTION_INBOUND = 0,
FSPHONE_CALL_DIRECTION_OUTBOUND = 1 FSCOMM_CALL_DIRECTION_OUTBOUND = 1
} fsphone_call_direction_t; } fscomm_call_direction_t;
class Call class Call
{ {
public: public:
Call(void); Call(void);
Call(int call_id, QString cid_name, QString cid_number, fsphone_call_direction_t direction, QString uuid); Call(int call_id, QString cid_name, QString cid_number, fscomm_call_direction_t direction, QString uuid);
QString getCidName(void) { return _cid_name; } QString getCidName(void) { return _cid_name; }
QString getCidNumber(void) { return _cid_number; } QString getCidNumber(void) { return _cid_number; }
int getCallID(void) { return _call_id; } int getCallID(void) { return _call_id; }
QString getUUID(void) { return _uuid; } QString getUUID(void) { return _uuid; }
void setbUUID(QString uuid) { _buuid = uuid; } void setbUUID(QString uuid) { _buuid = uuid; }
fsphone_call_direction_t getDirection() { return _direction; } fscomm_call_direction_t getDirection() { return _direction; }
fsphone_call_state_t getState() { return _state; } fscomm_call_state_t getState() { return _state; }
void setState(fsphone_call_state_t state) { _state = state; } void setState(fscomm_call_state_t state) { _state = state; }
private: private:
int _call_id; int _call_id;
QString _cid_name; QString _cid_name;
QString _cid_number; QString _cid_number;
fsphone_call_direction_t _direction; fscomm_call_direction_t _direction;
QString _uuid; QString _uuid;
QString _buuid; QString _buuid;
fsphone_call_state_t _state; fscomm_call_state_t _state;
}; };
Q_DECLARE_METATYPE(Call) Q_DECLARE_METATYPE(Call)

2
fscomm/conf/freeswitch.xml
View File

@ -118,7 +118,7 @@
</gateways> </gateways>
<settings> <settings>
<!--<param name="media-option" value="bypass-media-after-att-xfer"/>--> <!--<param name="media-option" value="bypass-media-after-att-xfer"/>-->
<param name="user-agent-string" value="FreeSWITCH/FSPhone"/> <param name="user-agent-string" value="FreeSWITCH/FSComm"/>
<!-- <param name="user-agent-string" value="FreeSWITCH Rocks!"/> --> <!-- <param name="user-agent-string" value="FreeSWITCH Rocks!"/> -->
<param name="debug" value="0"/> <param name="debug" value="0"/>
<param name="sip-trace" value="no"/> <param name="sip-trace" value="no"/>

48
fscomm/fshost.cpp
View File

@ -56,21 +56,21 @@ void FSHost::run(void)
/* Create directory structure for softphone with default configs */ /* Create directory structure for softphone with default configs */
QDir conf_dir = QDir(QDir::home()); QDir conf_dir = QDir(QDir::home());
if (!conf_dir.exists(".fsphone")) if (!conf_dir.exists(".fscomm"))
{ {
conf_dir.mkpath(".fsphone/conf/accounts"); conf_dir.mkpath(".fscomm/conf/accounts");
conf_dir.mkpath(".fsphone/templates"); conf_dir.mkpath(".fscomm/templates");
QFile rootXML(":/confs/freeswitch.xml"); QFile rootXML(":/confs/freeswitch.xml");
QString dest = QString("%1/.fsphone/conf/freeswitch.xml").arg(conf_dir.absolutePath()); QString dest = QString("%1/.fscomm/conf/freeswitch.xml").arg(conf_dir.absolutePath());
rootXML.copy(dest); rootXML.copy(dest);
QFile defaultAccount(":/confs/example.xml"); QFile defaultAccount(":/confs/example.xml");
dest = QString("%1/.fsphone/conf/accounts/example.xml").arg(conf_dir.absolutePath()); dest = QString("%1/.fscomm/conf/accounts/example.xml").arg(conf_dir.absolutePath());
defaultAccount.copy(dest); defaultAccount.copy(dest);
} }
/* Set all directories to the home user directory */ /* Set all directories to the home user directory */
if (conf_dir.cd(".fsphone")) if (conf_dir.cd(".fscomm"))
{ {
SWITCH_GLOBAL_dirs.conf_dir = (char *) malloc(strlen(QString("%1/conf").arg(conf_dir.absolutePath()).toAscii().constData()) + 1); SWITCH_GLOBAL_dirs.conf_dir = (char *) malloc(strlen(QString("%1/conf").arg(conf_dir.absolutePath()).toAscii().constData()) + 1);
if (!SWITCH_GLOBAL_dirs.conf_dir) { if (!SWITCH_GLOBAL_dirs.conf_dir) {
@ -152,14 +152,14 @@ switch_status_t FSHost::processAlegEvent(switch_event_t * event, QString uuid)
switch_status_t status = SWITCH_STATUS_SUCCESS; switch_status_t status = SWITCH_STATUS_SUCCESS;
Call * call = _active_calls.value(uuid); Call * call = _active_calls.value(uuid);
/* Inbound call */ /* Inbound call */
if (call->getDirection() == FSPHONE_CALL_DIRECTION_INBOUND) if (call->getDirection() == FSCOMM_CALL_DIRECTION_INBOUND)
{ {
switch(event->event_id) { switch(event->event_id) {
case SWITCH_EVENT_CHANNEL_ANSWER: case SWITCH_EVENT_CHANNEL_ANSWER:
{ {
call->setbUUID(switch_event_get_header_nil(event, "Other-Leg-Unique-ID")); call->setbUUID(switch_event_get_header_nil(event, "Other-Leg-Unique-ID"));
_bleg_uuids.insert(switch_event_get_header_nil(event, "Other-Leg-Unique-ID"), uuid); _bleg_uuids.insert(switch_event_get_header_nil(event, "Other-Leg-Unique-ID"), uuid);
call->setState(FSPHONE_CALL_STATE_ANSWERED); call->setState(FSCOMM_CALL_STATE_ANSWERED);
emit answered(uuid); emit answered(uuid);
break; break;
} }
@ -192,7 +192,7 @@ switch_status_t FSHost::processAlegEvent(switch_event_t * event, QString uuid)
} }
case SWITCH_EVENT_CHANNEL_HANGUP_COMPLETE: case SWITCH_EVENT_CHANNEL_HANGUP_COMPLETE:
{ {
if (call->getState() == FSPHONE_CALL_STATE_TRYING) if (call->getState() == FSCOMM_CALL_STATE_TRYING)
{ {
emit callFailed(uuid); emit callFailed(uuid);
_active_calls.take(uuid); _active_calls.take(uuid);
@ -213,7 +213,7 @@ switch_status_t FSHost::processBlegEvent(switch_event_t * event, QString buuid)
switch_status_t status = SWITCH_STATUS_SUCCESS; switch_status_t status = SWITCH_STATUS_SUCCESS;
Call * call = _active_calls.value(uuid); Call * call = _active_calls.value(uuid);
/* Inbound call */ /* Inbound call */
if (call->getDirection() == FSPHONE_CALL_DIRECTION_INBOUND) if (call->getDirection() == FSCOMM_CALL_DIRECTION_INBOUND)
{ {
qDebug() << " Inbound call"; qDebug() << " Inbound call";
} }
@ -237,7 +237,7 @@ switch_status_t FSHost::processBlegEvent(switch_event_t * event, QString buuid)
{ {
if (QString(switch_event_get_header_nil(event, "Answer-State")) == "early") if (QString(switch_event_get_header_nil(event, "Answer-State")) == "early")
{ {
call->setState(FSPHONE_CALL_STATE_RINGING); call->setState(FSCOMM_CALL_STATE_RINGING);
emit ringing(uuid); emit ringing(uuid);
} }
//printEventHeaders(event); //printEventHeaders(event);
@ -280,20 +280,20 @@ void FSHost::generalEventHandler(switch_event_t *event)
Call *call = new Call(atoi(switch_event_get_header_nil(event, "call_id")), Call *call = new Call(atoi(switch_event_get_header_nil(event, "call_id")),
switch_event_get_header_nil(event, "Caller-Caller-ID-Name"), switch_event_get_header_nil(event, "Caller-Caller-ID-Name"),
switch_event_get_header_nil(event, "Caller-Caller-ID-Number"), switch_event_get_header_nil(event, "Caller-Caller-ID-Number"),
FSPHONE_CALL_DIRECTION_INBOUND, FSCOMM_CALL_DIRECTION_INBOUND,
uuid); uuid);
_active_calls.insert(uuid, call); _active_calls.insert(uuid, call);
call->setState(FSPHONE_CALL_STATE_RINGING); call->setState(FSCOMM_CALL_STATE_RINGING);
emit ringing(uuid); emit ringing(uuid);
} }
else if (strcmp(event->subclass_name, "portaudio::makecall") == 0) else if (strcmp(event->subclass_name, "portaudio::makecall") == 0)
{ {
Call *call = new Call(atoi(switch_event_get_header_nil(event, "call_id")),NULL, Call *call = new Call(atoi(switch_event_get_header_nil(event, "call_id")),NULL,
switch_event_get_header_nil(event, "Caller-Destination-Number"), switch_event_get_header_nil(event, "Caller-Destination-Number"),
FSPHONE_CALL_DIRECTION_OUTBOUND, FSCOMM_CALL_DIRECTION_OUTBOUND,
uuid); uuid);
_active_calls.insert(uuid, call); _active_calls.insert(uuid, call);
call->setState(FSPHONE_CALL_STATE_TRYING); call->setState(FSCOMM_CALL_STATE_TRYING);
emit newOutgoingCall(uuid); emit newOutgoingCall(uuid);
} }
else if (strcmp(event->subclass_name, "sofia::gateway_state") == 0) else if (strcmp(event->subclass_name, "sofia::gateway_state") == 0)
@ -301,23 +301,23 @@ void FSHost::generalEventHandler(switch_event_t *event)
QString state = switch_event_get_header_nil(event, "State"); QString state = switch_event_get_header_nil(event, "State");
QString gw = switch_event_get_header_nil(event, "Gateway"); QString gw = switch_event_get_header_nil(event, "Gateway");
if (state == "TRYING") if (state == "TRYING")
emit gwStateChange(gw, FSPHONE_GW_STATE_TRYING); emit gwStateChange(gw, FSCOMM_GW_STATE_TRYING);
else if (state == "REGISTER") else if (state == "REGISTER")
emit gwStateChange(gw, FSPHONE_GW_STATE_REGISTER); emit gwStateChange(gw, FSCOMM_GW_STATE_REGISTER);
else if (state == "REGED") else if (state == "REGED")
emit gwStateChange(gw, FSPHONE_GW_STATE_REGED); emit gwStateChange(gw, FSCOMM_GW_STATE_REGED);
else if (state == "UNREGED") else if (state == "UNREGED")
emit gwStateChange(gw, FSPHONE_GW_STATE_UNREGED); emit gwStateChange(gw, FSCOMM_GW_STATE_UNREGED);
else if (state == "UNREGISTER") else if (state == "UNREGISTER")
emit gwStateChange(gw, FSPHONE_GW_STATE_UNREGISTER); emit gwStateChange(gw, FSCOMM_GW_STATE_UNREGISTER);
else if (state =="FAILED") else if (state =="FAILED")
emit gwStateChange(gw, FSPHONE_GW_STATE_FAILED); emit gwStateChange(gw, FSCOMM_GW_STATE_FAILED);
else if (state == "FAIL_WAIT") else if (state == "FAIL_WAIT")
emit gwStateChange(gw, FSPHONE_GW_STATE_FAIL_WAIT); emit gwStateChange(gw, FSCOMM_GW_STATE_FAIL_WAIT);
else if (state == "EXPIRED") else if (state == "EXPIRED")
emit gwStateChange(gw, FSPHONE_GW_STATE_EXPIRED); emit gwStateChange(gw, FSCOMM_GW_STATE_EXPIRED);
else if (state == "NOREG") else if (state == "NOREG")
emit gwStateChange(gw, FSPHONE_GW_STATE_NOREG); emit gwStateChange(gw, FSCOMM_GW_STATE_NOREG);
} }
else else
{ {

22
fscomm/fshost.h
View File

@ -35,17 +35,17 @@
class Call; class Call;
#define FSPHONE_GW_STATE_TRYING 0 #define FSCOMM_GW_STATE_TRYING 0
#define FSPHONE_GW_STATE_REGISTER 1 #define FSCOMM_GW_STATE_REGISTER 1
#define FSPHONE_GW_STATE_REGED 2 #define FSCOMM_GW_STATE_REGED 2
#define FSPHONE_GW_STATE_UNREGED 3 #define FSCOMM_GW_STATE_UNREGED 3
#define FSPHONE_GW_STATE_UNREGISTER 4 #define FSCOMM_GW_STATE_UNREGISTER 4
#define FSPHONE_GW_STATE_FAILED 5 #define FSCOMM_GW_STATE_FAILED 5
#define FSPHONE_GW_STATE_FAIL_WAIT 6 #define FSCOMM_GW_STATE_FAIL_WAIT 6
#define FSPHONE_GW_STATE_EXPIRED 7 #define FSCOMM_GW_STATE_EXPIRED 7
#define FSPHONE_GW_STATE_NOREG 8 #define FSCOMM_GW_STATE_NOREG 8
static const char *fsphone_gw_state_names[] = { static const char *fscomm_gw_state_names[] = {
"TRYING", "TRYING",
"REGISTER", "REGISTER",
"REGED", "REGED",
@ -65,7 +65,7 @@ public:
switch_status_t sendCmd(const char *cmd, const char *args, QString *res); switch_status_t sendCmd(const char *cmd, const char *args, QString *res);
void generalEventHandler(switch_event_t *event); void generalEventHandler(switch_event_t *event);
Call * getCallByUUID(QString uuid) { return _active_calls.value(uuid, NULL); } Call * getCallByUUID(QString uuid) { return _active_calls.value(uuid, NULL); }
QString getGwStateName(int id) { return fsphone_gw_state_names[id]; } QString getGwStateName(int id) { return fscomm_gw_state_names[id]; }
protected: protected:
void run(void); void run(void);

2
fscomm/main.cpp
View File

@ -36,7 +36,7 @@ int main(int argc, char *argv[])
QApplication a(argc, argv); QApplication a(argc, argv);
QCoreApplication::setOrganizationName("FreeSWITCH"); QCoreApplication::setOrganizationName("FreeSWITCH");
QCoreApplication::setOrganizationDomain("freeswitch.org"); QCoreApplication::setOrganizationDomain("freeswitch.org");
QCoreApplication::setApplicationName("FSPhone"); QCoreApplication::setApplicationName("FSComm");
QPixmap image(":/images/splash.png"); QPixmap image(":/images/splash.png");
QSplashScreen *splash = new QSplashScreen(image); QSplashScreen *splash = new QSplashScreen(image);

2
fscomm/mainwindow.cpp
View File

@ -257,7 +257,7 @@ void MainWindow::answered(QString uuid)
QListWidgetItem *item = ui->listCalls->item(i); QListWidgetItem *item = ui->listCalls->item(i);
if (item->data(Qt::UserRole).toString() == uuid) if (item->data(Qt::UserRole).toString() == uuid)
{ {
if (call->getDirection() == FSPHONE_CALL_DIRECTION_INBOUND) if (call->getDirection() == FSCOMM_CALL_DIRECTION_INBOUND)
{ {
item->setText(tr("%1 (%2) - Active").arg(call->getCidName(), call->getCidNumber())); item->setText(tr("%1 (%2) - Active").arg(call->getCidName(), call->getCidNumber()));
break; break;

2
fscomm/mainwindow.ui
View File

@ -11,7 +11,7 @@
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>FSPhone - A FreeSWITCH softphone</string> <string>FSComm - A FreeSWITCH Communicator</string>
</property> </property>
<widget class="QWidget" name="centralWidget"> <widget class="QWidget" name="centralWidget">
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4">