diff options
| author | Wim Taymans <wtaymans@redhat.com> | 2020-08-06 13:49:33 +0200 |
|---|---|---|
| committer | Wim Taymans <wtaymans@redhat.com> | 2020-08-06 13:49:33 +0200 |
| commit | e71936f8708aa03d6e7a8f34256d5c1ffb7e3041 (patch) | |
| tree | 84f5dec6011840fb09f3f5eb380a9aa521fa1c35 /pipewire-pulseaudio | |
| parent | 98b7dc7c0c57c7f7c0d11fd00e470dbdd0895527 (diff) | |
Improve naming
master -> driving
priority_master -> priority_driver
segment_master -> segment_owner
Diffstat (limited to 'pipewire-pulseaudio')
| -rw-r--r-- | pipewire-pulseaudio/src/context.c | 6 | ||||
| -rw-r--r-- | pipewire-pulseaudio/src/internal.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pipewire-pulseaudio/src/context.c b/pipewire-pulseaudio/src/context.c index fcab152c..4144608c 100644 --- a/pipewire-pulseaudio/src/context.c +++ b/pipewire-pulseaudio/src/context.c @@ -1089,8 +1089,8 @@ static int set_mask(pa_context *c, struct global *g) if (g->props == NULL) return 0; - if ((str = pw_properties_get(g->props, PW_KEY_PRIORITY_MASTER)) != NULL) - g->priority_master = pw_properties_parse_int(str); + if ((str = pw_properties_get(g->props, PW_KEY_PRIORITY_DRIVER)) != NULL) + g->priority_driver = pw_properties_parse_int(str); if ((str = pw_properties_get(g->props, PW_KEY_MEDIA_CLASS)) == NULL) { pw_log_debug("node %d without "PW_KEY_MEDIA_CLASS, g->id); @@ -1219,7 +1219,7 @@ static inline void insert_global(pa_context *c, struct global *global) bool found = false; spa_list_for_each(g, &c->globals, link) { - if (g->priority_master < global->priority_master) { + if (g->priority_driver < global->priority_driver) { g = spa_list_prev(g, link); found = true; break; diff --git a/pipewire-pulseaudio/src/internal.h b/pipewire-pulseaudio/src/internal.h index f7f9042f..00c79eae 100644 --- a/pipewire-pulseaudio/src/internal.h +++ b/pipewire-pulseaudio/src/internal.h @@ -250,7 +250,7 @@ struct global { pa_subscription_mask_t mask; pa_subscription_event_type_t event; - int priority_master; + int priority_driver; int pending_seq; int init:1; |