Skip to content

Commit

Permalink
Revert "stream-interaction: Use PA_IDXSET_FOREACH macro to iterate id…
Browse files Browse the repository at this point in the history
…xset"

This reverts commit 5540f72.
  • Loading branch information
jusa committed Feb 24, 2021
1 parent 4d6a114 commit 2a3b9d8
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/modules/stream-interaction.c
Expand Up @@ -187,7 +187,7 @@ static inline void apply_interaction_to_sink(struct userdata *u, pa_sink *s, con
pa_assert(u);
pa_sink_assert_ref(s);

PA_IDXSET_FOREACH(j, s->inputs, idx) {
for (j = PA_SINK_INPUT(pa_idxset_first(s->inputs, &idx)); j; j = PA_SINK_INPUT(pa_idxset_next(s->inputs, &idx))) {
bool corked, interaction_applied;
const char *role;

Expand Down Expand Up @@ -247,7 +247,9 @@ static void remove_interactions(struct userdata *u, struct group *g) {
const char *role;

PA_IDXSET_FOREACH(s, u->core->sinks, idx) {
PA_IDXSET_FOREACH(j, s->inputs, idx_input) {

for (j = PA_SINK_INPUT(pa_idxset_first(s->inputs, &idx_input)); j; j = PA_SINK_INPUT(pa_idxset_next(s->inputs, &idx_input))) {

if(!!pa_hashmap_get(g->interaction_state, j)) {
corked = (j->state == PA_SINK_INPUT_CORKED);
if (!(role = pa_proplist_gets(j->proplist, PA_PROP_MEDIA_ROLE)))
Expand Down

0 comments on commit 2a3b9d8

Please sign in to comment.