From f9e3b50a9b79ea4764edd3e68a7eebf0ca0dfc9f Mon Sep 17 00:00:00 2001 From: amnonbb Date: Mon, 16 Sep 2024 11:51:56 +0300 Subject: [PATCH 1/3] Add display property on leave or unpublish event --- src/plugins/janus_videoroom.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/janus_videoroom.c b/src/plugins/janus_videoroom.c index f6f7b2aeb8..0b5f722784 100644 --- a/src/plugins/janus_videoroom.c +++ b/src/plugins/janus_videoroom.c @@ -4416,6 +4416,8 @@ static void janus_videoroom_leave_or_unpublish(janus_videoroom_publisher *partic json_object_set_new(info, "event", json_string(is_leaving ? (kicked ? "kicked" : "leaving") : "unpublished")); json_object_set_new(info, "room", string_ids ? json_string(participant->room_id_str) : json_integer(participant->room_id)); json_object_set_new(info, "id", string_ids ? json_string(participant->user_id_str) : json_integer(participant->user_id)); + if(participant->display) + json_object_set_new(info, "display", json_string(participant->display)); gateway->notify_event(&janus_videoroom_plugin, NULL, info); } if(is_leaving) { From a52e0e73e85b751f4667c63e0c31a4ab061c9a61 Mon Sep 17 00:00:00 2001 From: amnonbb Date: Sun, 22 Sep 2024 11:46:53 +0300 Subject: [PATCH 2/3] Add display property to Janus API notification --- src/plugins/janus_videoroom.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/janus_videoroom.c b/src/plugins/janus_videoroom.c index 0b5f722784..8ad86070ae 100644 --- a/src/plugins/janus_videoroom.c +++ b/src/plugins/janus_videoroom.c @@ -4407,6 +4407,8 @@ static void janus_videoroom_leave_or_unpublish(janus_videoroom_publisher *partic json_t *event = json_object(); json_object_set_new(event, "videoroom", json_string("event")); json_object_set_new(event, "room", string_ids ? json_string(participant->room_id_str) : json_integer(participant->room_id)); + if(participant->display) + json_object_set_new(info, "display", json_string(participant->display)); json_object_set_new(event, is_leaving ? (kicked ? "kicked" : "leaving") : "unpublished", string_ids ? json_string(participant->user_id_str) : json_integer(participant->user_id)); janus_videoroom_notify_participants(participant, event, FALSE); @@ -4417,7 +4419,7 @@ static void janus_videoroom_leave_or_unpublish(janus_videoroom_publisher *partic json_object_set_new(info, "room", string_ids ? json_string(participant->room_id_str) : json_integer(participant->room_id)); json_object_set_new(info, "id", string_ids ? json_string(participant->user_id_str) : json_integer(participant->user_id)); if(participant->display) - json_object_set_new(info, "display", json_string(participant->display)); + json_object_set_new(info, "display", json_string(participant->display)); gateway->notify_event(&janus_videoroom_plugin, NULL, info); } if(is_leaving) { From 5dadf0e57342e644ea5b7f0d550a3a79977f49e1 Mon Sep 17 00:00:00 2001 From: amnonbb Date: Sun, 22 Sep 2024 11:52:20 +0300 Subject: [PATCH 3/3] Fix json param name --- src/plugins/janus_videoroom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/janus_videoroom.c b/src/plugins/janus_videoroom.c index 8ad86070ae..de371d0b52 100644 --- a/src/plugins/janus_videoroom.c +++ b/src/plugins/janus_videoroom.c @@ -4408,7 +4408,7 @@ static void janus_videoroom_leave_or_unpublish(janus_videoroom_publisher *partic json_object_set_new(event, "videoroom", json_string("event")); json_object_set_new(event, "room", string_ids ? json_string(participant->room_id_str) : json_integer(participant->room_id)); if(participant->display) - json_object_set_new(info, "display", json_string(participant->display)); + json_object_set_new(event, "display", json_string(participant->display)); json_object_set_new(event, is_leaving ? (kicked ? "kicked" : "leaving") : "unpublished", string_ids ? json_string(participant->user_id_str) : json_integer(participant->user_id)); janus_videoroom_notify_participants(participant, event, FALSE);