From 7df37f358ee186e95362c88e9013f7f079d2c8ae Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 9 Oct 2014 11:18:21 -0500 Subject: Test plan test for the greeter mode --- tests/manual | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tests/manual b/tests/manual index 201465c..039eead 100644 --- a/tests/manual +++ b/tests/manual @@ -22,3 +22,29 @@ Test-case indicator-sound/unity8-items-check
The menu is populated with items
+Test-case indicator-sound/unity8-embedded-greeter +
+
NOTE: Only works with embedded greeter, split greeter will require modifications to this test
+
Ensure System Settings is set to "Show Messages on Greeter"
+
Play a song in the media player
+
The song should be heard
+
There should be an entry in the sound menu with the meta data for the song being played
+
Go to the greeter. This can be done by hitting the lock button twice.
+
Ensure the sound menu has song meta data
+
There should be an entry in the sound menu with the meta data for the song being played
+
Pause the song in the greeter
+
The song should stop playing
+
Resume the song in the greeter
+
The song should continue to play
+
Disable System Settings value "Show Messages on Greeter"
+
Ensure the sound menu has song meta data
+
There should be an entry in the sound menu with the meta data for the song being played
+
Go to the greeter. This can be done by hitting the lock button twice.
+
Ensure the sound menu does not have song meta data
+
There should be an entry for the player but it should have no information on the song being played
+
Pause the song in the greeter
+
The song should stop playing
+
Resume the song in the greeter
+
The song should continue to play
+
+ -- cgit v1.2.3 From eaa8592f4a4ad49cd462a04e2d008ce49d5a3206 Mon Sep 17 00:00:00 2001 From: Ricardo Salveti Date: Fri, 10 Oct 2014 10:43:07 -0500 Subject: Integration test for audio roles --- tests/manual | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/manual b/tests/manual index 201465c..2816984 100644 --- a/tests/manual +++ b/tests/manual @@ -22,3 +22,22 @@ Test-case indicator-sound/unity8-items-check
The menu is populated with items
+Test-case indicator-sound/unity8-audio-roles +
+
Without playing anything (no active audio stream), change the volume on the indicator or with the volume buttons and then try playing one of the following audio streams: camera shutter, ringtone, message notification, dtmf
+
The audio stream should reflect the volume set on the indicator
+
Without playing anything (no active audio stream), change the volume on the indicator or with volume buttons and then try playing one of the following audio streams: music-app, webrowser (youtube)
+
The audio stream should not be affected by the volume set on the indicator when there was no other active stream +
Play a multimedia stream (music-app, webrowser) and change the volume on the indicator when the stream is active
+
The multimedia audio stream should reflect the volume set on the indicator
+
When stopping/closing the multimedia stream, it should automatically show up the volume for the alert role (ringtone, notification, etc)
+
No other role should be affected by the volume level used by the multimedia role
+
Play a alarm stream (clock-app) and change the volume on the indicator when the stream is active
+
The alarm audio stream should reflect the volume set on the indicator
+
When stopping/closing the alarm stream, it should automatically show up the volume for the alert role (ringtone, notification, etc)
+
No other role should be affected by the volume level used by the alarm role
+
Start a voice call using the dialer-app and change the volume on the indicator when the call is active
+
The phone audio stream should reflect the volume set on the indicator
+
When hanging up the voice call it should automatically show up the volume for the alert role (ringtone, notification, etc)
+
No other role should be affected by the volume level used by the phone role
+
-- cgit v1.2.3 From 5dd9bda0ea449024dbc97e26f92631401048bc57 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 15 Oct 2014 13:24:48 -0500 Subject: Removing the remove code that was supposed to be removed earlier --- src/sound-menu.vala | 1 - 1 file changed, 1 deletion(-) diff --git a/src/sound-menu.vala b/src/sound-menu.vala index a9efd74..05570b9 100644 --- a/src/sound-menu.vala +++ b/src/sound-menu.vala @@ -118,7 +118,6 @@ public class SoundMenu: Object while ((location = find_action(this.volume_section, "indicator.high-volume-warning-item")) != -1) { this.volume_section.remove (location); } - this.volume_section.remove (this.volume_section.get_n_items () -1); this.high_volume_warning_shown = false; } } -- cgit v1.2.3 From 1e193a4b99e62b52fb759d00a8745f1c477d965f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 15 Oct 2014 13:52:31 -0500 Subject: Make sure to check the item in the loop --- src/sound-menu.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sound-menu.vala b/src/sound-menu.vala index 05570b9..3881faf 100644 --- a/src/sound-menu.vala +++ b/src/sound-menu.vala @@ -127,7 +127,7 @@ public class SoundMenu: Object int n = menu.get_n_items (); for (int i = 0; i < n; i++) { string action; - menu.get_item_attribute (0, "action", "s", out action); + menu.get_item_attribute (i, "action", "s", out action); if (in_action == action) return i; } -- cgit v1.2.3 From 8cfba863c2ce74c326cb31f13f14a1de801e69f2 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 16 Oct 2014 11:12:28 -0500 Subject: No RTM changelog entries in Utopic --- debian/changelog | 7 ------- 1 file changed, 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index e82b0e3..483c78b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,3 @@ -indicator-sound (12.10.2+14.10.20141015.5~rtm-0ubuntu1) 14.09; urgency=low - - [ Ted Gould ] - * Show notifications on volume change (LP: #1378564) - - -- Ubuntu daily release Wed, 15 Oct 2014 16:19:12 +0000 - indicator-sound (12.10.2+14.10.20141010-0ubuntu1) utopic; urgency=low [ Ricardo Salveti de Araujo ] -- cgit v1.2.3 From ebf6a44938610ec386e269d5d5538cbb82a73290 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 22 Oct 2014 12:38:46 -0400 Subject: Silent mode test --- tests/manual | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/manual b/tests/manual index 2816984..05993ed 100644 --- a/tests/manual +++ b/tests/manual @@ -22,6 +22,24 @@ Test-case indicator-sound/unity8-items-check
The menu is populated with items
+Test-case indicator-sound/unity8-silent-mode +
+
NOTE: This test currently doesn't work because of a bug:
+
Open the Sound menu
+
The sound menu includes an item "Silent Mode" which is a check box
+
The checkbox is not checked
+
Enable silent mode
+
Selecting the "Silent Mode" item should cause the box to be checked
+
Open the sound panel in system settings
+
The sound panel includes an item "Silent Mode" which is a check box
+
The checkbox is checked
+
Disable silent mode in system settings
+
The checkbox is not checked
+
Open the Sound menu
+
The sound menu includes an item "Silent Mode" which is a check box
+
The checkbox is not checked
+
+ Test-case indicator-sound/unity8-audio-roles
Without playing anything (no active audio stream), change the volume on the indicator or with the volume buttons and then try playing one of the following audio streams: camera shutter, ringtone, message notification, dtmf
-- cgit v1.2.3 From 6e42c539dd125c3a44c82d135df3f0788d974771 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 22 Oct 2014 12:40:07 -0400 Subject: Adding a bug number to the test --- tests/manual | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/manual b/tests/manual index 05993ed..ab18469 100644 --- a/tests/manual +++ b/tests/manual @@ -24,7 +24,7 @@ Test-case indicator-sound/unity8-items-check Test-case indicator-sound/unity8-silent-mode
-
NOTE: This test currently doesn't work because of a bug:
+
NOTE: This test currently doesn't work because of a bug: http://pad.lv/1336715
Open the Sound menu
The sound menu includes an item "Silent Mode" which is a check box
The checkbox is not checked
-- cgit v1.2.3 From 8a25cabee9738ced0da921fcac693495006070af Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 22 Oct 2014 15:52:54 -0400 Subject: Allow for the invalidated properties to be NULL --- src/volume-control.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/volume-control.vala b/src/volume-control.vala index ad186a7..e8d35a4 100644 --- a/src/volume-control.vala +++ b/src/volume-control.vala @@ -689,7 +689,7 @@ public class VolumeControl : Object } /* AccountsService operations */ - private void accountsservice_props_changed_cb (DBusProxy proxy, Variant changed_properties, string[] invalidated_properties) + private void accountsservice_props_changed_cb (DBusProxy proxy, Variant changed_properties, string[]? invalidated_properties) { Variant volume_variant = changed_properties.lookup_value ("Volume", new VariantType ("d")); if (volume_variant != null) { -- cgit v1.2.3 From edf067bcf194607f0f51f0152e3ad5eb6d70d0be Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 22 Oct 2014 15:58:32 -0400 Subject: Setup a try/catch on the getting of properties --- src/volume-control.vala | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/volume-control.vala b/src/volume-control.vala index e8d35a4..5061ae8 100644 --- a/src/volume-control.vala +++ b/src/volume-control.vala @@ -747,10 +747,14 @@ public class VolumeControl : Object // Get current values and listen for changes _user_proxy.g_properties_changed.connect (accountsservice_props_changed_cb); - var props_variant = yield _user_proxy.get_connection ().call (_user_proxy.get_name (), _user_proxy.get_object_path (), "org.freedesktop.DBus.Properties", "GetAll", new Variant ("(s)", _user_proxy.get_interface_name ()), null, DBusCallFlags.NONE, -1); - Variant props; - props_variant.get ("(@a{sv})", out props); - accountsservice_props_changed_cb(_user_proxy, props, null); + try { + var props_variant = yield _user_proxy.get_connection ().call (_user_proxy.get_name (), _user_proxy.get_object_path (), "org.freedesktop.DBus.Properties", "GetAll", new Variant ("(s)", _user_proxy.get_interface_name ()), null, DBusCallFlags.NONE, -1); + Variant props; + props_variant.get ("(@a{sv})", out props); + accountsservice_props_changed_cb(_user_proxy, props, null); + } catch (GLib.Error e) { + debug("Unable to get properties for user %s at first try: %s", username, e.message); + } } private void greeter_user_changed (string username) -- cgit v1.2.3 From 9ab88593b90ee51361c4b4789daf11a2f1d08429 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 22 Oct 2014 16:00:18 -0400 Subject: Remove usage of deprecated hint functions --- src/service.vala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/service.vala b/src/service.vala index 2a65492..4298ad7 100644 --- a/src/service.vala +++ b/src/service.vala @@ -69,7 +69,7 @@ public class IndicatorSound.Service: Object { List caps = Notify.get_server_caps (); if (caps.find_custom ("x-canonical-private-synchronous", strcmp) != null) { this.notification = new Notify.Notification ("indicator-sound", "", ""); - this.notification.set_hint_string ("x-canonical-private-synchronous", "indicator-sound"); + this.notification.set_hint ("x-canonical-private-synchronous", "indicator-sound"); } } @@ -186,7 +186,7 @@ public class IndicatorSound.Service: Object { icon = "notification-audio-volume-high"; this.notification.update ("indicator-sound", "", icon); - this.notification.set_hint_int32 ("value", ((int32) (100 * v / this.max_volume)).clamp (-1, 101)); + this.notification.set_hint ("value", ((int32) (100 * v / this.max_volume)).clamp (-1, 101)); try { this.notification.show (); } -- cgit v1.2.3 From e03e82a36d5662c80ad61c6758591ae40d551f6b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 5 Nov 2014 10:46:56 -0600 Subject: Fixing bug number --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3fb71d9..899fa03 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ indicator-sound (12.10.2+14.10.20141010-0ubuntu8) UNRELEASED; urgency=medium * Remove various Vala warnings * Show notifications on volume change (LP: #1378564, #1378961) - * Warn on high audio levels when using headphones (LP: #123633, #1373404) + * Warn on high audio levels when using headphones (LP: #1232633, #1373404) * service.vala: don't call set_volume unnecessarily (LP: #1381871) * Integration test for audio roles * Integration test for silent mode -- cgit v1.2.3 From 08bcdc3b069c4c5ce7cb2a769daa8573fce5cd5d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 5 Nov 2014 10:48:22 -0600 Subject: Missed part of a merge --- src/volume-control.vala | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/volume-control.vala b/src/volume-control.vala index 295ebf5..6f22dc5 100644 --- a/src/volume-control.vala +++ b/src/volume-control.vala @@ -604,16 +604,6 @@ public class VolumeControl : Object { /* Using this to detect whether we're on the phone or not */ if (_pulse_use_stream_restore) { -<<<<<<< TREE - if (volume == 0.0) - _notification.update (_("Volume"), "", "audio-volume-muted"); - if (volume > 0.0 && volume <= 0.33) - _notification.update (_("Volume"), "", "audio-volume-low"); - if (volume > 0.33 && volume <= 0.66) - _notification.update (_("Volume"), "", "audio-volume-medium"); - if (volume > 0.66 && volume <= 1.0) - _notification.update (_("Volume"), "", "audio-volume-high"); -======= /* Watch for extreme */ if (volume > 0.75 && _active_port_headphone) high_volume = true; -- cgit v1.2.3 From 2f0aba374502b7ea660fce49f70e3ea972725685 Mon Sep 17 00:00:00 2001 From: CI bot Date: Wed, 5 Nov 2014 17:56:30 +0000 Subject: Releasing 12.10.2+15.04.20141105-0ubuntu1 --- debian/changelog | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 899fa03..93626ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -indicator-sound (12.10.2+14.10.20141010-0ubuntu8) UNRELEASED; urgency=medium +indicator-sound (12.10.2+15.04.20141105-0ubuntu1) vivid; urgency=medium + [ Ted Gould ] * Remove various Vala warnings * Show notifications on volume change (LP: #1378564, #1378961) * Warn on high audio levels when using headphones (LP: #1232633, #1373404) @@ -9,7 +10,7 @@ indicator-sound (12.10.2+14.10.20141010-0ubuntu8) UNRELEASED; urgency=medium * Ensure the greeter menu matches whether song metadata should be shown, and update the metadata based on the new setting. (LP: #1358340) - -- Ted Gould Wed, 05 Nov 2014 10:42:12 -0600 + -- Ubuntu daily release Wed, 05 Nov 2014 17:56:29 +0000 indicator-sound (12.10.2+14.10.20141010-0ubuntu1) utopic; urgency=low -- cgit v1.2.3