Merge lp:~didrocks/gnome-shell/sound-above-100 into lp:~ubuntu-desktop/gnome-shell/ubuntu

[Didier Roche-Tolomelli]

* Add patch to allow setting volume above 100%:
    - debian/patches/70_allow_sound_above_100.patch, which allows the volume
      slider in the aggregatemenu to reflect and set correct current volume
      position. (LP: #1706524)

[lp:~didrocks/gnome-shell/sound-above-100]

40. By Didier Roche-Tolomelli on 2017-07-26

Changed Forwarded to simpy Bug

[Didier Roche-Tolomelli (didrocks)]

Pinging seb on that one as he did g-s-d review

[lp:~didrocks/gnome-shell/sound-above-100]

41. By Didier Roche-Tolomelli on 2017-08-04

Make it dependent on XDG_CURRENT_DESKTOP (which is what we are going
to use on other places).

42. By Didier Roche-Tolomelli on 2017-08-09

Add debian/patches/50_add_ubuntu_desktop_detect.patch to centralize
current desktop detection.

[Amr Ibrahim (amribrahim1987)]

There is a typo in the code. See the inline comment.

[Didier Roche-Tolomelli (didrocks)]

Thanks! Staging it for the next upload :)

=== modified file 'debian/changelog'
--- debian/changelog	2017-07-23 17:08:07 +0000
+++ debian/changelog	2017-08-09 16:08:12 +0000
@@ -1,3 +1,14 @@
+gnome-shell (3.24.3-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Add patch to allow setting volume above 100%:
+    - debian/patches/70_allow_sound_above_100.patch, which allows the volume
+      slider in the aggregatemenu to reflect and set correct current volume
+      position. (LP: #1706524)
+  * Add debian/patches/50_add_ubuntu_desktop_detect.patch to centralize
+    current desktop detection.
+
+ -- Didier Roche <[e-mail]>  Wed, 26 Jul 2017 09:00:40 +0200
+
 gnome-shell (3.24.3-0ubuntu1) artful; urgency=medium
 
   * New upstream release
 
=== added file 'debian/patches/50_add_ubuntu_desktop_detect.patch'
--- debian/patches/50_add_ubuntu_desktop_detect.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/50_add_ubuntu_desktop_detect.patch	2017-08-09 16:08:12 +0000
@@ -0,0 +1,38 @@
+Description: Add an helper to detect current desktop
+ We will differentiate some behavior depending on current desktop. Add an
+ helper to centralize the current desktop detection.
+Forwarded: not-needed
+Origin: ubuntu
+Author: [e-mail]
+Index: gnome-shell-3.24.3/js/misc/desktop.js
+===================================================================
+--- /dev/null
++++ gnome-shell-3.24.3/js/misc/desktop.js
+@@ -0,0 +1,27 @@
++// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
++
++const GLib = imports.gi.GLib;
++
++// is:
++// @name: desktop string you want to assert if it matches the current desktop env
++//
++// The function examples XDG_CURRENT_DESKTOP and return if the current desktop
++// is part of that desktop string.
++//
++// Return value: if the environment isn't set or doesn't match, return False
++// otherwise, return True.
++function is(name) {
++    let desktopsEnv = GLib.getenv('XDG_CURRENT_DESKTOP');
++    if (!desktopsEnv) {
++        return false;
++    }
++
++    let desktops = desktopsEnv.split(":");
++    for (let i = 0; i < desktops.length; i++) {
++        if (desktops[i] === name) {
++            return true;
++        }
++    }
++
++    return false;
++}
 
=== added file 'debian/patches/70_allow_sound_above_100.patch'
--- debian/patches/70_allow_sound_above_100.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/70_allow_sound_above_100.patch	2017-08-09 16:08:12 +0000
@@ -0,0 +1,79 @@
+Description: Allow volume to bet set above 100%.
+ Some systems have low maximum volume set (like x220), allow, from an option
+ in gnome-control-center to set it above that 100% limit from g-s-d
+ (keyboard) and gnome-shell.
+Origin: ubuntu
+Bug-Ubuntu: https://launchpad.net/bugs/1706524
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=710424
+
+Index: gnome-shell-3.24.3/js/ui/status/volume.js
+===================================================================
+--- gnome-shell-3.24.3.orig/js/ui/status/volume.js
++++ gnome-shell-3.24.3/js/ui/status/volume.js
+@@ -7,6 +7,7 @@ const Gvc = imports.gi.Gvc;
+ const St = imports.gi.St;
+ const Signals = imports.signals;
+ 
++const Desktop = imports.misc.desktop;
+ const PanelMenu = imports.ui.panelMenu;
+ const PopupMenu = imports.ui.popupMenu;
+ const Slider = imports.ui.slider;
+@@ -49,6 +50,14 @@ const StreamSlider = new Lang.Class({
+         }));
+ 
+         this._stream = null;
++
++        this._use_amplifiedvolume = false;
++        if (Desktop.is('ubuntu')) {
++            this._volumesettings = new Gio.Settings({ schema_id: 'com.ubuntu.sound' });
++            this._volumesettings.connect('changed::allow-amplified-volume',
++                Lang.bind(this, this._updateAmplifiedVolume));
++            this._updateAmplifiedVolume();
++        }
+     },
+ 
+     get stream() {
+@@ -102,11 +111,24 @@ const StreamSlider = new Lang.Class({
+         this._slider.setValue(value);
+     },
+ 
++    _updateAmplifiedVolume: function () {
++        this._use_amplifiedvolume =
++            this._volumesettings.get_boolean('allow-amplified-volume');
++    },
++
++    _get_control_max_volume: function() {
++        // return max volume depending if we are in an permitted amplified setting or not
++        if (this._use_amplifiedvolume) {
++            return this._control.get_vol_max_amplified();
++        }
++        return this._control.get_vol_max_norm();
++    },
++
+     _sliderChanged: function(slider, value, property) {
+         if (!this._stream)
+             return;
+ 
+-        let volume = value * this._control.get_vol_max_norm();
++        let volume = value * this._get_control_max_volume();
+         let prevMuted = this._stream.is_muted;
+         if (volume < 1) {
+             this._stream.volume = 0;
+@@ -130,7 +152,7 @@ const StreamSlider = new Lang.Class({
+ 
+     _updateVolume: function() {
+         let muted = this._stream.is_muted;
+-        this._slider.setValue(muted ? 0 : (this._stream.volume / this._control.get_vol_max_norm()));
++        this._slider.setValue(muted ? 0 : (this._stream.volume / this._get_control_max_volume()));
+         this.emit('stream-updated');
+     },
+ 
+@@ -142,7 +164,7 @@ const StreamSlider = new Lang.Class({
+         if (this._stream.is_muted || volume <= 0) {
+             return 'audio-volume-muted-symbolic';
+         } else {
+-            let n = Math.floor(3 * volume / this._control.get_vol_max_norm()) + 1;
++            let n = Math.floor(3 * volume / this._get_control_max_volume()) + 1;
+             if (n < 2)
+                 return 'audio-volume-low-symbolic';
+             if (n >= 3)
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2017-07-23 17:08:02 +0000
+++ debian/patches/series	2017-08-09 16:08:12 +0000
@@ -1,6 +1,8 @@
 27-nm-libexec-path.patch
 #30-remoteMenu-Prevent-the-shell-from-becoming-unrespons.patch
 41-handle-logind-fail.patch
+50_add_ubuntu_desktop_detect.patch
+70_allow_sound_above_100.patch
 ubuntu-lightdm-user-switching.patch
 ubuntu_lock_on_suspend.patch
 ubuntu_font.patch