[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.15-101-g28069ef

[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  dfd6b61cd1805c9695964003f5f52a8f98920099 (commit)

- Log -----------------------------------------------------------------
28069ef core: automatically add icons for headsets/headphones/speakers for devices
-----------------------------------------------------------------------

Summary of changes:
 src/pulsecore/sink.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

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

commit 28069ef0f74089ae18cefbe7e97d2b920d7ba0cc
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed May 13 01:00:39 2009 +0200

    core: automatically add icons for headsets/headphones/speakers for devices

diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index 5ac5086..28b3440 100644
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -2197,6 +2197,21 @@ pa_bool_t pa_device_init_icon(pa_proplist *p, pa_bool_t is_sink) {
             t = "multimedia-player";
         else if (pa_streq(ff, "tv"))
             t = "video-display";
+
+        /*
+         * The following icons are not part of the icon naming spec,
+         * because Rodney Dawes sucks as the maintainer of that spec.
+         *
+         * http://lists.freedesktop.org/archives/xdg/2009-May/010397.html
+         */
+        else if (pa_streq(ff, "headset"))
+            t = "audio-headset";
+        else if (pa_streq(ff, "headphone"))
+            t = "audio-headphones";
+        else if (pa_streq(ff, "speaker"))
+            t = "audio-speakers";
+        else if (pa_streq(ff, "hands-free"))
+            t = "audio-handsfree";
     }
 
     if (!t)

-- 
hooks/post-receive
PulseAudio Sound Server