X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=joinpbx.cpp;h=0e15ef1e421369713f1cb6c233a2e39cf44e0f62;hp=15bfcd853e8699146615357dbd0ae7e44ec92804;hb=44b6b77e68c2b685174c09da4467139e009130b4;hpb=0efcf371b4a61fa1376e83d2b7404aeb47a36e26 diff --git a/joinpbx.cpp b/joinpbx.cpp index 15bfcd8..0e15ef1 100644 --- a/joinpbx.cpp +++ b/joinpbx.cpp @@ -168,18 +168,10 @@ void joinpbx_debug(class JoinPBX *joinpbx, char *function) UPRINT(strchr(buffer,0), " type=unknown"); break; } - switch(relation->channel_state) - { - case CHANNEL_STATE_CONNECT: + if (relation->channel_state) UPRINT(strchr(buffer,0), " channel=CONNECT"); - break; - case CHANNEL_STATE_HOLD: + else UPRINT(strchr(buffer,0), " channel=HOLD"); - break; - default: - UPRINT(strchr(buffer,0), " channel=unknown"); - break; - } switch(relation->tx_state) { case NOTIFY_STATE_ACTIVE: @@ -254,7 +246,7 @@ JoinPBX::JoinPBX(class Endpoint *epoint) : Join() relation = j_relation = (struct join_relation *)MALLOC(sizeof(struct join_relation)); cmemuse++; relation->type = RELATION_TYPE_CALLING; - relation->channel_state = CHANNEL_STATE_HOLD; /* audio is assumed on a new join */ + relation->channel_state = 0; /* audio is assumed on a new join */ relation->tx_state = NOTIFY_STATE_ACTIVE; /* new joins always assumed to be active */ relation->rx_state = NOTIFY_STATE_ACTIVE; /* new joins always assumed to be active */ relation->epoint_id = epoint->ep_serial; @@ -319,7 +311,7 @@ void JoinPBX::bridge(void) { PDEBUG(DEBUG_JOIN, "join%d ignoring relation without port object.\n", j_serial); //#warning testing: keep on hold until single audio stream available - relation->channel_state = CHANNEL_STATE_HOLD; + relation->channel_state = 0; relation = relation->next; continue; } @@ -327,7 +319,7 @@ void JoinPBX::bridge(void) { PDEBUG(DEBUG_JOIN, "join%d ignoring relation with ep%d due to port_list.\n", j_serial, epoint->ep_serial); //#warning testing: keep on hold until single audio stream available - relation->channel_state = CHANNEL_STATE_HOLD; + relation->channel_state = 0; relation = relation->next; continue; } @@ -359,13 +351,13 @@ void JoinPBX::bridge(void) while(relation) { /* count connected relations */ - if ((relation->channel_state == CHANNEL_STATE_CONNECT) + if ((relation->channel_state == 1) && (relation->rx_state != NOTIFY_STATE_SUSPEND) && (relation->rx_state != NOTIFY_STATE_HOLD)) numconnect ++; /* remove unconnected parties from conference, also remove remotely disconnected parties so conference will not be disturbed. */ - if (relation->channel_state == CHANNEL_STATE_CONNECT + if (relation->channel_state == 1 && relation->rx_state != NOTIFY_STATE_HOLD && relation->rx_state != NOTIFY_STATE_SUSPEND && relations>1 // no conf with one member @@ -411,11 +403,11 @@ 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) { - if ((relation->channel_state == CHANNEL_STATE_CONNECT) + if ((relation->channel_state == 1) && (relation->rx_state != NOTIFY_STATE_SUSPEND) && (relation->rx_state != NOTIFY_STATE_HOLD)) relation->tx_state = notify_state_change(j_serial, relation->epoint_id, relation->tx_state, NOTIFY_STATE_HOLD); @@ -424,11 +416,11 @@ 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) { - if ((relation->channel_state == CHANNEL_STATE_CONNECT) + if ((relation->channel_state == 1) && (relation->rx_state != NOTIFY_STATE_SUSPEND) && (relation->rx_state != NOTIFY_STATE_HOLD)) relation->tx_state = notify_state_change(j_serial, relation->epoint_id, relation->tx_state, NOTIFY_STATE_CONFERENCE); @@ -453,7 +445,7 @@ void JoinPBX::bridge_data(unsigned long epoint_from, struct join_relation *relat return; /* skip if source endpoint has NOT audio mode CONNECT */ - if (relation_from->channel_state != CHANNEL_STATE_CONNECT) + if (relation_from->channel_state != 1) return; /* get destination relation */ @@ -465,7 +457,7 @@ void JoinPBX::bridge_data(unsigned long epoint_from, struct join_relation *relat } /* skip if destination endpoint has NOT audio mode CONNECT */ - if (relation_to->channel_state != CHANNEL_STATE_CONNECT) + if (relation_to->channel_state != 1) return; /* now we may send our data to the endpoint where it @@ -489,9 +481,9 @@ int JoinPBX::release(struct join_relation *relation, int location, int cause) int destroy = 0; /* remove from bridge */ - if (relation->channel_state != CHANNEL_STATE_HOLD) + if (relation->channel_state != 0) { - relation->channel_state = CHANNEL_STATE_HOLD; + relation->channel_state = 0; j_updatebridge = 1; /* update bridge flag */ // note: if join is not released, bridge must be updated } @@ -734,7 +726,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; @@ -1005,7 +997,7 @@ int JoinPBX::out_setup(unsigned long epoint_id, int message_type, union paramete if (!(relation=add_relation())) FATAL("No memory for relation.\n"); relation->type = RELATION_TYPE_SETUP; - relation->channel_state = CHANNEL_STATE_HOLD; /* audio is assumed on a new join */ + relation->channel_state = 0; /* audio is assumed on a new join */ relation->tx_state = NOTIFY_STATE_ACTIVE; /* new joins always assumed to be active */ relation->rx_state = NOTIFY_STATE_ACTIVE; /* new joins always assumed to be active */ /* create a new endpoint */ @@ -1041,11 +1033,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; }