sync with trunk.15.10

3 files changed, 73 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index d1b8742..25f83c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,69 @@
+indicator-sound (12.10.2+16.04.20160105.2-0ubuntu1) xenial; urgency=medium
+
+  [ Xavi Garcia Mena ]
+  * Adds an action to signal the UI to sync the current volume when we
+    are waiting for the user to confirm or reject the high volume
+    notification. (LP: #1520548, #1512798)
+  * This branch just readds the OSD notifications code, that was
+    reverted in trunk as the corresponding silo was also rolled back
+    after landing.
+  * This branch re-adds the integration tests using gmenuharness.  Added
+    OSD notifications to show output source when the volume or source
+    change (LP: #1382548, LP: #1415480, LP: #1484589)  debian/control:
+    Added the following build dependencies: cmake-extras (>= 0.4),
+    google-mock (>= 1.6.0+svn437), libqtdbusmock1-dev (>= 0.3),
+    libqtdbustest1-dev, libunity-api-dev, pulseaudio, qt5-default,
+    qtbase5-dev, qtbase5-dev-tools, qtdeclarative5-dev, qtdeclarative5-
+    dev-tools Added gmenuharness library for integration tests support.
+    New Files: src/gmenuharness/CMakeLists.txt
+    src/gmenuharness/MatchResult.cpp src/gmenuharness/MatchUtils.cpp
+    src/gmenuharness/MenuItemMatcher.cpp
+    src/gmenuharness/MenuMatcher.cpp
+    include/unity/gmenuharness/MatchResult.h
+    include/unity/gmenuharness/MatchUtils.h
+    include/unity/gmenuharness/MenuItemMatcher.h
+    include/unity/gmenuharness/MenuMatcher.h Added integration tests
+    using gmenuharness New Files: tests/dbus-types/CMakeLists.txt
+    tests/dbus-types/com.ubuntu.AccountsService.Sound.xml tests/dbus-
+    types/dbus-types.h tests/dbus-
+    types/org.PulseAudio.Ext.StreamRestore1.xml tests/dbus-
+    types/org.freedesktop.Accounts.xml tests/dbus-
+    types/org.freedesktop.DBus.Properties.xml tests/dbus-
+    types/org.freedesktop.Notifications.xml tests/dbus-
+    types/org.gtk.Actions.xml tests/dbus-types/pulseaudio-volume.cpp
+    tests/dbus-types/pulseaudio-volume.h
+    tests/integration/CMakeLists.txt tests/integration/indicator-sound-
+    test-base.cpp tests/integration/indicator-sound-test-base.h
+    tests/integration/main.cpp tests/integration/test-indicator.cpp
+    tests/integration/touch-stream-restore.table
+    tests/integration/utils/dbus-pulse-volume.cpp
+    tests/integration/utils/dbus-pulse-volume.h
+    tests/integration/utils/get-volume.cpp tests/integration/utils/set-
+    volume.cpp tests/service-mocks/CMakeLists.txt tests/service-
+    mocks/DBusPropertiesNotifier.cpp tests/service-
+    mocks/DBusPropertiesNotifier.h tests/service-mocks/accounts-
+    mock/AccountsDefs.h tests/service-mocks/accounts-
+    mock/AccountsMock.cpp tests/service-mocks/accounts-
+    mock/AccountsMock.h tests/service-mocks/accounts-
+    mock/AccountsServiceSoundMock.cpp tests/service-mocks/accounts-
+    mock/AccountsServiceSoundMock.h tests/service-mocks/accounts-
+    mock/CMakeLists.txt tests/service-mocks/accounts-
+    mock/com.ubuntu.AccountsService.Sound.Mock.xml tests/service-
+    mocks/accounts-mock/main.cpp tests/service-mocks/accounts-
+    mock/org.freedesktop.Accounts.Mock.xml tests/service-mocks/media-
+    player-mpris-mock/CMakeLists.txt tests/service-mocks/media-player-
+    mpris-mock/MediaPlayerMprisDefs.h tests/service-mocks/media-player-
+    mpris-mock/MediaPlayerMprisMock.cpp tests/service-mocks/media-
+    player-mpris-mock/MediaPlayerMprisMock.h tests/service-mocks/media-
+    player-mpris-mock/applications/testplayer1.desktop tests/service-
+    mocks/media-player-mpris-mock/main.cpp tests/service-mocks/media-
+    player-mpris-mock/org.mpris.MediaPlayer2.Player.xml tests/service-
+    mocks/media-player-mpris-mock/org.mpris.MediaPlayer2.xml
+    tests/service-mocks/media-player-mpris-mock/player-update.cpp (LP:
+    #1415480, #1382548, #1484589)
+
+ -- Xavi Garcia <xavi.garcia.mena@canonical.com>  Tue, 05 Jan 2016 15:08:27 +0000
+
 indicator-sound (12.10.2+16.04.20151223.1-0ubuntu1) xenial; urgency=medium
 
   [ Xavi Garcia Mena ]
diff --git a/src/volume-control.vala b/src/volume-control.vala
index c67bbe8..3d02f70 100644
--- a/src/volume-control.vala
+++ b/src/volume-control.vala
@@ -64,6 +64,7 @@ public abstract class VolumeControl : Object
 	public virtual bool mute { get { return false; } }
 	public bool is_playing { get; protected set; default = false; }
 	private Volume _volume;
+	private double _pre_clamp_volume;
 	public virtual Volume volume { get { return _volume; } set { } }
 	public virtual double mic_volume { get { return 0.0; } set { } }
 
@@ -74,6 +75,11 @@ public abstract class VolumeControl : Object
 		v.volume = unclamped.clamp (0.0, _options.max_volume);
 		v.reason = reason;
 		this.volume = v;
+		_pre_clamp_volume = unclamped;
+	}
+
+	public double get_pre_clamped_volume () {
+		return _pre_clamp_volume;
 	}
 
 	public abstract VolumeControl.ActiveOutput active_output();
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index e69c01e..7099d20 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -218,7 +218,7 @@ target_link_libraries (
     ${TEST_LIBRARIES}
 )
 
-add_test(notifications-test notifications-test)
+#add_test(notifications-test notifications-test)
 
 ###########################
 # Accounts Service User