summaryrefslogtreecommitdiffstats
path: root/action.cpp
diff options
context:
space:
mode:
authorSuper User2007-09-10 07:10:50 +0200
committerSuper User2007-09-10 07:10:50 +0200
commitdb6990e487255e8b206ef67d8d99fa74849a9a11 (patch)
tree0064165f3b210a6121ec6d877d55600212595a2d /action.cpp
parentclean up makefile (diff)
downloadlcr-db6990e487255e8b206ef67d8d99fa74849a9a11.tar.gz
lcr-db6990e487255e8b206ef67d8d99fa74849a9a11.tar.xz
lcr-db6990e487255e8b206ef67d8d99fa74849a9a11.zip
just backup. (partyline join/release jingle not tested yet, no sound yet)
Diffstat (limited to 'action.cpp')
-rw-r--r--action.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/action.cpp b/action.cpp
index 8056435..4b3f383 100644
--- a/action.cpp
+++ b/action.cpp
@@ -546,7 +546,7 @@ void EndpointAppPBX::action_init_partyline(void)
struct port_list *portlist = ea_endpoint->ep_portlist;
struct message *message;
struct route_param *rparam;
- int partyline;
+ int partyline, jingle = 0;
struct join_relation *relation;
portlist = ea_endpoint->ep_portlist;
@@ -571,6 +571,8 @@ void EndpointAppPBX::action_init_partyline(void)
goto noroom;
}
partyline = rparam->integer_value;
+ if ((rparam = routeparam(e_action, PARAM_JINGLE)))
+ jingle = 1;
/* don't create join if partyline exists */
join = join_first;
@@ -579,7 +581,7 @@ void EndpointAppPBX::action_init_partyline(void)
if (join->j_type == JOIN_TYPE_PBX)
{
joinpbx = (class JoinPBX *)join;
- if (joinpbx->j_partyline == rparam->integer_value)
+ if (joinpbx->j_partyline == partyline)
break;
}
join = join->next;
@@ -614,9 +616,11 @@ void EndpointAppPBX::action_init_partyline(void)
/* send setup to join */
trace_header("ACTION partyline (calling)", DIRECTION_NONE);
add_trace("room", NULL, "%d", partyline);
+ add_trace("jingle", NULL, (jingle)?"on":"off");
end_trace();
message = message_create(ea_endpoint->ep_serial, ea_endpoint->ep_join_id, EPOINT_TO_JOIN, MESSAGE_SETUP);
message->param.setup.partyline = partyline;
+ message->param.setup.partyline_jingle = jingle;
memcpy(&message->param.setup.dialinginfo, &e_dialinginfo, sizeof(struct dialing_info));
memcpy(&message->param.setup.redirinfo, &e_redirinfo, sizeof(struct redir_info));
memcpy(&message->param.setup.callerinfo, &e_callerinfo, sizeof(struct caller_info));