aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2015-02-27 22:36:27 +0000
committerCI Train Bot <ci-train-bot@canonical.com>2015-02-27 22:36:27 +0000
commit43aff706de5bb4541055732cd148bb6a19003e0a (patch)
treea65adb6acbd198c7a1eaf8cef615fdd2d8aa3e22
parentcf091c3e612c41dc8e430f6029e7a6ec62a8f703 (diff)
parenta62851aca74cf6cf12d19a65576a3ca1492d7297 (diff)
downloadayatana-indicator-sound-43aff706de5bb4541055732cd148bb6a19003e0a.tar.gz
ayatana-indicator-sound-43aff706de5bb4541055732cd148bb6a19003e0a.tar.bz2
ayatana-indicator-sound-43aff706de5bb4541055732cd148bb6a19003e0a.zip
Check stream when looking at high volume Fixes: #1418032
Approved by: Charles Kerr, PS Jenkins bot
-rw-r--r--src/volume-control-pulse.vala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/volume-control-pulse.vala b/src/volume-control-pulse.vala
index 403acec..76368f2 100644
--- a/src/volume-control-pulse.vala
+++ b/src/volume-control-pulse.vala
@@ -57,7 +57,7 @@ public class VolumeControlPulse : VolumeControl
public override string stream {
get {
if (_active_sink_input < 0 || _active_sink_input >= _valid_roles.length)
- return "multimedia";
+ return "alert";
else
return _valid_roles[_active_sink_input];
}
@@ -87,7 +87,7 @@ public class VolumeControlPulse : VolumeControl
/** true when high volume warnings should be shown */
public override bool high_volume {
get {
- return this._volume.volume > 0.75 && _active_port_headphone;
+ return this._volume.volume > 0.75 && _active_port_headphone && stream == "multimedia";
}
}