diff --git a/CHANGES b/CHANGES index 7b67f8d62010b5c1ad8dc0ac2c226af2304fece3..36abbd4c8f356e481738c28dbe5e0d73940cf71f 100644 --- a/CHANGES +++ b/CHANGES @@ -129,6 +129,12 @@ app_sendtext Content-Type of a message. Since you can now set Content-Type, other text/* content types are now valid. +app_confbridge +------------------ + * ConfbridgeList now shows talking status. This utilizes the same voice + detection as the ConfbridgeTalking event, so bridges must be configured + with "talk_detection_events=yes" for this flag to have meaning. + ------------------------------------------------------------------------------ --- Functionality changes from Asterisk 15.3.0 to Asterisk 15.4.0 ------------ ------------------------------------------------------------------------------ diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c index 25cf2758feda353932294dd8068c0d48a4926528..a789a1b3c3187fba278ade65db0c1c1122d5e8f3 100644 --- a/apps/app_confbridge.c +++ b/apps/app_confbridge.c @@ -276,6 +276,13 @@ <enum name="No"/> </enumlist> </parameter> + <parameter name="Talking"> + <para>Is this user talking?</para> + <enumlist> + <enum name="Yes"/> + <enum name="No"/> + </enumlist> + </parameter> <parameter name="AnsweredTime"> <para>The number of seconds the channel has been up.</para> </parameter> @@ -2102,7 +2109,7 @@ static int play_sound_number(struct confbridge_conference *conference, int say_n static int conf_handle_talker_cb(struct ast_bridge_channel *bridge_channel, void *hook_pvt, int talking) { - const struct confbridge_user *user = hook_pvt; + struct confbridge_user *user = hook_pvt; RAII_VAR(struct confbridge_conference *, conference, NULL, ao2_cleanup); struct ast_json *talking_extras; @@ -2112,6 +2119,10 @@ static int conf_handle_talker_cb(struct ast_bridge_channel *bridge_channel, void return -1; } + ao2_lock(conference); + user->talking = talking; + ao2_unlock(conference); + talking_extras = ast_json_pack("{s: s, s: b}", "talking_status", talking ? "on" : "off", "admin", ast_test_flag(&user->u_profile, USER_OPT_ADMIN)); @@ -3562,6 +3573,7 @@ static int action_confbridgelist_item(struct mansession *s, const char *id_text, "EndMarked: %s\r\n" "Waiting: %s\r\n" "Muted: %s\r\n" + "Talking: %s\r\n" "AnsweredTime: %d\r\n" "%s" "\r\n", @@ -3573,6 +3585,7 @@ static int action_confbridgelist_item(struct mansession *s, const char *id_text, AST_YESNO(ast_test_flag(&user->u_profile, USER_OPT_ENDMARKED)), AST_YESNO(waiting), AST_YESNO(user->muted), + AST_YESNO(user->talking), ast_channel_get_up_time(user->chan), ast_str_buffer(snap_str)); diff --git a/apps/confbridge/include/confbridge.h b/apps/confbridge/include/confbridge.h index 0a0a5713fa8264de04efcce44ad2a67ba6500c4c..f9187e06c1c5bc72945952c9eba6762523a65e20 100644 --- a/apps/confbridge/include/confbridge.h +++ b/apps/confbridge/include/confbridge.h @@ -269,6 +269,7 @@ struct confbridge_user { unsigned int muted:1; /*!< Has the user requested to be muted? */ unsigned int kicked:1; /*!< User has been kicked from the conference */ unsigned int playing_moh:1; /*!< MOH is currently being played to the user */ + unsigned int talking:1; /*!< User is currently talking */ AST_LIST_HEAD_NOLOCK(, post_join_action) post_join_list; /*!< List of sounds to play after joining */; AST_LIST_ENTRY(confbridge_user) list; /*!< Linked list information */ };