Merge lp:~cjcurran/gnome-control-center/fix-profiles into lp:~ken-vandine/gnome-control-center/make-new-panel

[Conor Curran]

ensure device swapping honours supported profiles

[Conor Curran (cjcurran)]

review: Approve

=== modified file 'panels/sound-nua/gvc-mixer-control.c'
--- panels/sound-nua/gvc-mixer-control.c	2012-02-03 17:15:47 +0000
+++ panels/sound-nua/gvc-mixer-control.c	2012-02-06 14:48:21 +0000
@@ -519,7 +519,7 @@
                         return;
                 }
                 const GList *profiles;
-                profiles = gvc_mixer_ui_device_get_profiles (output);
+                profiles = gvc_mixer_ui_device_get_supported_profiles (output);
                 GList *last;
                 last = g_list_last (profiles);
                 GvcMixerCardProfile *profile;
@@ -605,7 +605,7 @@
                 }
 
                 const GList *profiles;
-                profiles = gvc_mixer_ui_device_get_profiles (input);
+                profiles = gvc_mixer_ui_device_get_supported_profiles (input);
                 GList *last;
                 last = g_list_last (profiles);
                 GvcMixerCardProfile *profile;

=== modified file 'panels/sound-nua/gvc-mixer-dialog.c'
--- panels/sound-nua/gvc-mixer-dialog.c	2012-02-03 17:15:47 +0000
+++ panels/sound-nua/gvc-mixer-dialog.c	2012-02-06 14:48:21 +0000
@@ -877,9 +877,23 @@
                 gvc_combo_box_set_profiles (GVC_COMBO_BOX (dialog->priv->output_port_combo),
                                             profiles);
                                 
-                gvc_combo_box_set_active (GVC_COMBO_BOX (dialog->priv->output_port_combo), 
-                                          gvc_mixer_control_get_active_profile_from_ui_device (dialog->priv->mixer_control,
+                gboolean disabled;
+                disabled = gvc_mixer_ui_device_determine_profile_sensitivity (active_output);
+
+                if (disabled){
+                        GList *profs;
+                        GvcMixerCardProfile *p;
+                        profs = gvc_mixer_ui_device_get_profiles (active_output);
+                        // We can be sure that its just one profile in the list when it's disabled
+                        p = g_list_last (profs)->data;
+                        gvc_combo_box_set_active (GVC_COMBO_BOX (dialog->priv->output_port_combo), 
+                                                                 p->profile);                        
+                }
+                else{
+                        gvc_combo_box_set_active (GVC_COMBO_BOX (dialog->priv->output_port_combo), 
+                                                  gvc_mixer_control_get_active_profile_from_ui_device (dialog->priv->mixer_control,
                                                                                                active_output));
+                }
                 g_object_set_data (G_OBJECT (dialog->priv->output_port_combo),
                                    "uidevice",
                                    active_output);
@@ -896,7 +910,7 @@
                 }
                 gtk_widget_show (dialog->priv->output_port_combo);                
                 gtk_widget_set_sensitive (dialog->priv->output_port_combo, 
-                                           !gvc_mixer_ui_device_determine_profile_sensitivity (active_output));
+                                           !disabled);
         }
 
 }

=== modified file 'panels/sound-nua/gvc-mixer-ui-device.c'
--- panels/sound-nua/gvc-mixer-ui-device.c	2012-02-03 17:15:47 +0000
+++ panels/sound-nua/gvc-mixer-ui-device.c	2012-02-06 14:48:21 +0000
@@ -34,7 +34,7 @@
 	gint	     		stream_id;
 	guint	     		id;
 	gboolean     		port_available;
-	//GList*       		profiles;
+	GList*       		supported_profiles;
 	UiDeviceDirection 	type;	
 	GHashTable* 		profiles;	
 	gboolean 		disable_profile_swapping;
@@ -309,12 +309,6 @@
 	g_type_class_add_private (klass, sizeof (GvcMixerUIDevicePrivate));					 				
 }
 
-static void
-tidy_profiles (GvcMixerUIDevice *device)
-{
-	
-}
-
 // TODO
 // Optimise so as on the first pass you can 'choose' which profiles to hold on to which are essentially duplicates
 void
@@ -323,12 +317,14 @@
 	gint profile_count;
 	GList* t;
 	GHashTable *profile_descriptions;
-	
+
+	device->priv->supported_profiles = in_profiles;
+		
 	profile_count = g_list_length (in_profiles);
 	profile_descriptions = g_hash_table_new_full (g_str_hash,
-	 					      g_str_equal,
-	 					      g_free,
-	 					      g_free);
+						 					      g_str_equal,
+						 					      g_free,
+						 					      g_free);
 
 	//debug
 	gboolean is_input = device->priv->type != UiDeviceOutput;
@@ -518,6 +514,12 @@
 	return g_hash_table_get_values (device->priv->profiles); 
 }
 
+GList*
+gvc_mixer_ui_device_get_supported_profiles (GvcMixerUIDevice *device)
+{
+	return device->priv->supported_profiles;
+}
+
 guint
 gvc_mixer_ui_device_get_id (GvcMixerUIDevice *op)
 {

=== modified file 'panels/sound-nua/gvc-mixer-ui-device.h'
--- panels/sound-nua/gvc-mixer-ui-device.h	2012-02-03 18:56:29 +0000
+++ panels/sound-nua/gvc-mixer-ui-device.h	2012-02-06 14:48:21 +0000
@@ -53,14 +53,15 @@
 
 GType gvc_mixer_ui_device_get_type (void) G_GNUC_CONST;
 
-guint       			gvc_mixer_ui_device_get_id                   		(GvcMixerUIDevice *op);
-gint        			gvc_mixer_ui_device_get_stream_id            		(GvcMixerUIDevice *op);
-const gchar*			gvc_mixer_ui_device_get_description          		(GvcMixerUIDevice *op);
-const gchar*			gvc_mixer_ui_device_get_origin				 		(GvcMixerUIDevice *op);
-const gchar*			gvc_mixer_ui_device_get_port				 		(GvcMixerUIDevice *op);
-GList*					gvc_mixer_ui_device_get_profiles 			 		(GvcMixerUIDevice *op);
+guint       			gvc_mixer_ui_device_get_id                   		(GvcMixerUIDevice *dev);
+gint        			gvc_mixer_ui_device_get_stream_id            		(GvcMixerUIDevice *dev);
+const gchar*			gvc_mixer_ui_device_get_description          		(GvcMixerUIDevice *dev);
+const gchar*			gvc_mixer_ui_device_get_origin				 		(GvcMixerUIDevice *dev);
+const gchar*			gvc_mixer_ui_device_get_port				 		(GvcMixerUIDevice *dev);
+GList*					gvc_mixer_ui_device_get_profiles 			 		(GvcMixerUIDevice *dev);
+GList*					gvc_mixer_ui_device_get_supported_profiles			(GvcMixerUIDevice *device);
 gboolean	    		gvc_mixer_ui_device_determine_profile_sensitivity 	(GvcMixerUIDevice *device);
-void					gvc_mixer_ui_device_set_profiles			 		(GvcMixerUIDevice *op, GList *profiles);
+void					gvc_mixer_ui_device_set_profiles			 		(GvcMixerUIDevice *device, GList *profiles);
 void					gvc_mixer_ui_device_invalidate_stream		 		(GvcMixerUIDevice *dev);
 gboolean				gvc_mixer_ui_device_is_software_stream		 		(GvcMixerUIDevice *dev);
 gboolean				gvc_mixer_ui_device_change_profile 					(GvcMixerUIDevice *device, const gchar* profile);