aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/service.vala2
-rw-r--r--src/volume-control-pulse.vala8
-rw-r--r--src/volume-control.vala1
-rw-r--r--src/volume-warning.vala2
4 files changed, 2 insertions, 11 deletions
diff --git a/src/service.vala b/src/service.vala
index a333c19..51f5cb6 100644
--- a/src/service.vala
+++ b/src/service.vala
@@ -624,7 +624,7 @@ public class IndicatorSound.Service: Object {
&& !_volume_warning.high_volume_approved
&& !ignore_warning_this_time;
if (_volume_warning.active && !_options.is_loud(volume_control.volume)) {
- volume_control.set_warning_volume();
+ _volume_warning.set_warning_volume();
close_notification(warn_notification);
}
if (warn) {
diff --git a/src/volume-control-pulse.vala b/src/volume-control-pulse.vala
index 82c4791..8c09a6b 100644
--- a/src/volume-control-pulse.vala
+++ b/src/volume-control-pulse.vala
@@ -728,14 +728,6 @@ public class VolumeControlPulse : VolumeControl
}
}
- public override void set_warning_volume() {
- var vol = new VolumeControl.Volume();
- vol.volume = volume_to_double(_options.loud_volume());
- vol.reason = _volume.reason;
- debug("Setting warning level volume from %f down to %f", _volume.volume, vol.volume);
- volume = vol;
- }
-
/** MIC VOLUME PROPERTY */
public override double mic_volume {
diff --git a/src/volume-control.vala b/src/volume-control.vala
index 1b4288c..e59997c 100644
--- a/src/volume-control.vala
+++ b/src/volume-control.vala
@@ -64,7 +64,6 @@ public abstract class VolumeControl : Object
public virtual double mic_volume { get { return 0.0; } set { } }
public virtual void clamp_to_high_volume() { }
- public virtual void set_warning_volume() { }
public abstract void set_mute (bool mute);
diff --git a/src/volume-warning.vala b/src/volume-warning.vala
index 2a8c79f..2851f4b 100644
--- a/src/volume-warning.vala
+++ b/src/volume-warning.vala
@@ -682,7 +682,7 @@ public class VolumeWarning : VolumeControl
}
}
- public override void set_warning_volume() {
+ public void set_warning_volume() {
var vol = new VolumeControl.Volume();
vol.volume = volume_to_double(_options.loud_volume());
vol.reason = _volume.reason;