Merge lp:~diwic/gnome-control-center/expose-card-ports into lp:~cjcurran/gnome-control-center/expose-card-ports

[David Henningsson]

[Conor Curran (cjcurran)]

Looking good !

review: Approve

[lp:~diwic/gnome-control-center/expose-card-ports]

275. By David Henningsson on 2012-02-03

Fix speaker testing for devices without cards

[Conor Curran (cjcurran)]

Merged manually - quilt is acting the ...

=== modified file 'panels/sound/gvc-mixer-control.c'
--- panels/sound/gvc-mixer-control.c	2012-02-02 22:12:25 +0000
+++ panels/sound/gvc-mixer-control.c	2012-02-03 15:13:21 +0000
@@ -582,9 +582,9 @@
 
 
 /**
- * gvc_mixer_control_change_output:
+ * gvc_mixer_control_change_input:
  * @control:
- * @output:
+ * @input:
  */                                                
 void
 gvc_mixer_control_change_input (GvcMixerControl *control,
@@ -620,6 +620,23 @@
                 return;
         }
 
+        // Handle a network sink => a portless/cardless device
+        if (gvc_mixer_ui_device_get_port (input) == NULL){
+                g_print ("Did we try to move to a network source ? \n");
+                if (gvc_mixer_control_set_default_source (control, stream)) {
+                        // source change successfull => update the UI.
+                        g_signal_emit (G_OBJECT (control),
+                                       signals[ACTIVE_INPUT_UPDATE],
+                                       0,
+                                       gvc_mixer_ui_device_get_id (input));             
+                }
+                else{
+                        g_warning ("Failed to set default source with stream from input %s \n",
+                                   gvc_mixer_ui_device_get_description (input));
+                }
+                return;
+        }
+
         const GvcMixerStreamPort* active_port = gvc_mixer_stream_get_port (stream);
         const gchar* input_port = gvc_mixer_ui_device_get_port (input);
         // First ensure the correct port is active on the sink
