Merge lp:~gero-bare/wingpanel-indicator-sound/fix-1078143 into lp:~wingpanel-devs/wingpanel-indicator-sound/trunk

[Gero.Bare]

Enable the indicator to change sound level for the Greeter/lock-screen

first you should whitelist it

Edit:
    /etc/wingpanel.d/pantheon-greeter.whitelist

add the line:

libsound.so

[lp:~gero-bare/wingpanel-indicator-sound/fix-1078143]

83. By Gero.Bare on 2016-04-06

Enable indicator for non-SESSION server type displays. Greeter.

[Zisu Andrei (matzipan)]

I'm failing to see the use of this as long as sound is disabled while locked.

Unmerged revisions

83. By Gero.Bare on 2016-04-06

Enable indicator for non-SESSION server type displays. Greeter.

=== modified file 'src/Indicator.vala'
--- src/Indicator.vala	2016-01-16 16:15:16 +0000
+++ src/Indicator.vala	2016-04-06 04:26:58 +0000
@@ -33,12 +33,16 @@
 
     private Wingpanel.Widgets.Separator first_seperator;
 
+    private Wingpanel.Widgets.Separator volume_seperator;
+
     private Wingpanel.Widgets.Separator mic_seperator;
 
     private Notify.Notification notification;
 
     private Services.Settings settings;
 
+    private Wingpanel.IndicatorManager.ServerType server_type;
+
     bool open = false;
     bool mute_blocks_sound = false;
     uint sound_was_blocked_timeout_id;
@@ -48,7 +52,7 @@
 
     unowned Canberra.Context? ca_context = null;
 
