Merge lp:~binli/unity-control-center/1291862 into lp:unity-control-center

[Bin Li]

Disable the input bar when there are no input devices.

[Sebastien Bacher (seb128)]

Thank you for the work, the change seems fine to me and it looks like it should apply to upstream GNOME (the code seems similar in https://git.gnome.org/browse/gnome-control-center/plain/panels/sound/gvc-mixer-dialog.c)

Could you forward the change to them (https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center)

It also looks like you could apply the same fix for the output as well (not sure how frequent it is to get a machine without audio ouput but it looks like it would lead to the same issue)

review: Needs Fixing

[Iain Lane (laney)]

With this patch, I noticed that if you have multiple inputs (> 1) then the slider is made insensitive when you remove one of them, meaning that you can't update the remaining input's volume.

There's a similar piece of code for adding inputs and outputs that only fires if it's the first one - it makes sense to do that check here too, and fixes that bug. You only need to consider making the slider insensitive if we are handling the removal of the last input.

I did this in lp:~laney/unity-control-center/make-insensitive-on-last-removal-only - please have a look and consider merging into this branch.

review: Needs Fixing

[lp:~binli/unity-control-center/1291862]

12753. By Bin Li on 2014-03-18

Merge Iain Lane patch to check if it's the last device

12754. By Bin Li on 2014-03-18

merge from upstream

[Bin Li (binli)]

> With this patch, I noticed that if you have multiple inputs (> 1) then the
> slider is made insensitive when you remove one of them, meaning that you can't
> update the remaining input's volume.
>
> There's a similar piece of code for adding inputs and outputs that only fires
> if it's the first one - it makes sense to do that check here too, and fixes
> that bug. You only need to consider making the slider insensitive if we are
> handling the removal of the last input.
>
> I did this in lp:~laney/unity-control-center/make-insensitive-on-last-removal-
> only - please have a look and consider merging into this branch.

Iain,

 Thanks, merged it and tested it. :)

review: Needs Resubmitting

[Bin Li (binli)]

> Thank you for the work, the change seems fine to me and it looks like it
> should apply to upstream GNOME (the code seems similar in
> https://git.gnome.org/browse/gnome-control-center/plain/panels/sound/gvc-
> mixer-dialog.c)
>
> Could you forward the change to them
> (https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center)
>
> It also looks like you could apply the same fix for the output as well (not
> sure how frequent it is to get a machine without audio ouput but it looks like
> it would lead to the same issue)
Sebastien,

 For output there should be same issue, I'll try to fix it. And the upstream have a lot of version for it, I'll compare the source code and push it into latest version.

 Thanks a lot!

[lp:~binli/unity-control-center/1291862]

12755. By Bin Li on 2014-03-18

Disable output bar when there are no output devices

12756. By Bin Li on 2014-03-18

update changelog

[Bin Li (binli)]

> Thank you for the work, the change seems fine to me and it looks like it
> should apply to upstream GNOME (the code seems similar in
> https://git.gnome.org/browse/gnome-control-center/plain/panels/sound/gvc-
> mixer-dialog.c)
>
> Could you forward the change to them
> (https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center)
>
> It also looks like you could apply the same fix for the output as well (not
> sure how frequent it is to get a machine without audio ouput but it looks like
> it would lead to the same issue)
Sebastien,

I've finished the code for output bar.

review: Needs Resubmitting

[David Henningsson (diwic)]

Looked at the code. It seems a bit weird perhaps to call active_input_update with a device that is being removed, but hey, if it solves the problem...