@@ -1197,7 +1214,7 @@
 
 static void
 sync_devices (GvcMixerControl *control,
-	      GvcMixerStream* stream)
+	      GvcMixerStream* stream, int is_output)
 {
 
 	// Go through ports to see what outputs can be created.
@@ -1208,22 +1225,22 @@
 	gint stream_port_count = 0;
 		
         if (g_list_length (stream_ports) == 0){                       
-                g_print (" \n \n !!! Just found a sink without ports - creating an output \n");
+                g_print (" \n \n !!! Just found a %s without ports - creating a UI device \n", is_output ? "sink" : "source");
                 GObject *object;
                 object = g_object_new (GVC_TYPE_MIXER_UI_DEVICE,
                                        "stream-id", (gint)gvc_mixer_stream_get_id (stream),
                                        "description", gvc_mixer_stream_get_description (stream),
-                                       "origin", gvc_mixer_stream_get_name (stream),
+                                       "origin", "", /* gvc_mixer_stream_get_name (stream), */
                                        "port-name", NULL,
                                        "port-available", TRUE,
                                        NULL);
                 GvcMixerUIDevice* out = GVC_MIXER_UI_DEVICE (object);
-                g_hash_table_insert (control->priv->ui_outputs,
+                g_hash_table_insert (is_output ? control->priv->ui_outputs : control->priv->ui_inputs,
                                      GUINT_TO_POINTER (gvc_mixer_ui_device_get_id (out)),
                                      g_object_ref (out));
                                 
                 g_signal_emit (G_OBJECT (control),
-                               signals[OUTPUT_ADDED],
+                               signals[is_output ? OUTPUT_ADDED : INPUT_ADDED],
                                0,
                                gvc_mixer_ui_device_get_id (out));
                 return;
@@ -1397,7 +1414,7 @@
                 add_stream (control, stream);
                 // Always sink on a new stream to able to assign the right stream id 
                 // to the appropriate outputs (=>multiple potential outputs per stream).
-                sync_devices (control, stream);	
+                sync_devices (control, stream, TRUE);	
         }
 
 
@@ -1533,7 +1550,7 @@
                                      g_object_ref (stream));
                 add_stream (control, stream);
 
-                sync_devices (control, stream);
+                sync_devices (control, stream, FALSE);
         }
 
         if (control->priv->default_source_name != NULL

=== modified file 'panels/sound/gvc-mixer-dialog.c'
--- panels/sound/gvc-mixer-dialog.c	2012-02-01 19:58:09 +0000
+++ panels/sound/gvc-mixer-dialog.c	2012-02-03 15:13:21 +0000
@@ -1129,18 +1129,17 @@
         GIcon               *icon;
 
         if (card_id == GVC_MIXER_UI_DEVICE_INVALID) {
+                GvcMixerStream *stream;
                 g_print ("just detected a network source");
-                /*GvcMixerStream *stream;
-                stream = gvc_mixer_control_get_stream_from_device (dialog->priv->mixer_control, output);
+                stream = gvc_mixer_control_get_stream_from_device (dialog->priv->mixer_control, input);
                 if (stream == NULL) {
-                        g_warning ("tried to add the network sink but the stream was null - fail ?!");
-                        g_free (sink_port_name);                                        
-                        g_free (origin);                                                        
-                        g_free (description);                                           
+                        g_warning ("tried to add the network source but the stream was null - fail ?!");
+                        g_free (port_name);					
+                        g_free (origin);							
+                        g_free (description);		  				
                         return;
                 }
-                icon = gvc_mixer_stream_get_gicon (stream);*/
-                return;
+                icon = gvc_mixer_stream_get_gicon (stream);			
         }
         else{
                 GvcMixerCard        *card;
@@ -1617,28 +1616,31 @@
 
         GvcMixerUIDevice *output;
         output = gvc_mixer_control_lookup_output_id (dialog->priv->mixer_control, (guint)active_output);
-        gint card_id;
-        
-        g_object_get (G_OBJECT (output), "card-id", &card_id, NULL);
+        gint stream_id = gvc_mixer_ui_device_get_stream_id(output);
 
-        if (card_id == GVC_MIXER_UI_DEVICE_INVALID)
+        if (stream_id == GVC_MIXER_UI_DEVICE_INVALID)
                 return;
 
         g_print ("Test the speakers on the %s", gvc_mixer_ui_device_get_description (output));
         
-        GvcMixerCard        *card;
+        GvcMixerStream        *stream;
         GvcMixerCardProfile *profile;
         GtkWidget           *d, *speaker_test, *container;
         char                *title;
 
-        card = gvc_mixer_control_lookup_card_id (dialog->priv->mixer_control, card_id);
+        stream = gvc_mixer_control_lookup_stream_id (dialog->priv->mixer_control, stream_id);
+        if (stream == NULL) {
+                g_print ("Stream/sink not found");
+                return;
+        }
+/*        card = gvc_mixer_control_lookup_card_id (dialog->priv->mixer_control, card_id);
 
         profile = gvc_mixer_card_get_profile (card);
 
         g_debug ("XXX Start speaker testing for profile '%s', card %s XXX",
                  profile->profile, gvc_mixer_card_get_name (card));
-
-        title = g_strdup_printf (_("Speaker Testing for %s"), gvc_mixer_card_get_name (card));
+*/
+        title = g_strdup_printf (_("Speaker Testing for %s"), gvc_mixer_ui_device_get_description (output));
         d = gtk_dialog_new_with_buttons (title,
                                          GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (widget))),
                                          GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -1648,7 +1650,7 @@
 
         g_free (title);
         speaker_test = gvc_speaker_test_new (dialog->priv->mixer_control,
-                                             card);
+                                             stream);
         gtk_widget_show (speaker_test);
         container = gtk_dialog_get_content_area (GTK_DIALOG (d));
         gtk_container_add (GTK_CONTAINER (container), speaker_test);

=== modified file 'panels/sound/gvc-speaker-test.c'
--- panels/sound/gvc-speaker-test.c	2011-08-18 12:14:03 +0000
+++ panels/sound/gvc-speaker-test.c	2012-02-03 15:13:21 +0000
@@ -33,7 +33,7 @@
 
 #include "gvc-speaker-test.h"
 #include "gvc-mixer-stream.h"
-#include "gvc-mixer-card.h"
+/* #include "gvc-mixer-card.h" */
 
 #define GVC_SPEAKER_TEST_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GVC_TYPE_SPEAKER_TEST, GvcSpeakerTestPrivate))
 
@@ -41,7 +41,7 @@
 {
         GtkWidget       *channel_controls[PA_CHANNEL_POSITION_MAX];
         ca_context      *canberra;
-        GvcMixerCard    *card;
+        GvcMixerStream  *stream;
         GvcMixerControl *control;
 };
 
@@ -53,7 +53,7 @@
 
 enum {
         PROP_0,
-        PROP_CARD,
+        PROP_STREAM,
         PROP_CONTROL
 };
 
