From 12c29e18329ac7928f16d613c6fbd7b94472fae8 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 4 Feb 2009 22:26:08 +0100 Subject: store the identification key in the module-stream-restore.id property --- src/modules/module-stream-restore.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'src/modules') diff --git a/src/modules/module-stream-restore.c b/src/modules/module-stream-restore.c index b1630fe1..2dd2045e 100644 --- a/src/modules/module-stream-restore.c +++ b/src/modules/module-stream-restore.c @@ -62,6 +62,7 @@ PA_MODULE_USAGE( "restore_muted="); #define SAVE_INTERVAL 10 +#define IDENTIFICATION_PROPERTY "module-stream-restore.id" static const char* const valid_modargs[] = { "restore_device", @@ -129,20 +130,27 @@ static void save_time_callback(pa_mainloop_api*a, pa_time_event* e, const struct static char *get_name(pa_proplist *p, const char *prefix) { const char *r; + char *t; if (!p) return NULL; + if ((r = pa_proplist_gets(p, IDENTIFICATION_PROPERTY))) + return pa_xstrdup(r); + if ((r = pa_proplist_gets(p, PA_PROP_MEDIA_ROLE))) - return pa_sprintf_malloc("%s-by-media-role:%s", prefix, r); + t = pa_sprintf_malloc("%s-by-media-role:%s", prefix, r); else if ((r = pa_proplist_gets(p, PA_PROP_APPLICATION_ID))) - return pa_sprintf_malloc("%s-by-application-id:%s", prefix, r); + t = pa_sprintf_malloc("%s-by-application-id:%s", prefix, r); else if ((r = pa_proplist_gets(p, PA_PROP_APPLICATION_NAME))) - return pa_sprintf_malloc("%s-by-application-name:%s", prefix, r); + t = pa_sprintf_malloc("%s-by-application-name:%s", prefix, r); else if ((r = pa_proplist_gets(p, PA_PROP_MEDIA_NAME))) - return pa_sprintf_malloc("%s-by-media-name:%s", prefix, r); + t = pa_sprintf_malloc("%s-by-media-name:%s", prefix, r); + else + t = pa_sprintf_malloc("%s-fallback:%s", prefix, r); - return pa_sprintf_malloc("%s-fallback:%s", prefix, r); + pa_proplist_sets(p, IDENTIFICATION_PROPERTY, t); + return t; } static struct entry* read_entry(struct userdata *u, const char *name) { -- cgit