Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#3403 stop_all_files, refactor #11

Merged
merged 1 commit into from
Nov 5, 2024
+8 −18
Merged

#3403 stop_all_files, refactor #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 8 additions & 18 deletions src/plugins/janus_audiobridge.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5760,12 +5760,12 @@ static json_t *janus_audiobridge_process_synchronous_request(janus_audiobridge_s
}

/* Get list of started announcements and send a stop announcement notification */
GList *items_to_remove = NULL;
GHashTableIter iterAnnc;
gpointer valueAnnc;
g_hash_table_iter_init(&iterAnnc, audiobridge->anncs);
while(g_hash_table_iter_next(&iterAnnc, NULL, &valueAnnc)) {
janus_audiobridge_participant *p = valueAnnc;
GHashTableIter iter;
gpointer value;
json_t *list_annc_removed = json_array();
g_hash_table_iter_init(&iter, audiobridge->anncs);
while(g_hash_table_iter_next(&iter, NULL, &value)) {
janus_audiobridge_participant *p = value;
gboolean started = (p && p->annc && p->annc->started);
if(p)
janus_refcount_increase(&p->ref);
Expand All @@ -5787,23 +5787,13 @@ static json_t *janus_audiobridge_process_synchronous_request(janus_audiobridge_s
json_object_set_new(info, "file_id", json_string(p->annc->id));
gateway->notify_event(&janus_audiobridge_plugin, NULL, info);
}
items_to_remove = g_list_prepend(items_to_remove, p->annc->id);
json_array_append_new(list_annc_removed, json_string(p->annc->id));
}
g_hash_table_iter_remove(&iter);
if(p)
janus_refcount_decrease(&p->ref);
}

/* Get rid of the announcements */
json_t *list_annc_removed = json_array();
GList *l =NULL;
for(l = items_to_remove; l!= NULL; l = l->next) {
json_t *file_id = json_string(l->data);
if(g_hash_table_remove(audiobridge->anncs, l->data)) {
json_array_append_new(list_annc_removed, file_id);
}
}
g_list_free(items_to_remove);

janus_mutex_unlock(&audiobridge->mutex);
janus_mutex_unlock(&rooms_mutex);

Expand Down