aboutsummaryrefslogtreecommitdiff
path: root/src/service.vala
diff options
context:
space:
mode:
Diffstat (limited to 'src/service.vala')
-rw-r--r--src/service.vala125
1 files changed, 107 insertions, 18 deletions
diff --git a/src/service.vala b/src/service.vala
index 25a7b18..d4a5bc6 100644
--- a/src/service.vala
+++ b/src/service.vala
@@ -17,9 +17,13 @@
* Lars Uebernickel <lars.uebernickel@canonical.com>
*/
-public class IndicatorSound.Service {
+public class IndicatorSound.Service: Object {
public Service () {
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 () );
this.volume_control = new VolumeControl ();
@@ -34,7 +38,7 @@ public class IndicatorSound.Service {
this.actions.add_action (this.create_mic_volume_action ());
this.menus = new HashTable<string, SoundMenu> (str_hash, str_equal);
- this.menus.insert ("desktop_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.SHOW_MUTE));
+ this.menus.insert ("desktop_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.SHOW_MUTE | SoundMenu.DisplayFlags.HIDE_PLAYERS));
this.menus.insert ("desktop", new SoundMenu ("indicator.desktop-settings", SoundMenu.DisplayFlags.SHOW_MUTE));
this.menus.insert ("phone", new SoundMenu ("indicator.phone-settings", SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS));
@@ -42,9 +46,9 @@ public class IndicatorSound.Service {
this.volume_control.bind_property ("active-mic", menu, "show-mic-volume", BindingFlags.SYNC_CREATE);
});
- this.players.sync (settings.get_strv ("interested-media-players"));
+ this.sync_preferred_players ();
this.settings.changed["interested-media-players"].connect ( () => {
- this.players.sync (settings.get_strv ("interested-media-players"));
+ this.sync_preferred_players ();
});
if (settings.get_boolean ("show-notify-osd-on-scroll")) {
@@ -54,6 +58,8 @@ public class IndicatorSound.Service {
this.notification.set_hint_string ("x-canonical-private-synchronous", "indicator-sound");
}
}
+
+ sharedsettings.bind ("allow-amplified-volume", this, "allow-amplified-volume", SettingsBindFlags.GET);
}
public int run () {
@@ -71,6 +77,27 @@ public class IndicatorSound.Service {
return 0;
}
+ public bool visible { get; set; }
+
+ public bool allow_amplified_volume {
+ get {
+ return this.max_volume > 1.0;
+ }
+
+ set {
+ if (value) {
+ /* from pulse/volume.h: #define PA_VOLUME_UI_MAX (pa_sw_volume_from_dB(+11.0)) */
+ this.max_volume = (double)PulseAudio.Volume.sw_from_dB(11.0) / PulseAudio.Volume.NORM;
+ }
+ else {
+ this.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.get_volume () / this.max_volume);
+ }
+ }
+
const ActionEntry[] action_entries = {
{ "root", null, null, "@a{sv} {}", null },
{ "scroll", activate_scroll_action, "i", null, null },
@@ -82,10 +109,19 @@ public class IndicatorSound.Service {
SimpleActionGroup actions;
HashTable<string, SoundMenu> menus;
Settings settings;
+ Settings sharedsettings;
VolumeControl volume_control;
MediaPlayerList players;
uint player_action_update_id;
+ bool mute_blocks_sound;
+ uint sound_was_blocked_timeout_id;
Notify.Notification notification;
+ bool syncing_preferred_players = false;
+
+ /* Maximum volume as a scaling factor between the volume action's state and the value in
+ * this.volume_control. See create_volume_action().
+ */
+ double max_volume = 1.0;
const double volume_step_percentage = 0.06;
@@ -93,7 +129,7 @@ public class IndicatorSound.Service {
int delta = param.get_int32(); /* positive for up, negative for down */
double v = this.volume_control.get_volume () + volume_step_percentage * delta;
- this.volume_control.set_volume (v.clamp (0.0, 1.0));
+ this.volume_control.set_volume (v.clamp (0.0, this.max_volume));
if (this.notification != null) {
string icon;
@@ -107,7 +143,7 @@ public class IndicatorSound.Service {
icon = "notification-audio-volume-high";
this.notification.update ("indicator-sound", "", icon);
- this.notification.set_hint_int32 ("value", ((int32) (100 * v)).clamp (-1, 101));
+ this.notification.set_hint_int32 ("value", ((int32) (100 * v / this.max_volume)).clamp (-1, 101));
try {
this.notification.show ();
}
@@ -123,7 +159,12 @@ public class IndicatorSound.Service {
if (env == "xubuntu" || env == "ubuntustudio")
cmd = "pavucontrol";
else
- cmd = "gnome-control-center sound";
+ {
+ if (Environment.get_variable ("XDG_CURRENT_DESKTOP") == "Unity" && Environment.find_program_in_path ("unity-control-center") != null)
+ cmd = "unity-control-center sound";
+ else
+ cmd = "gnome-control-center sound";
+ }
try {
Process.spawn_command_line_async (cmd);
@@ -147,7 +188,7 @@ public class IndicatorSound.Service {
double volume = this.volume_control.get_volume ();
string icon;
if (this.volume_control.mute)
- icon = "audio-volume-muted-panel";
+ icon = this.mute_blocks_sound ? "audio-volume-muted-blocking-panel" : "audio-volume-muted-panel";
else if (volume <= 0.0)
icon = "audio-volume-low-zero-panel";
else if (volume <= 0.3)
@@ -170,7 +211,7 @@ public class IndicatorSound.Service {
builder.add ("{sv}", "title", new Variant.string (_("Sound")));
builder.add ("{sv}", "accessible-desc", new Variant.string (accessible_name));
builder.add ("{sv}", "icon", serialize_themed_icon (icon));
- builder.add ("{sv}", "visible", new Variant.boolean (true));
+ builder.add ("{sv}", "visible", new Variant.boolean (this.visible));
root_action.set_state (builder.end());
}
@@ -190,27 +231,65 @@ public class IndicatorSound.Service {
this.update_root_icon ();
});
+ this.volume_control.notify["is-playing"].connect( () => {
+ if (!this.volume_control.mute) {
+ this.mute_blocks_sound = false;
+ return;
+ }
+
+ if (this.volume_control.is_playing) {
+ this.mute_blocks_sound = true;
+ }
+ else if (this.mute_blocks_sound) {
+ /* Continue to show the blocking icon five seconds after a player has tried to play something */
+ if (this.sound_was_blocked_timeout_id > 0)
+ Source.remove (this.sound_was_blocked_timeout_id);
+
+ this.sound_was_blocked_timeout_id = Timeout.add_seconds (5, () => {
+ this.mute_blocks_sound = false;
+ this.sound_was_blocked_timeout_id = 0;
+ this.update_root_icon ();
+ return false;
+ });
+ }
+
+ this.update_root_icon ();
+ });
+
return mute_action;
}
void volume_changed (double volume) {
var volume_action = this.actions.lookup_action ("volume") as SimpleAction;
- volume_action.set_state (new Variant.double (volume));
+
+ /* Normalize volume, because the volume action's state is [0.0, 1.0], see create_volume_action() */
+ volume_action.set_state (new Variant.double (volume / this.max_volume));
this.update_root_icon ();
}
Action create_volume_action () {
- var volume_action = new SimpleAction.stateful ("volume", VariantType.INT32, new Variant.double (this.volume_control.get_volume ()));
+ /* The action's state is between be in [0.0, 1.0] instead of [0.0,
+ * max_volume], so that we don't need to update the slider menu item
+ * every time allow-amplified-volume is changed. Convert between the
+ * two here, so that we always pass the full range into
+ * volume_control.set_volume().
+ */
+
+ double volume = this.volume_control.get_volume () / this.max_volume;
+
+ var volume_action = new SimpleAction.stateful ("volume", VariantType.INT32, new Variant.double (volume));
volume_action.change_state.connect ( (action, val) => {
- volume_control.set_volume (val.get_double ());
+ double v = val.get_double () * this.max_volume;
+ volume_control.set_volume (v.clamp (0.0, this.max_volume));
});
/* activating this action changes the volume by the amount given in the parameter */
volume_action.activate.connect ( (action, param) => {
- double v = volume_control.get_volume () + volume_step_percentage * param.get_int32 ();
- volume_control.set_volume (v.clamp (0.0, 1.0));
+ int delta = param.get_int32 ();
+ double v = volume_control.get_volume () + volume_step_percentage * delta;
+ volume_control.set_volume (v.clamp (0.0, this.max_volume));
});
this.volume_control.volume_changed.connect (volume_changed);
@@ -281,11 +360,21 @@ public class IndicatorSound.Service {
this.player_action_update_id = Idle.add (this.update_player_actions);
}
+
+ void sync_preferred_players () {
+ this.syncing_preferred_players = true;
+ this.players.sync (settings.get_strv ("interested-media-players"));
+ this.syncing_preferred_players = false;
+ }
+
void update_preferred_players () {
- var builder = new VariantBuilder (VariantType.STRING_ARRAY);
- foreach (var player in this.players)
- builder.add ("s", player.id);
- this.settings.set_value ("interested-media-players", builder.end ());
+ /* only write the key if we're not getting this call because we're syncing from the key right now */
+ if (!this.syncing_preferred_players) {
+ var builder = new VariantBuilder (VariantType.STRING_ARRAY);
+ foreach (var player in this.players)
+ builder.add ("s", player.id);
+ this.settings.set_value ("interested-media-players", builder.end ());
+ }
}
void player_added (MediaPlayer player) {
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 04:39:27 +0000