Merge lp:~donadigo/wingpanel-indicator-sound/not-freeze-on-scroll into lp:~wingpanel-devs/wingpanel-indicator-sound/trunk

[Adam Bieńkowski]

* Do not create an instance on every scroll event
* Correct name property
* Pulseaduio async connecting

This branch fixes issue with freezing wingpanel for a while when scrolling over the indicator. Currently it creates an instance when the scroll event occurs which is not optimal and takes long time to connect to pulseaudio. I also corrected the name property and made connecting to pulseaudio async.

[Djax (parnold-x)]

Got no freezing before but it works and looks good.

review: Needs Fixing

[Djax (parnold-x)]

missed the right box :)

review: Approve

=== modified file 'src/Indicator.vala'
--- src/Indicator.vala	2016-05-04 14:00:58 +0000
+++ src/Indicator.vala	2016-09-09 21:20:56 +0000
@@ -217,6 +217,10 @@
 
                 return Gdk.EVENT_PROPAGATE;
             });
+
+            var vol = new Services.VolumeControl.Volume ();
+            vol.reason = Services.VolumeControl.VolumeReasons.USER_KEYPRESS;
+
             // change volume on scroll
             panel_icon.scroll_event.connect ((e) => {
                 int dir = 0;
@@ -225,10 +229,9 @@
                 } else if (e.direction == Gdk.ScrollDirection.DOWN) {
                     dir = -1;
                 }
+
                 double v = this.volume_control.volume.volume + volume_step_percentage * dir;
-                var vol = new Services.VolumeControl.Volume();
                 vol.volume = v.clamp (0.0, this.max_volume);
-                vol.reason = Services.VolumeControl.VolumeReasons.USER_KEYPRESS;
                 this.volume_control.volume = vol;
 
                 if (open == false && this.notification != null && v >= -0.05 && v <= (this.max_volume + 0.05)) {
 
=== modified file 'src/Services/Volume-control.vala'
--- src/Services/Volume-control.vala	2015-09-14 21:09:53 +0000
+++ src/Services/Volume-control.vala	2016-09-09 21:20:56 +0000
@@ -126,7 +126,7 @@
         _mute_cancellable = new Cancellable ();
         _volume_cancellable = new Cancellable ();
 
-        this.reconnect_to_pulse ();
+        reconnect_to_pulse.begin ();
     }
 
     ~VolumeControlPulse () {
@@ -453,11 +453,11 @@
 
     bool reconnect_timeout () {
         _reconnect_timer = 0;
-        reconnect_to_pulse ();
+        reconnect_to_pulse.begin ();
         return false; // G_SOURCE_REMOVE
     }
 
-    void reconnect_to_pulse () {
+    async void reconnect_to_pulse () {
         if (this.ready) {
             this.context.disconnect ();
             this.context = null;
@@ -465,7 +465,7 @@
         }
 
         var props = new PulseAudio.Proplist ();
-        props.sets (PulseAudio.Proplist.PROP_APPLICATION_NAME, "Elementary Audio Settings");
+        props.sets (PulseAudio.Proplist.PROP_APPLICATION_NAME, "elementary OS Audio Settings");
         props.sets (PulseAudio.Proplist.PROP_APPLICATION_ID, "org.pantheon.desktop.wingpanel.indicators.sound");
         props.sets (PulseAudio.Proplist.PROP_APPLICATION_ICON_NAME, "multimedia-volume-control");
         props.sets (PulseAudio.Proplist.PROP_APPLICATION_VERSION, "0.1");