-    public Indicator () {
+    public Indicator (Wingpanel.IndicatorManager.ServerType server_type) {
         Object (code_name: Wingpanel.Indicator.SOUND,
                 display_name: _("Indicator Sound"),
                 description:_("The sound indicator"));
@@ -66,6 +70,8 @@
 
         this.settings = new Services.Settings ();
         settings.notify["max-volume"].connect (set_max_volume);
+
+        this.server_type = server_type;
     }
 
     construct {
@@ -157,6 +163,15 @@
             mic_seperator.no_show_all = false;
             mic_seperator.show ();
         } else {
+
+            if (this.server_type == Wingpanel.IndicatorManager.ServerType.SESSION) {
+                volume_seperator.no_show_all = false;
+                volume_seperator.show ();
+            } else {
+                volume_seperator.no_show_all = true;
+                volume_seperator.hide ();
+            }
+
             mic_scale.no_show_all = true;
             mic_scale.hide();
             mic_seperator.no_show_all = true;
@@ -266,9 +281,13 @@
     }
 
     public override Gtk.Widget? get_widget () {
-        if (main_grid == null) {
-            int position = 0;
-            main_grid = new Gtk.Grid ();
+        if (main_grid != null)
+            return main_grid;
+   
+        int position = 0;
+        main_grid = new Gtk.Grid ();
+
+        if (this.server_type == Wingpanel.IndicatorManager.ServerType.SESSION) {
 
             var mpris = new Widgets.MprisWidget (settings);
 
@@ -276,8 +295,8 @@
                 close ();
             });
             volume_control.notify["headphone-plugged"].connect(() => {
-                if (!volume_control.headphone_plugged)
-                    mpris.pause_all ();
+            if (!volume_control.headphone_plugged)
+                mpris.pause_all ();
             });
 
             main_grid.attach (mpris, 0, position++, 1, 1);
@@ -285,66 +304,70 @@
             first_seperator = new Wingpanel.Widgets.Separator ();
 
             main_grid.attach (first_seperator, 0, position++, 1, 1);
-
-            volume_scale.margin_start = 6;
-            volume_scale.get_switch ().active = !volume_control.mute;
-            volume_scale.get_switch ().notify["active"].connect (on_volume_switch_change);
-
-            volume_scale.get_scale ().value_changed.connect (() => {
-                var vol = new Services.VolumeControl.Volume();
-                var v = volume_scale.get_scale ().get_value () * this.max_volume;
-                vol.volume = v.clamp (0.0, this.max_volume);
-                vol.reason = Services.VolumeControl.VolumeReasons.USER_KEYPRESS;
-                this.volume_control.volume = vol;
-                update_volume_icon ();
-            });
-
-            volume_scale.get_scale ().set_value (volume_control.volume.volume);
-            volume_scale.get_scale ().button_release_event.connect ((e) => {
+        }
+
+
+        volume_scale.margin_start = 6;
+        volume_scale.get_switch ().active = !volume_control.mute;
+        volume_scale.get_switch ().notify["active"].connect (on_volume_switch_change);
+
+        volume_scale.get_scale ().value_changed.connect (() => {
+            var vol = new Services.VolumeControl.Volume();
+            var v = volume_scale.get_scale ().get_value () * this.max_volume;
+            vol.volume = v.clamp (0.0, this.max_volume);
+            vol.reason = Services.VolumeControl.VolumeReasons.USER_KEYPRESS;
+            this.volume_control.volume = vol;
+            update_volume_icon ();
+        });
+
+        volume_scale.get_scale ().set_value (volume_control.volume.volume);
+        volume_scale.get_scale ().button_release_event.connect ((e) => {
+            play_sound_blubble ();
+            return false;
+        });
+        volume_scale.get_scale ().scroll_event.connect ((e) => {
+            int dir = 0;
+            if (e.direction == Gdk.ScrollDirection.UP || e.direction == Gdk.ScrollDirection.RIGHT ||
+                (e.direction == Gdk.ScrollDirection.SMOOTH && e.delta_y < 0)) {
+                dir = 1;
+            } else if (e.direction == Gdk.ScrollDirection.DOWN || e.direction == Gdk.ScrollDirection.LEFT ||
+                (e.direction == Gdk.ScrollDirection.SMOOTH && e.delta_y > 0)) {
+                dir = -1;
+            }
+
+            double v = volume_scale.get_scale ().get_value ();
+            v = v + volume_step_percentage * dir;
+
+            if (v >= -0.05 && v <= 1.05) {
+                volume_scale.get_scale ().set_value (v);
                 play_sound_blubble ();
-                return false;
-            });
-            volume_scale.get_scale ().scroll_event.connect ((e) => {
-                int dir = 0;
-                if (e.direction == Gdk.ScrollDirection.UP || e.direction == Gdk.ScrollDirection.RIGHT ||
-                    (e.direction == Gdk.ScrollDirection.SMOOTH && e.delta_y < 0)) {
-                    dir = 1;
-                } else if (e.direction == Gdk.ScrollDirection.DOWN || e.direction == Gdk.ScrollDirection.LEFT ||
-                    (e.direction == Gdk.ScrollDirection.SMOOTH && e.delta_y > 0)) {
-                    dir = -1;
-                }
-
-                double v = volume_scale.get_scale ().get_value ();
-                v = v + volume_step_percentage * dir;
-
-                if (v >= -0.05 && v <= 1.05) {
-                    volume_scale.get_scale ().set_value (v);
-                    play_sound_blubble ();
-                }
-                return true;
-            });
-
-            update_volume_icon ();
-            set_max_volume ();
-
-            main_grid.attach (volume_scale, 0, position++, 1, 1);
-
-            main_grid.attach (new Wingpanel.Widgets.Separator (), 0, position++, 1, 1);
-
-            mic_scale.margin_start = 6;
-            mic_scale.get_switch ().active = !volume_control.micMute;
-            mic_scale.get_switch ().notify["active"].connect (on_mic_switch_change);
-
-            mic_scale.get_scale ().value_changed.connect (() => {
-                volume_control.mic_volume = mic_scale.get_scale ().get_value ();
-            });
-
-            main_grid.attach (mic_scale, 0, position++, 1, 1);
-
-            mic_seperator = new Wingpanel.Widgets.Separator ();
-
-            update_mic_visibility ();
-
+            }
+            return true;
+        });
+
+        update_volume_icon ();
+        set_max_volume ();
+
+        main_grid.attach (volume_scale, 0, position++, 1, 1);
+
+        volume_seperator = new Wingpanel.Widgets.Separator ();
+        main_grid.attach (volume_seperator, 0, position++, 1, 1);
+
+        mic_scale.margin_start = 6;
+        mic_scale.get_switch ().active = !volume_control.micMute;
+        mic_scale.get_switch ().notify["active"].connect (on_mic_switch_change);
+
+        mic_scale.get_scale ().value_changed.connect (() => {
+            volume_control.mic_volume = mic_scale.get_scale ().get_value ();
+        });
+
+        main_grid.attach (mic_scale, 0, position++, 1, 1);
+
+        mic_seperator = new Wingpanel.Widgets.Separator ();
+
+        update_mic_visibility ();
+
+        if (this.server_type == Wingpanel.IndicatorManager.ServerType.SESSION) {
             main_grid.attach (mic_seperator, 0, position++, 1, 1);
 
             settings_button = new Wingpanel.Widgets.Button (_("Sound Settings…"));
@@ -389,10 +412,6 @@
 public Wingpanel.Indicator? get_indicator (Module module, Wingpanel.IndicatorManager.ServerType server_type) {
     debug ("Activating Sound Indicator");
 
-    if (server_type != Wingpanel.IndicatorManager.ServerType.SESSION) {
-        return null;
-    }
-
-    var indicator = new Sound.Indicator ();
+    var indicator = new Sound.Indicator (server_type);
     return indicator;
 }