@@ -89,14 +89,14 @@
         GvcSpeakerTest *self = GVC_SPEAKER_TEST (object);
 
         switch (prop_id) {
-        case PROP_CARD:
-                self->priv->card = g_value_dup_object (value);
+        case PROP_STREAM:
+                self->priv->stream = g_value_dup_object (value);
                 if (self->priv->control != NULL)
                         update_channel_map (self);
                 break;
         case PROP_CONTROL:
                 self->priv->control = g_value_dup_object (value);
-                if (self->priv->card != NULL)
+                if (self->priv->stream != NULL)
                         update_channel_map (self);
                 break;
         default:
@@ -114,8 +114,8 @@
         GvcSpeakerTest *self = GVC_SPEAKER_TEST (object);
 
         switch (prop_id) {
-        case PROP_CARD:
-                g_value_set_object (value, self->priv->card);
+        case PROP_STREAM:
+                g_value_set_object (value, self->priv->stream);
                 break;
         case PROP_CONTROL:
                 g_value_set_object (value, self->priv->control);
@@ -136,11 +136,11 @@
         object_class->get_property = gvc_speaker_test_get_property;
 
         g_object_class_install_property (object_class,
-                                         PROP_CARD,
-                                         g_param_spec_object ("card",
-                                                              "card",
-                                                              "The card",
-                                                              GVC_TYPE_MIXER_CARD,
+                                         PROP_STREAM,
+                                         g_param_spec_object ("stream",
+                                                              "stream",
+                                                              "The stream",
+                                                              GVC_TYPE_MIXER_STREAM,
                                                               G_PARAM_READWRITE|G_PARAM_CONSTRUCT));
         g_object_class_install_property (object_class,
                                          PROP_CONTROL,
@@ -366,6 +366,7 @@
         }
 }
 
+#if 0
 static const GvcChannelMap *
 get_channel_map_for_card (GvcMixerControl *control,
                           GvcMixerCard    *card,
@@ -408,6 +409,7 @@
 
         return map;
 }
+#endif
 
 static void
 update_channel_map (GvcSpeakerTest *speaker_test)
@@ -417,17 +419,20 @@
         char *output_name;
 
         g_return_if_fail (speaker_test->priv->control != NULL);
-        g_return_if_fail (speaker_test->priv->card != NULL);
+        g_return_if_fail (speaker_test->priv->stream != NULL);
 
         g_debug ("XXX update_channel_map called XXX");
 
-        map = get_channel_map_for_card (speaker_test->priv->control,
-                                        speaker_test->priv->card,
+        map = gvc_mixer_stream_get_channel_map (speaker_test->priv->stream);
+/*
+        map = get_channel_map_for_stream (speaker_test->priv->control,
+                                        speaker_test->priv->stream,
                                         &output_name);
-
+*/
         g_return_if_fail (map != NULL);
 
-        ca_context_change_device (speaker_test->priv->canberra, output_name);
+        ca_context_change_device (speaker_test->priv->canberra, 
+                                  gvc_mixer_stream_get_name (speaker_test->priv->stream));
         g_free (output_name);
 
         for (i = 0; i < G_N_ELEMENTS (position_table); i += 3) {
@@ -495,8 +500,8 @@
 
         g_return_if_fail (speaker_test->priv != NULL);
 
-        g_object_unref (speaker_test->priv->card);
-        speaker_test->priv->card = NULL;
+        g_object_unref (speaker_test->priv->stream);
+        speaker_test->priv->stream = NULL;
 
         g_object_unref (speaker_test->priv->control);
         speaker_test->priv->control = NULL;
@@ -509,15 +514,15 @@
 
 GtkWidget *
 gvc_speaker_test_new (GvcMixerControl *control,
-                      GvcMixerCard *card)
+                      GvcMixerStream *stream)
 {
         GObject *speaker_test;
 
-        g_return_val_if_fail (card != NULL, NULL);
+        g_return_val_if_fail (stream != NULL, NULL);
         g_return_val_if_fail (control != NULL, NULL);
 
         speaker_test = g_object_new (GVC_TYPE_SPEAKER_TEST,
-                                  "card", card,
+                                  "stream", stream,
                                   "control", control,
                                   NULL);
 

=== modified file 'panels/sound/gvc-speaker-test.h'
--- panels/sound/gvc-speaker-test.h	2011-05-17 10:47:27 +0000
+++ panels/sound/gvc-speaker-test.h	2012-02-03 15:13:21 +0000
@@ -50,7 +50,7 @@
 GType               gvc_speaker_test_get_type            (void);
 
 GtkWidget *         gvc_speaker_test_new                 (GvcMixerControl *control,
-                                                          GvcMixerCard *card);
+                                                          GvcMixerStream *stream);
 
 G_END_DECLS