But at least we should probably change the g_warning ("The tree is empty => we have no devices... into a g_debug if this is in fact a supported and expected scenario.

(Same for output)

[lp:~binli/unity-control-center/1291862]

12757. By Bin Li on 2014-03-18

change g_warning to g_debug cause we have a supported and expected scenario.

[Bin Li (binli)]

> Looked at the code. It seems a bit weird perhaps to call active_input_update
> with a device that is being removed, but hey, if it solves the problem...
>
> But at least we should probably change the g_warning ("The tree is empty => we
> have no devices... into a g_debug if this is in fact a supported and expected
> scenario.
>
> (Same for output)
David,

 Thanks for your review. I've resubmitted again. :)

[Iain Lane (laney)]

Thanks, it looks good now and works for me.

Please forward the change to GNOME, as Seb suggested earlier.

review: Approve

[Bin Li (binli)]

> Thanks, it looks good now and works for me.
>
> Please forward the change to GNOME, as Seb suggested earlier.
Done for it.
https://bugzilla.gnome.org/show_bug.cgi?id=726686

=== modified file 'debian/changelog'
--- debian/changelog	2014-03-17 13:46:59 +0000
+++ debian/changelog	2014-03-18 08:35:41 +0000
@@ -1,3 +1,9 @@
+unity-control-center (14.04.3+14.04.20140317-0ubuntu2) trusty; urgency=low
+
+  * Disable the input/output bar when no input/output devices (LP: #1291862)
+
+ -- Bin Li <[e-mail]>  Mon, 18 Mar 2014 12:11:03 +0800
+
 unity-control-center (14.04.3+14.04.20140317-0ubuntu1) trusty; urgency=low
 
   [ Robert Ancell ]
 
=== modified file 'panels/sound/gvc-mixer-dialog.c'
--- panels/sound/gvc-mixer-dialog.c	2014-03-14 14:46:32 +0000
+++ panels/sound/gvc-mixer-dialog.c	2014-03-18 08:35:41 +0000
@@ -727,7 +727,11 @@
         model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->priv->input_treeview));
 
         if (gtk_tree_model_get_iter_first (model, &iter) == FALSE){
-                g_warning ("The tree is empty => we have no devices so cannot set the active input");
+                /* When there are no device we need disable the input bar and set the original name */
+                gtk_label_set_label (GTK_LABEL(dialog->priv->selected_input_label),
+                                     _("Settings for the selected device"));
+                gtk_widget_set_sensitive (dialog->priv->input_bar, FALSE);
+                g_debug ("The tree is empty => we have no devices so cannot set the active input");
                 return;        
         }
         
@@ -850,7 +854,11 @@
         model = gtk_tree_view_get_model (GTK_TREE_VIEW (dialog->priv->output_treeview));
 
         if (gtk_tree_model_get_iter_first (model, &iter) == FALSE){
-                g_warning ("The tree is empty => we have no devices in the tree => cannot set the active output");
+                /* When there are no device we need disable the output bar and set the original name */
+                gtk_label_set_label (GTK_LABEL(dialog->priv->selected_output_label),
+                                     _("Settings for the selected device"));
+                gtk_widget_set_sensitive (dialog->priv->output_bar, FALSE);
+                g_debug ("The tree is empty => we have no devices in the tree => cannot set the active output");
                 return;        
         }
         
@@ -1398,6 +1406,7 @@
                            GvcMixerDialog  *dialog)
 {
         GtkWidget    *bar;
+        gboolean      is_last_device;
         gboolean      found;
         GtkTreeIter   iter;
         GtkTreeModel *model;
@@ -1421,6 +1430,11 @@
         if (found) {
                 gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
         }
+
+        /* Disable output bar when all output devices removed */
+        is_last_device = !gtk_tree_model_get_iter_first (model, &iter);
+        if (is_last_device)
+                active_output_update (dialog, out);
 }     
 
 
@@ -1432,6 +1446,7 @@
 {
         GtkWidget    *bar;
         gboolean      found;
+        gboolean      is_last_device;
         GtkTreeIter   iter;
         GtkTreeModel *model;
 
@@ -1454,6 +1469,11 @@
         if (found) {
                 gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
         }        
+
+        /* Disable input bar when all input devices removed */
+        is_last_device = !gtk_tree_model_get_iter_first (model, &iter);
+        if (is_last_device)
+                active_input_update (dialog, in);
 }
 
 static void