[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.15-test1-3-g3fc1233

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  9e2a2f88df45dc709ba4867b888fad948aea8e36 (commit)

- Log -----------------------------------------------------------------
3fc1233... add a .mailmap file for git shortlog
12c29e1... store the identification key in the module-stream-restore.id property
-----------------------------------------------------------------------

Summary of changes:
 .mailmap                            |    7 +++++++
 src/modules/module-stream-restore.c |   18 +++++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 .mailmap

-----------------------------------------------------------------------

commit 12c29e18329ac7928f16d613c6fbd7b94472fae8
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Feb 4 22:26:08 2009 +0100

    store the identification key in the module-stream-restore.id property

diff --git a/src/modules/module-stream-restore.c b/src/modules/module-stream-restore.c
index b1630fe..2dd2045 100644
--- a/src/modules/module-stream-restore.c
+++ b/src/modules/module-stream-restore.c
@@ -62,6 +62,7 @@ PA_MODULE_USAGE(
         "restore_muted=<Save/restore muted states?>");
 
 #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) {

commit 3fc12330627488ab7632d501e3976769275cf709
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Feb 4 22:41:45 2009 +0100

    add a .mailmap file for git shortlog

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000..0b99ec6
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,7 @@
+Diego Elio Pettenò <flameeyes at gmail.com>
+Lennart Poettering <mzfuryy at 0pointer.net>
+Lennart Poettering <lennart at poettering.net>
+Russ Dill <Russ.Dill at asu.edu>
+Russ Dill <russ.dill at gmail.com>
+Sjoerd Simons <sjoerd at luon.net>
+Sjoerd Simons <sjoerd at debian.org>

-- 
hooks/post-receive
PulseAudio Sound Server