The Sound Menu

Merge lp:~xavi-garcia-mena/indicator-sound/re-add-integration-tests into lp:indicator-sound/15.10

  1. re-add-integration-tests
  2. Merge into trunk.15.10
Proposed by Xavi Garcia
Status: Merged
Approved by: Xavi Garcia
Approved revision: 515
Merged at revision: 519
Proposed branch: lp:~xavi-garcia-mena/indicator-sound/re-add-integration-tests
Merge into: lp:indicator-sound/15.10
Prerequisite: lp:~xavi-garcia-mena/indicator-sound/restore-osd-notifications
Diff against target: 270 lines (+73/-37)
8 files modified
AUTHORS (+1/-0)
debian/changelog (+7/-6)
debian/control (+11/-0)
src/CMakeLists.txt (+1/-2)
src/service.vala (+5/-2)
src/volume-control-pulse.vala (+41/-22)
src/volume-control.vala (+4/-1)
tests/CMakeLists.txt (+3/-4)
To merge this branch: bzr merge lp:~xavi-garcia-mena/indicator-sound/re-add-integration-tests
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Xavi Garcia Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+281292@code.launchpad.net

This proposal supersedes a proposal from 2015-11-11.

Commit message

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

Description of the change

This branch re-adds the integration tests using gmenuharness.

I'm approving myself as it was already approved previously as branch:
lp:~xavi-garcia-mena/indicator-sound/remove-warning-message-in-volume-notification

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

PASSED: Continuous integration, rev:510
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/288/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-amd64-ci/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/64
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/64/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/288/rebuild

review: Approve (continuous-integration)
Revision history for this message
Xavi Garcia (xavi-garcia-mena) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:513
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/294/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-amd64-ci/70/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/70/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/294/rebuild

review: Needs Fixing (continuous-integration)
lp:~xavi-garcia-mena/indicator-sound/re-add-integration-tests updated
515. By Xavi Garcia

Conflicts resolved with restored branch

Revision history for this message
Xavi Garcia (xavi-garcia-mena) wrote :

Approving myself as it as already reviewed and approved

review: Approve
lp:~xavi-garcia-mena/indicator-sound/re-add-integration-tests updated
516. By Xavi Garcia

removed extra line in debian/changelog

517. By Xavi Garcia

sync debian/changelog with pre-requisite branch

518. By Xavi Garcia

Rolling back to release 516

519. By Xavi Garcia

sync changelog with previous branch

520. By Xavi Garcia

re-added new stuff

521. By Xavi Garcia

remove changed in debian/changelog

522. By Xavi Garcia

[ Xavi Garcia ]
  * 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

