From 8d981b26459b98189ab3200a23d75ecd0294fb2b Mon Sep 17 00:00:00 2001 From: Xavi Garcia Mena Date: Tue, 10 Nov 2015 14:56:02 +0100 Subject: Restore code to allow amplified volume --- src/service.vala | 26 ++++++++++++++++++++++++++ src/volume-control.vala | 3 ++- 2 files changed, 28 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/service.vala b/src/service.vala index a08edf3..1173194 100644 --- a/src/service.vala +++ b/src/service.vala @@ -47,6 +47,7 @@ public class IndicatorSound.Service: Object { () => { debug("Notifications name vanshed"); notify_server_caps_checked = false; }); this.settings = new Settings ("com.canonical.indicator.sound"); + this.sharedsettings = new Settings ("com.ubuntu.sound"); this.settings.bind ("visible", this, "visible", SettingsBindFlags.GET); this.notify["visible"].connect ( () => this.update_root_icon () ); @@ -95,6 +96,8 @@ public class IndicatorSound.Service: Object { this.sync_preferred_players (); }); + sharedsettings.bind ("allow-amplified-volume", this, "allow-amplified-volume", SettingsBindFlags.GET); + /* Hide the notification when the menu is shown */ var shown_action = actions.lookup_action ("indicator-shown") as SimpleAction; shown_action.change_state.connect ((state) => { @@ -173,6 +176,28 @@ public class IndicatorSound.Service: Object { public bool visible { get; set; } + public bool allow_amplified_volume { + get { + return this.volume_control.max_volume > 1.0; + } + + set { + if (this.allow_amplified_volume == value) + return; + + if (value) { + /* from pulse/volume.h: #define PA_VOLUME_UI_MAX (pa_sw_volume_from_dB(+11.0)) */ + this.volume_control.max_volume = (double)PulseAudio.Volume.sw_from_dB(11.0) / PulseAudio.Volume.NORM; + } + else { + this.volume_control.max_volume = 1.0; + } + + /* Normalize volume, because the volume action's state is [0.0, 1.0], see create_volume_action() */ + this.actions.change_action_state ("volume", this.volume_control.volume.volume / this.volume_control.max_volume); + } + } + const ActionEntry[] action_entries = { { "root", null, null, "@a{sv} {}", null }, { "scroll", activate_scroll_action, "i", null, null }, @@ -184,6 +209,7 @@ public class IndicatorSound.Service: Object { SimpleActionGroup actions; HashTable menus; Settings settings; + Settings sharedsettings; VolumeControl volume_control; MediaPlayerList players; uint player_action_update_id; diff --git a/src/volume-control.vala b/src/volume-control.vala index 6efac35..2f12b7f 100644 --- a/src/volume-control.vala +++ b/src/volume-control.vala @@ -40,9 +40,10 @@ public abstract class VolumeControl : Object public virtual bool mute { get { return false; } } public virtual bool is_playing { get { return false; } } private Volume _volume; + private double _max_volume = 1.0; public virtual Volume volume { get { return _volume; } set { } } public virtual double mic_volume { get { return 0.0; } set { } } - public virtual double max_volume { get { return 1.0; } protected set { } } + public virtual double max_volume { get { return _max_volume; } set { _max_volume = value;} } public virtual bool high_volume_approved { get { return false; } protected set { } } public virtual void approve_high_volume() { } -- cgit v1.2.3 From 7c69f81a079a08d58241cc50365dde7d37ad3345 Mon Sep 17 00:00:00 2001 From: Xavi Garcia Mena Date: Tue, 1 Dec 2015 12:22:00 +0100 Subject: Added action to sync volume with UI --- src/service.vala | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/service.vala b/src/service.vala index 985d434..8f90547 100644 --- a/src/service.vala +++ b/src/service.vala @@ -40,7 +40,11 @@ public class IndicatorSound.Service: Object { warn_notification.set_hint ("x-canonical-non-shaped-icon", "true"); warn_notification.set_hint ("x-canonical-snap-decisions", "true"); warn_notification.set_hint ("x-canonical-private-affirmative-tint", "true"); - warn_notification.closed.connect((n) => { n.clear_actions(); waiting_user_approve_warn=false; }); + warn_notification.closed.connect((n) => { + n.clear_actions(); + waiting_user_approve_warn=false; + volume_sync_action.set_state(volume_sync_number_++); + }); BusWatcher.watch_namespace (GLib.BusType.SESSION, "org.freedesktop.Notifications", () => { debug("Notifications name appeared"); }, @@ -77,6 +81,7 @@ public class IndicatorSound.Service: Object { this.actions.add_action (this.create_volume_action ()); this.actions.add_action (this.create_mic_volume_action ()); this.actions.add_action (this.create_high_volume_action ()); + this.actions.add_action (this.create_volume_sync_action ()); this.menus = new HashTable (str_hash, str_equal); this.menus.insert ("desktop_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.SHOW_MUTE | SoundMenu.DisplayFlags.HIDE_PLAYERS | SoundMenu.DisplayFlags.GREETER_PLAYERS)); @@ -634,6 +639,7 @@ public class IndicatorSound.Service: Object { warn_notification.add_action ("cancel", _("Cancel"), (n, a) => { _pre_warn_volume = null; waiting_user_approve_warn = false; + volume_sync_action.set_state(volume_sync_number_++); }); waiting_user_approve_warn = true; show_notification(warn_notification); @@ -818,6 +824,14 @@ public class IndicatorSound.Service: Object { return high_volume_action; } + SimpleAction volume_sync_action; + uint64 volume_sync_number_ = 0; + Action create_volume_sync_action () { + volume_sync_action = new SimpleAction.stateful("volume-sync", null, new Variant.uint64 (volume_sync_number_)); + + return volume_sync_action; + } + uint export_actions = 0; Variant action_state_for_player (MediaPlayer player, bool show_track = true) { -- cgit v1.2.3 From d9a00604c1d8e3103444053da39a4af17230903b Mon Sep 17 00:00:00 2001 From: Xavi Garcia Mena Date: Wed, 2 Dec 2015 14:44:58 +0100 Subject: Added integration tests --- src/service.vala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/service.vala b/src/service.vala index 8f90547..3ac6b89 100644 --- a/src/service.vala +++ b/src/service.vala @@ -43,7 +43,7 @@ public class IndicatorSound.Service: Object { warn_notification.closed.connect((n) => { n.clear_actions(); waiting_user_approve_warn=false; - volume_sync_action.set_state(volume_sync_number_++); + volume_sync_action.set_state(new Variant.uint64 (++volume_sync_number_)); }); BusWatcher.watch_namespace (GLib.BusType.SESSION, "org.freedesktop.Notifications", @@ -639,7 +639,7 @@ public class IndicatorSound.Service: Object { warn_notification.add_action ("cancel", _("Cancel"), (n, a) => { _pre_warn_volume = null; waiting_user_approve_warn = false; - volume_sync_action.set_state(volume_sync_number_++); + volume_sync_action.set_state(new Variant.uint64 (++volume_sync_number_)); }); waiting_user_approve_warn = true; show_notification(warn_notification); @@ -827,7 +827,7 @@ public class IndicatorSound.Service: Object { SimpleAction volume_sync_action; uint64 volume_sync_number_ = 0; Action create_volume_sync_action () { - volume_sync_action = new SimpleAction.stateful("volume-sync", null, new Variant.uint64 (volume_sync_number_)); + volume_sync_action = new SimpleAction.stateful("volume-sync", VariantType.UINT64, new Variant.uint64 (volume_sync_number_)); return volume_sync_action; } -- cgit v1.2.3 From c61e4c4f2c5e24f374c0d6e3c90c318443403c94 Mon Sep 17 00:00:00 2001 From: Xavi Garcia Mena Date: Wed, 2 Dec 2015 17:19:19 +0100 Subject: Changes after review. Method to increment sync counter and integration test changed --- src/service.vala | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/service.vala b/src/service.vala index 3ac6b89..923aba2 100644 --- a/src/service.vala +++ b/src/service.vala @@ -43,7 +43,7 @@ public class IndicatorSound.Service: Object { warn_notification.closed.connect((n) => { n.clear_actions(); waiting_user_approve_warn=false; - volume_sync_action.set_state(new Variant.uint64 (++volume_sync_number_)); + increment_volume_sync_action(); }); BusWatcher.watch_namespace (GLib.BusType.SESSION, "org.freedesktop.Notifications", @@ -639,7 +639,7 @@ public class IndicatorSound.Service: Object { warn_notification.add_action ("cancel", _("Cancel"), (n, a) => { _pre_warn_volume = null; waiting_user_approve_warn = false; - volume_sync_action.set_state(new Variant.uint64 (++volume_sync_number_)); + increment_volume_sync_action(); }); waiting_user_approve_warn = true; show_notification(warn_notification); @@ -832,6 +832,10 @@ public class IndicatorSound.Service: Object { return volume_sync_action; } + void increment_volume_sync_action () { + volume_sync_action.set_state(new Variant.uint64 (++volume_sync_number_)); + } + uint export_actions = 0; Variant action_state_for_player (MediaPlayer player, bool show_track = true) { -- cgit v1.2.3 From 7ec5db7e050505bbcb04a70edacec4075389a2df Mon Sep 17 00:00:00 2001 From: Xavi Garcia Mena Date: Fri, 4 Dec 2015 11:46:27 +0100 Subject: Setting user selected volume when pressing OK in the high volume dialog --- src/service.vala | 12 +++++++----- src/volume-control.vala | 6 ++++++ 2 files changed, 13 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/service.vala b/src/service.vala index 923aba2..312fec5 100644 --- a/src/service.vala +++ b/src/service.vala @@ -629,11 +629,13 @@ public class IndicatorSound.Service: Object { warn_notification.add_action ("ok", _("OK"), (n, a) => { stop_clamp_to_high_timeout(); volume_control.approve_high_volume (); - if (_pre_warn_volume != null) { - var tmp = _pre_warn_volume; - _pre_warn_volume = null; - volume_control.volume = tmp; - } + // restore the volume the user introduced + VolumeControl.Volume vol = new VolumeControl.Volume(); + vol.volume = volume_control.get_pre_clamped_volume(); + vol.reason = VolumeControl.VolumeReasons.USER_KEYPRESS; + _pre_warn_volume = null; + volume_control.volume = vol; + waiting_user_approve_warn = false; }); warn_notification.add_action ("cancel", _("Cancel"), (n, a) => { diff --git a/src/volume-control.vala b/src/volume-control.vala index 30dcfcf..7117990 100644 --- a/src/volume-control.vala +++ b/src/volume-control.vala @@ -54,6 +54,7 @@ public abstract class VolumeControl : Object public virtual bool is_playing { get { return false; } } public virtual VolumeControl.ActiveOutput active_output { get { return VolumeControl.ActiveOutput.SPEAKERS; } } 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 { } } public virtual double max_volume { get { return 1.0; } protected set { } } @@ -70,6 +71,11 @@ public abstract class VolumeControl : Object v.volume = unclamped.clamp (0.0, this.max_volume); v.reason = reason; this.volume = v; + _pre_clamp_volume = unclamped; + } + + public double get_pre_clamped_volume () { + return _pre_clamp_volume; } public signal void active_output_changed (VolumeControl.ActiveOutput active_output); -- cgit v1.2.3 From 762a2ea0e5e65ae32fbe0ba40cb6f6b88cc186fa Mon Sep 17 00:00:00 2001 From: Xavi Garcia Mena Date: Wed, 9 Dec 2015 15:17:55 +0100 Subject: Added attibute to volume slider to define the sync action --- src/sound-menu.vala | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/sound-menu.vala b/src/sound-menu.vala index 3d682e4..686d3c1 100644 --- a/src/sound-menu.vala +++ b/src/sound-menu.vala @@ -46,7 +46,7 @@ public class SoundMenu: Object volume_section.append_item (this.create_slider_menu_item (_("Volume"), "indicator.volume(0)", 0.0, 1.0, 0.01, "audio-volume-low-zero-panel", - "audio-volume-high-panel")); + "audio-volume-high-panel", true)); this.menu = new Menu (); this.menu.append_section (null, volume_section); @@ -101,7 +101,7 @@ public class SoundMenu: Object if (value && !this.mic_volume_shown) { var slider = this.create_slider_menu_item (_("Microphone Volume"), "indicator.mic-volume", 0.0, 1.0, 0.01, "audio-input-microphone-low-zero-panel", - "audio-input-microphone-high-panel"); + "audio-input-microphone-high-panel", false); volume_section.append_item (slider); this.mic_volume_shown = true; } @@ -227,7 +227,7 @@ public class SoundMenu: Object this.volume_section.remove (index); this.volume_section.insert_item (index, this.create_slider_menu_item (_(label), "indicator.volume(0)", 0.0, 1.0, 0.01, "audio-volume-low-zero-panel", - "audio-volume-high-panel")); + "audio-volume-high-panel", true)); } } @@ -386,7 +386,7 @@ public class SoundMenu: Object } } - MenuItem create_slider_menu_item (string label, string action, double min, double max, double step, string min_icon_name, string max_icon_name) { + MenuItem create_slider_menu_item (string label, string action, double min, double max, double step, string min_icon_name, string max_icon_name, bool sync_action) { var min_icon = new ThemedIcon.with_default_fallbacks (min_icon_name); var max_icon = new ThemedIcon.with_default_fallbacks (max_icon_name); @@ -397,6 +397,9 @@ public class SoundMenu: Object slider.set_attribute ("min-value", "d", min); slider.set_attribute ("max-value", "d", max); slider.set_attribute ("step", "d", step); + if (sync_action) { + slider.set_attribute ("x-canonical-sync-action", "s", "volume-sync"); + } return slider; } -- cgit v1.2.3 From 9d6bd882beefde88eb25e24c4a9090f7828d155b Mon Sep 17 00:00:00 2001 From: Xavi Garcia Mena Date: Wed, 9 Dec 2015 18:37:13 +0100 Subject: Added indicator. prefix to volume sync attibute --- src/sound-menu.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/sound-menu.vala b/src/sound-menu.vala index 686d3c1..bdb8df2 100644 --- a/src/sound-menu.vala +++ b/src/sound-menu.vala @@ -398,7 +398,7 @@ public class SoundMenu: Object slider.set_attribute ("max-value", "d", max); slider.set_attribute ("step", "d", step); if (sync_action) { - slider.set_attribute ("x-canonical-sync-action", "s", "volume-sync"); + slider.set_attribute ("x-canonical-sync-action", "s", "indicator.volume-sync"); } return slider; -- cgit v1.2.3 From 292592932ea18777ad15b3b0c07d17047781cde8 Mon Sep 17 00:00:00 2001 From: Xavi Garcia Mena Date: Mon, 14 Dec 2015 18:09:24 +0100 Subject: rolling back lp:~xavi-garcia-mena/indicator-sound/bug-1512798-reenable-amplified-volume --- src/service.vala | 26 -------------------------- src/sound-menu.vala | 2 +- src/volume-control.vala | 3 +-- 3 files changed, 2 insertions(+), 29 deletions(-) (limited to 'src') diff --git a/src/service.vala b/src/service.vala index 9127f05..312fec5 100644 --- a/src/service.vala +++ b/src/service.vala @@ -51,7 +51,6 @@ public class IndicatorSound.Service: Object { () => { debug("Notifications name vanshed"); notify_server_caps_checked = false; }); this.settings = new Settings ("com.canonical.indicator.sound"); - this.sharedsettings = new Settings ("com.ubuntu.sound"); this.settings.bind ("visible", this, "visible", SettingsBindFlags.GET); this.notify["visible"].connect ( () => this.update_root_icon () ); @@ -107,8 +106,6 @@ public class IndicatorSound.Service: Object { this.sync_preferred_players (); }); - sharedsettings.bind ("allow-amplified-volume", this, "allow-amplified-volume", SettingsBindFlags.GET); - /* Hide the notification when the menu is shown */ var shown_action = actions.lookup_action ("indicator-shown") as SimpleAction; shown_action.change_state.connect ((state) => { @@ -187,28 +184,6 @@ public class IndicatorSound.Service: Object { public bool visible { get; set; } - public bool allow_amplified_volume { - get { - return this.volume_control.max_volume > 1.0; - } - - set { - if (this.allow_amplified_volume == value) - return; - - if (value) { - /* from pulse/volume.h: #define PA_VOLUME_UI_MAX (pa_sw_volume_from_dB(+11.0)) */ - this.volume_control.max_volume = (double)PulseAudio.Volume.sw_from_dB(11.0) / PulseAudio.Volume.NORM; - } - else { - this.volume_control.max_volume = 1.0; - } - - /* Normalize volume, because the volume action's state is [0.0, 1.0], see create_volume_action() */ - this.actions.change_action_state ("volume", this.volume_control.volume.volume / this.volume_control.max_volume); - } - } - const ActionEntry[] action_entries = { { "root", null, null, "@a{sv} {}", null }, { "scroll", activate_scroll_action, "i", null, null }, @@ -220,7 +195,6 @@ public class IndicatorSound.Service: Object { SimpleActionGroup actions; HashTable menus; Settings settings; - Settings sharedsettings; VolumeControl volume_control; MediaPlayerList players; uint player_action_update_id; diff --git a/src/sound-menu.vala b/src/sound-menu.vala index bdb8df2..686d3c1 100644 --- a/src/sound-menu.vala +++ b/src/sound-menu.vala @@ -398,7 +398,7 @@ public class SoundMenu: Object slider.set_attribute ("max-value", "d", max); slider.set_attribute ("step", "d", step); if (sync_action) { - slider.set_attribute ("x-canonical-sync-action", "s", "indicator.volume-sync"); + slider.set_attribute ("x-canonical-sync-action", "s", "volume-sync"); } return slider; diff --git a/src/volume-control.vala b/src/volume-control.vala index 3431ac3..7117990 100644 --- a/src/volume-control.vala +++ b/src/volume-control.vala @@ -55,10 +55,9 @@ public abstract class VolumeControl : Object public virtual VolumeControl.ActiveOutput active_output { get { return VolumeControl.ActiveOutput.SPEAKERS; } } private Volume _volume; private double _pre_clamp_volume; - private double _max_volume = 1.0; public virtual Volume volume { get { return _volume; } set { } } public virtual double mic_volume { get { return 0.0; } set { } } - public virtual double max_volume { get { return _max_volume; } set { _max_volume = value;} } + public virtual double max_volume { get { return 1.0; } protected set { } } public virtual bool high_volume_approved { get { return false; } protected set { } } public virtual void approve_high_volume() { } -- cgit v1.2.3 From 76c581299cafed21839f64dc9e90d768ffbd2ead Mon Sep 17 00:00:00 2001 From: Xavi Garcia Mena Date: Mon, 14 Dec 2015 18:10:57 +0100 Subject: Re-adding indicator.volume-sync --- src/sound-menu.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/sound-menu.vala b/src/sound-menu.vala index 686d3c1..bdb8df2 100644 --- a/src/sound-menu.vala +++ b/src/sound-menu.vala @@ -398,7 +398,7 @@ public class SoundMenu: Object slider.set_attribute ("max-value", "d", max); slider.set_attribute ("step", "d", step); if (sync_action) { - slider.set_attribute ("x-canonical-sync-action", "s", "volume-sync"); + slider.set_attribute ("x-canonical-sync-action", "s", "indicator.volume-sync"); } return slider; -- cgit v1.2.3 From 7e7f4af3361d7275cb360db0e3dbff3aac569ebe Mon Sep 17 00:00:00 2001 From: Xavi Garcia Mena Date: Thu, 17 Dec 2015 12:07:05 +0100 Subject: Maroon in trouble and other games changing the volume in sink and changing role workaround --- src/volume-control-pulse.vala | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/volume-control-pulse.vala b/src/volume-control-pulse.vala index 66b6ba4..3791f29 100644 --- a/src/volume-control-pulse.vala +++ b/src/volume-control-pulse.vala @@ -344,7 +344,10 @@ public class VolumeControlPulse : VolumeControl var vol = new VolumeControl.Volume(); vol.volume = volume_to_double (lvolume); vol.reason = VolumeControl.VolumeReasons.PULSE_CHANGE; - this.volume = vol; + // Ignore changes from PULSE to avoid issues with + // some apps that change the volume in the sink + // We only take into account volume changes from the user + //this.volume = vol; } } } @@ -388,7 +391,10 @@ public class VolumeControlPulse : VolumeControl var vol = new VolumeControl.Volume(); vol.volume = volume_to_double (volume); vol.reason = VolumeControl.VolumeReasons.VOLUME_STREAM_CHANGE; - this.volume = vol; + // Ignore changes from PULSE to avoid issues with + // some apps that change the volume in the sink + // We only take into account volume changes from the user + //this.volume = vol; } catch (GLib.Error e) { warning ("unable to get volume for active role %s (%s)", sink_input_objp, e.message); } -- cgit v1.2.3 From 093d3198061540ce76b2f526926cdbb6c929bcd8 Mon Sep 17 00:00:00 2001 From: Xavi Garcia Mena Date: Thu, 17 Dec 2015 18:03:27 +0100 Subject: Added workaround for Maroon in Trouble, second option --- src/service.vala | 7 ++++--- src/volume-control-pulse.vala | 18 ++++++++++++++++-- src/volume-control.vala | 1 + 3 files changed, 21 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/service.vala b/src/service.vala index 312fec5..0a7e108 100644 --- a/src/service.vala +++ b/src/service.vala @@ -611,9 +611,11 @@ public class IndicatorSound.Service: Object { notify_server_caps_checked = true; var loud = volume_control.high_volume; + bool ignore_warning_this_time = this.volume_control.ignore_high_volume; var warn = loud && this.notify_server_supports_actions - && !this.volume_control.high_volume_approved; + && !this.volume_control.high_volume_approved + && !ignore_warning_this_time; if (waiting_user_approve_warn && volume_control.below_warning_volume) { volume_control.set_warning_volume(); close_notification(warn_notification); @@ -649,8 +651,7 @@ public class IndicatorSound.Service: Object { if (!waiting_user_approve_warn) { close_notification(warn_notification); - if (notify_server_supports_sync && !block_info_notifications) { - + if (notify_server_supports_sync && !block_info_notifications && !ignore_warning_this_time) { /* Determine Label */ string volume_label = get_notification_label (); diff --git a/src/volume-control-pulse.vala b/src/volume-control-pulse.vala index 3791f29..4bd3076 100644 --- a/src/volume-control-pulse.vala +++ b/src/volume-control-pulse.vala @@ -42,6 +42,7 @@ public class VolumeControlPulse : VolumeControl private PulseAudio.Context context; private bool _mute = true; private bool _is_playing = false; + private bool _ignore_warning_this_time = false; private VolumeControl.Volume _volume = new VolumeControl.Volume(); private double _mic_volume = 0.0; private Settings _settings = new Settings ("com.canonical.indicator.sound"); @@ -347,7 +348,8 @@ public class VolumeControlPulse : VolumeControl // Ignore changes from PULSE to avoid issues with // some apps that change the volume in the sink // We only take into account volume changes from the user - //this.volume = vol; + this._ignore_warning_this_time = true; + this.volume = vol; } } } @@ -394,7 +396,8 @@ public class VolumeControlPulse : VolumeControl // Ignore changes from PULSE to avoid issues with // some apps that change the volume in the sink // We only take into account volume changes from the user - //this.volume = vol; + this._ignore_warning_this_time = true; + this.volume = vol; } catch (GLib.Error e) { warning ("unable to get volume for active role %s (%s)", sink_input_objp, e.message); } @@ -747,6 +750,17 @@ public class VolumeControlPulse : VolumeControl private bool _warning_volume_enabled; private double _warning_volume_norms; /* 1.0 == PA_VOLUME_NORM */ private bool _high_volume = false; + public override bool ignore_high_volume { + get { + if (_ignore_warning_this_time) { + warning("Ignore"); + _ignore_warning_this_time = false; + return true; + } + return false; + } + set { } + } public override bool high_volume { get { return this._high_volume; } private set { this._high_volume = value; } diff --git a/src/volume-control.vala b/src/volume-control.vala index 7117990..90fc325 100644 --- a/src/volume-control.vala +++ b/src/volume-control.vala @@ -49,6 +49,7 @@ public abstract class VolumeControl : Object public virtual bool ready { get { return false; } set { } } public virtual bool active_mic { get { return false; } set { } } public virtual bool high_volume { get { return false; } protected set { } } + public virtual bool ignore_high_volume { get { return false; } protected set { } } public virtual bool below_warning_volume { get { return false; } protected set { } } public virtual bool mute { get { return false; } } public virtual bool is_playing { get { return false; } } -- cgit v1.2.3