summaryrefslogtreecommitdiffstats
path: root/joinpbx.cpp
diff options
context:
space:
mode:
authorSuper User2008-05-12 18:35:48 +0200
committerSuper User2008-05-12 18:35:48 +0200
commit012abb3e07c04507685491070cedd93e4b093374 (patch)
tree2260f3291e51c67c944372f8186a06534a86ec07 /joinpbx.cpp
parentnt-mode multiplexing debugged (diff)
downloadlcr-012abb3e07c04507685491070cedd93e4b093374.tar.gz
lcr-012abb3e07c04507685491070cedd93e4b093374.tar.xz
lcr-012abb3e07c04507685491070cedd93e4b093374.zip
some minor fixes
modified: dss1.cpp modified: joinpbx.cpp modified: mISDN.cpp modified: port.cpp modified: tones_american/joined.isdn modified: tones_american/left.isdn
Diffstat (limited to 'joinpbx.cpp')
-rw-r--r--joinpbx.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/joinpbx.cpp b/joinpbx.cpp
index 15bfcd8..635f059 100644
--- a/joinpbx.cpp
+++ b/joinpbx.cpp
@@ -411,7 +411,7 @@ void JoinPBX::bridge(void)
/* one member in a join, so we put her on hold */
if ((relations==1 || numconnect==1)/* && !j_partyline_jingle*/)
{
- PDEBUG(DEBUG_JOIN, "join%d 1 member or only 1 connected, put on hold\n");
+ PDEBUG(DEBUG_JOIN, "join%d 1 member or only 1 connected, put on hold\n", j_serial);
relation = j_relation;
while(relation)
{
@@ -424,7 +424,7 @@ void JoinPBX::bridge(void)
} else
/* if conference/partyline (or more than two members and more than one is connected), so we set conference state */
{
- PDEBUG(DEBUG_JOIN, "join%d %d members, %d connected, signal conference\n", relations, numconnect);
+ PDEBUG(DEBUG_JOIN, "join%d %d members, %d connected, signal conference\n", j_serial, relations, numconnect);
relation = j_relation;
while(relation)
{
@@ -734,7 +734,7 @@ void JoinPBX::message_epoint(unsigned long epoint_id, int message_type, union pa
case MESSAGE_RELEASE:
PDEBUG(DEBUG_JOIN, "releasing from join\n");
release(relation, 0, 0);
- if (j_relation && j_partyline_jingle)
+ if (j_partyline_jingle)
play_jingle(0);
break;
@@ -1041,11 +1041,10 @@ void JoinPBX::play_jingle(int in)
return;
if (!relation->next)
return;
-
while(relation)
{
message = message_create(j_serial, relation->epoint_id, JOIN_TO_EPOINT, MESSAGE_TONE);
- SCPY(message->param.tone.name, (char *)((in)?"left":"joined"));
+ SCPY(message->param.tone.name, (char *)((in)?"joined":"left"));
message_put(message);
relation = relation->next;
}