gnome-media r4177 - in trunk/gnome-volume-control: . src

[hadess svn gnome org]

Author: hadess
Date: Tue Feb 10 16:14:21 2009
New Revision: 4177
URL: http://svn.gnome.org/viewvc/gnome-media?rev=4177&view=rev

Log:
2009-02-10  Bastien Nocera  <hadess hadess net>

	* src/gvc-mixer-control.c (update_source_output):
	* src/gvc-mixer-dialog.c (add_stream): Show recording applications
	in addition to playback applications, use the microphone icon
	for those applications (Closes: #568900)



Modified:
   trunk/gnome-volume-control/ChangeLog
   trunk/gnome-volume-control/src/gvc-mixer-control.c
   trunk/gnome-volume-control/src/gvc-mixer-dialog.c

Modified: trunk/gnome-volume-control/src/gvc-mixer-control.c
==============================================================================
--- trunk/gnome-volume-control/src/gvc-mixer-control.c	(original)
+++ trunk/gnome-volume-control/src/gvc-mixer-control.c	Tue Feb 10 16:14:21 2009
@@ -777,7 +777,7 @@
         gvc_mixer_stream_set_description (stream, info->name);
         set_application_id_from_proplist (stream, info->proplist);
         set_is_event_stream_from_proplist (stream, info->proplist);
-        set_icon_name_from_proplist (stream, info->proplist, "applications-multimedia");
+        set_icon_name_from_proplist (stream, info->proplist, "audio-input-microphone");
 
         if (is_new) {
                 g_hash_table_insert (control->priv->source_outputs,

Modified: trunk/gnome-volume-control/src/gvc-mixer-dialog.c
==============================================================================
--- trunk/gnome-volume-control/src/gvc-mixer-dialog.c	(original)
+++ trunk/gnome-volume-control/src/gvc-mixer-dialog.c	Tue Feb 10 16:14:21 2009
@@ -643,11 +643,13 @@
         gboolean       is_muted;
         gboolean       is_default;
         GtkAdjustment *adj;
+        const char    *id;
 
         g_assert (stream != NULL);
 
         bar = NULL;
         is_default = FALSE;
+        id = gvc_mixer_stream_get_application_id (stream);
 
         if (stream == gvc_mixer_control_get_default_sink (dialog->priv->mixer_control)) {
                 bar = dialog->priv->output_bar;
@@ -667,8 +669,9 @@
                 g_debug ("Adding effects stream");
         } else if (! GVC_IS_MIXER_SOURCE (stream)
                    && !GVC_IS_MIXER_SINK (stream)
-                   && !GVC_IS_MIXER_SOURCE_OUTPUT (stream)
-                   && !gvc_mixer_stream_is_event_stream (stream)) {
+                   && !gvc_mixer_stream_is_event_stream (stream)
+                   && g_strcmp0 (id, "org.gnome.VolumeControl") != 0
+                   && g_strcmp0 (id, "org.PulseAudio.pavucontrol") != 0) {
                 bar = create_bar (dialog, dialog->priv->apps_size_group, FALSE);
                 gvc_channel_bar_set_name (GVC_CHANNEL_BAR (bar),
                                           gvc_mixer_stream_get_name (stream));