Revision history for this message
Charles Kerr (charlesk) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'AUTHORS'
--- AUTHORS 2012-11-16 13:48:06 +0000
+++ AUTHORS 2016-01-05 13:50:19 +0000
@@ -1,3 +1,4 @@
1Charles Kerr <charles.kerr@canonical.com>1Charles Kerr <charles.kerr@canonical.com>
2Ted Gould <ted@canonical.com>2Ted Gould <ted@canonical.com>
3Cody Russell <crussell@canonical.com>3Cody Russell <crussell@canonical.com>
4Xavi Garcia <xavi.garcia.mena@canonical.com>
45
=== modified file 'debian/changelog'
--- debian/changelog 2016-01-05 13:50:18 +0000
+++ debian/changelog 2015-12-23 14:20:45 +0000
@@ -1,4 +1,3 @@
1<<<<<<< TREE
2indicator-sound (12.10.2+16.04.20151223.1-0ubuntu1) xenial; urgency=medium1indicator-sound (12.10.2+16.04.20151223.1-0ubuntu1) xenial; urgency=medium
32
4 [ Xavi Garcia Mena ]3 [ Xavi Garcia Mena ]
@@ -30,14 +29,16 @@
30indicator-sound (12.10.2+16.04.20151103.2-0ubuntu1) xenial; urgency=medium29indicator-sound (12.10.2+16.04.20151103.2-0ubuntu1) xenial; urgency=medium
3130
32 [ Xavi Garcia ]31 [ Xavi Garcia ]
33=======
34indicator-sound (12.10.2+15.10.20151019-0ubuntu2) UNRELEASED; urgency=medium
35
36>>>>>>> MERGE-SOURCE
37 * Added OSD notifications to show output source when the volume or 32 * Added OSD notifications to show output source when the volume or
38 source change (LP: #1382548, LP: #1415480, LP: #1484589)33 source change (LP: #1382548, LP: #1415480, LP: #1484589)
3934
40 -- Xavi Garcia <xavi.garcia.mena@canonical.com> Tue, 03 Nov 2015 12:29:19 +010035 [ CI Train Bot ]
36 * New rebuild forced.
37
38 [ Timo Jyrinki ]
39 * Note: this release was reverted on 20151223, ignore this changelog entry.
40
41 -- Xavi Garcia <xavi.garcia.mena@canonical.com> Tue, 03 Nov 2015 17:47:10 +0000
4142
42indicator-sound (12.10.2+15.10.20151019-0ubuntu1) wily; urgency=medium43indicator-sound (12.10.2+15.10.20151019-0ubuntu1) wily; urgency=medium
4344
4445
=== modified file 'debian/control'
--- debian/control 2015-11-03 16:21:43 +0000
+++ debian/control 2016-01-05 13:50:19 +0000
@@ -5,11 +5,13 @@
5XSBC-Original-Maintainer: Conor Curran <conor.curran@canonical.com>5XSBC-Original-Maintainer: Conor Curran <conor.curran@canonical.com>
6Build-Depends: debhelper (>= 9.0),6Build-Depends: debhelper (>= 9.0),
7 cmake,7 cmake,
8 cmake-extras (>= 0.4),
8 dbus,9 dbus,
9 dbus-test-runner (>> 14.04.0+14.04.20150120.1),10 dbus-test-runner (>> 14.04.0+14.04.20150120.1),
10 dh-translations,11 dh-translations,
11 gir1.2-accountsservice-1.0,12 gir1.2-accountsservice-1.0,
12 gnome-common,13 gnome-common,
14 google-mock (>= 1.6.0+svn437),
13 gsettings-ubuntu-schemas,15 gsettings-ubuntu-schemas,
14 autotools-dev,16 autotools-dev,
15 valac (>= 0.20),17 valac (>= 0.20),
@@ -18,13 +20,22 @@
18 libgirepository1.0-dev,20 libgirepository1.0-dev,
19 libglib2.0-dev (>= 2.22.3),21 libglib2.0-dev (>= 2.22.3),
20 libgtest-dev,22 libgtest-dev,
23 libqtdbusmock1-dev (>= 0.3),
24 libqtdbustest1-dev,
25 libunity-api-dev,
21 liburl-dispatcher1-dev,26 liburl-dispatcher1-dev,
22 libpulse-dev (>= 1:4.0-0ubuntu21),27 libpulse-dev (>= 1:4.0-0ubuntu21),
23 libpulse-mainloop-glib0 (>= 0.9.18),28 libpulse-mainloop-glib0 (>= 0.9.18),
24 libnotify-dev,29 libnotify-dev,
25 libgee-dev,30 libgee-dev,
26 libxml2-dev,31 libxml2-dev,
32 pulseaudio,
27 python3-dbusmock,33 python3-dbusmock,
34 qt5-default,
35 qtbase5-dev,
36 qtbase5-dev-tools,
37 qtdeclarative5-dev,
38 qtdeclarative5-dev-tools,
28Standards-Version: 3.9.439Standards-Version: 3.9.4
29Homepage: https://launchpad.net/indicator-sound40Homepage: https://launchpad.net/indicator-sound
30# If you aren't a member of ~indicator-applet-developers but need to upload41# If you aren't a member of ~indicator-applet-developers but need to upload
3142
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt 2016-01-05 13:50:18 +0000
+++ src/CMakeLists.txt 2016-01-05 13:50:19 +0000
@@ -207,5 +207,4 @@
207 RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/indicator-sound/207 RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/indicator-sound/
208)208)
209209
210# Disable integration tests210add_subdirectory(gmenuharness)
211# add_subdirectory(gmenuharness)
212211
=== modified file 'src/service.vala'
--- src/service.vala 2016-01-05 13:50:18 +0000
+++ src/service.vala 2016-01-05 13:50:19 +0000
@@ -40,7 +40,7 @@
40 warn_notification.set_hint ("x-canonical-non-shaped-icon", "true");40 warn_notification.set_hint ("x-canonical-non-shaped-icon", "true");
41 warn_notification.set_hint ("x-canonical-snap-decisions", "true");41 warn_notification.set_hint ("x-canonical-snap-decisions", "true");
42 warn_notification.set_hint ("x-canonical-private-affirmative-tint", "true");42 warn_notification.set_hint ("x-canonical-private-affirmative-tint", "true");
43 warn_notification.closed.connect((n) => { n.clear_actions(); });43 warn_notification.closed.connect((n) => { n.clear_actions(); waiting_user_approve_warn=false; });
44 BusWatcher.watch_namespace (GLib.BusType.SESSION,44 BusWatcher.watch_namespace (GLib.BusType.SESSION,
45 "org.freedesktop.Notifications",45 "org.freedesktop.Notifications",
46 () => { debug("Notifications name appeared"); },46 () => { debug("Notifications name appeared"); },
@@ -609,7 +609,10 @@
609 var warn = loud609 var warn = loud
610 && this.notify_server_supports_actions610 && this.notify_server_supports_actions
611 && !this.volume_control.high_volume_approved;611 && !this.volume_control.high_volume_approved;
612612 if (waiting_user_approve_warn && volume_control.below_warning_volume) {
613 volume_control.set_warning_volume();
614 close_notification(warn_notification);
615 }
613 if (warn) {616 if (warn) {
614 close_notification(info_notification);617 close_notification(info_notification);
615 if (_pre_warn_volume == null) {618 if (_pre_warn_volume == null) {
616619
=== modified file 'src/volume-control-pulse.vala'
--- src/volume-control-pulse.vala 2016-01-05 13:50:18 +0000
+++ src/volume-control-pulse.vala 2016-01-05 13:50:19 +0000
@@ -140,40 +140,45 @@
140 140
141 VolumeControl.ActiveOutput ret_output = VolumeControl.ActiveOutput.SPEAKERS;141 VolumeControl.ActiveOutput ret_output = VolumeControl.ActiveOutput.SPEAKERS;
142 /* Check if the current active port is headset/headphone */142 /* Check if the current active port is headset/headphone */
143 /* There is not easy way to check if the port is a headset/headphone besides143 /* There is not easy way to check if the port is a headset/headphone besides
144 * checking for the port name. On touch (with the pulseaudio droid element)144 * checking for the port name. On touch (with the pulseaudio droid element)
145 * the headset/headphone port is called 'output-headset' and 'output-headphone'.145 * the headset/headphone port is called 'output-headset' and 'output-headphone'.
146 * On the desktop this is usually called 'analog-output-headphones' */146 * On the desktop this is usually called 'analog-output-headphones' */
147
148 // first of all check if we are in call mode
149 if (sink.active_port != null && sink.active_port.name == "output-speaker+wired_headphone") {
150 return VolumeControl.ActiveOutput.CALL_MODE;
151 }
147 // look if it's a headset/headphones152 // look if it's a headset/headphones
148 if (sink.name == "indicator_sound_test_headphones" ||153 if (sink.name == "indicator_sound_test_headphones" ||
149 (sink.active_port != null && 154 (sink.active_port != null &&
150 (sink.active_port.name.contains("headset") ||155 (sink.active_port.name.contains("headset") ||
151 sink.active_port.name.contains("headphone")))) {156 sink.active_port.name.contains("headphone")))) {
152 _active_port_headphone = true;157 _active_port_headphone = true;
153 // check if it's a bluetooth device158 // check if it's a bluetooth device
154 var device_bus = sink.proplist.gets ("device.bus");159 var device_bus = sink.proplist.gets ("device.bus");
155 if (device_bus != null && device_bus == "bluetooth") {160 if (device_bus != null && device_bus == "bluetooth") {
156 ret_output = VolumeControl.ActiveOutput.BLUETOOTH_HEADPHONES;161 ret_output = VolumeControl.ActiveOutput.BLUETOOTH_HEADPHONES;
157 } else if (device_bus != null && device_bus == "usb") {162 } else if (device_bus != null && device_bus == "usb") {
158 ret_output = VolumeControl.ActiveOutput.USB_HEADPHONES;163 ret_output = VolumeControl.ActiveOutput.USB_HEADPHONES;
159 } else if (device_bus != null && device_bus == "hdmi") {164 } else if (device_bus != null && device_bus == "hdmi") {
160 ret_output = VolumeControl.ActiveOutput.HDMI_HEADPHONES;165 ret_output = VolumeControl.ActiveOutput.HDMI_HEADPHONES;
161 } else {166 } else {
162 ret_output = VolumeControl.ActiveOutput.HEADPHONES;167 ret_output = VolumeControl.ActiveOutput.HEADPHONES;
163 }168 }
164 } else {169 } else {
165 // speaker170 // speaker
166 _active_port_headphone = false;171 _active_port_headphone = false;
167 var device_bus = sink.proplist.gets ("device.bus");172 var device_bus = sink.proplist.gets ("device.bus");
168 if (device_bus != null && device_bus == "bluetooth") {173 if (device_bus != null && device_bus == "bluetooth") {
169 ret_output = VolumeControl.ActiveOutput.BLUETOOTH_SPEAKER;174 ret_output = VolumeControl.ActiveOutput.BLUETOOTH_SPEAKER;
170 } else if (device_bus != null && device_bus == "usb") {175 } else if (device_bus != null && device_bus == "usb") {
171 ret_output = VolumeControl.ActiveOutput.USB_SPEAKER;176 ret_output = VolumeControl.ActiveOutput.USB_SPEAKER;
172 } else if (device_bus != null && device_bus == "hdmi") {177 } else if (device_bus != null && device_bus == "hdmi") {
173 ret_output = VolumeControl.ActiveOutput.HDMI_SPEAKER;178 ret_output = VolumeControl.ActiveOutput.HDMI_SPEAKER;
174 } else {179 } else {
175 ret_output = VolumeControl.ActiveOutput.SPEAKERS;180 ret_output = VolumeControl.ActiveOutput.SPEAKERS;
176 }181 }
177 }182 }
178183
179 return ret_output;184 return ret_output;
@@ -253,7 +258,9 @@
253 258
254 // check if the output has changed, if so... emit a signal259 // check if the output has changed, if so... emit a signal
255 VolumeControl.ActiveOutput active_output_now = active_output;260 VolumeControl.ActiveOutput active_output_now = active_output;
256 if (active_output_now != active_output_before) {261 if (active_output_now != active_output_before &&
262 (active_output_now != VolumeControl.ActiveOutput.CALL_MODE &&
263 active_output_before != VolumeControl.ActiveOutput.CALL_MODE)) {
257 this.active_output_changed (active_output_now);264 this.active_output_changed (active_output_now);
258 if (active_output_now == VolumeControl.ActiveOutput.SPEAKERS) {265 if (active_output_now == VolumeControl.ActiveOutput.SPEAKERS) {
259 _high_volume_approved = false;266 _high_volume_approved = false;
@@ -738,6 +745,10 @@
738 get { return this._high_volume; }745 get { return this._high_volume; }
739 private set { this._high_volume = value; }746 private set { this._high_volume = value; }
740 }747 }
748 public override bool below_warning_volume {
749 get { return this._volume.volume < this._warning_volume_norms; }
750 private set { }
751 }
741 private void init_high_volume() {752 private void init_high_volume() {
742 _settings.changed["warning-volume-enabled"].connect(() => update_high_volume_cache());753 _settings.changed["warning-volume-enabled"].connect(() => update_high_volume_cache());
743 _settings.changed["warning-volume-decibels"].connect(() => update_high_volume_cache());754 _settings.changed["warning-volume-decibels"].connect(() => update_high_volume_cache());
@@ -779,6 +790,14 @@
779 }790 }
780 }791 }
781792
793 public override void set_warning_volume() {
794 var vol = new VolumeControl.Volume();
795 vol.volume = _warning_volume_norms;
796 vol.reason = _volume.reason;
797 debug("Setting warning level volume from %f down to %f", _volume.volume, vol.volume);
798 volume = vol;
799 }
800
782 /** HIGH VOLUME APPROVED PROPERTY **/801 /** HIGH VOLUME APPROVED PROPERTY **/
783802
784 private bool _high_volume_approved = false;803 private bool _high_volume_approved = false;
785804
=== modified file 'src/volume-control.vala'
--- src/volume-control.vala 2016-01-05 13:50:18 +0000
+++ src/volume-control.vala 2016-01-05 13:50:19 +0000
@@ -36,7 +36,8 @@
36 USB_SPEAKER,36 USB_SPEAKER,
37 USB_HEADPHONES,37 USB_HEADPHONES,
38 HDMI_SPEAKER,38 HDMI_SPEAKER,
39 HDMI_HEADPHONES39 HDMI_HEADPHONES,
40 CALL_MODE
40 }41 }
4142
42 public class Volume : Object {43 public class Volume : Object {
@@ -48,6 +49,7 @@
48 public virtual bool ready { get { return false; } set { } }49 public virtual bool ready { get { return false; } set { } }
49 public virtual bool active_mic { get { return false; } set { } }50 public virtual bool active_mic { get { return false; } set { } }
50 public virtual bool high_volume { get { return false; } protected set { } }51 public virtual bool high_volume { get { return false; } protected set { } }
52 public virtual bool below_warning_volume { get { return false; } protected set { } }
51 public virtual bool mute { get { return false; } }53 public virtual bool mute { get { return false; } }
52 public virtual bool is_playing { get { return false; } }54 public virtual bool is_playing { get { return false; } }
53 public virtual VolumeControl.ActiveOutput active_output { get { return VolumeControl.ActiveOutput.SPEAKERS; } }55 public virtual VolumeControl.ActiveOutput active_output { get { return VolumeControl.ActiveOutput.SPEAKERS; } }
@@ -59,6 +61,7 @@
59 public virtual bool high_volume_approved { get { return false; } protected set { } }61 public virtual bool high_volume_approved { get { return false; } protected set { } }
60 public virtual void approve_high_volume() { }62 public virtual void approve_high_volume() { }
61 public virtual void clamp_to_high_volume() { }63 public virtual void clamp_to_high_volume() { }
64 public virtual void set_warning_volume() { }
6265
63 public abstract void set_mute (bool mute);66 public abstract void set_mute (bool mute);
6467
6568
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt 2016-01-05 13:50:18 +0000
+++ tests/CMakeLists.txt 2016-01-05 13:50:19 +0000
@@ -281,7 +281,6 @@
281 indicator-test281 indicator-test
282)282)
283283
284# Disable integration tests284add_subdirectory(integration)
285# add_subdirectory(integration)285add_subdirectory(dbus-types)
286# add_subdirectory(dbus-types)286add_subdirectory(service-mocks)
287# add_subdirectory(service-mocks)
288\ No newline at end of file287\ No newline at end of file

Subscribers

People subscribed via source and target branches