From 68207ed12f5df6eb81b7d3565aed7acc15f82f54 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 23 Sep 2014 10:14:54 -0500 Subject: Build in a way to stop the track information for getting into the player action --- src/service.vala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/service.vala') diff --git a/src/service.vala b/src/service.vala index 4e02769..ae1840a 100644 --- a/src/service.vala +++ b/src/service.vala @@ -379,11 +379,11 @@ public class IndicatorSound.Service: Object { this.loop.quit (); } - Variant action_state_for_player (MediaPlayer player) { + Variant action_state_for_player (MediaPlayer player, bool show_track = true) { var builder = new VariantBuilder (new VariantType ("a{sv}")); builder.add ("{sv}", "running", new Variant ("b", player.is_running)); builder.add ("{sv}", "state", new Variant ("s", player.state)); - if (player.current_track != null) { + if (player.current_track != null && show_track) { builder.add ("{sv}", "title", new Variant ("s", player.current_track.title)); builder.add ("{sv}", "artist", new Variant ("s", player.current_track.artist)); builder.add ("{sv}", "album", new Variant ("s", player.current_track.album)); -- cgit v1.2.3 From 2776b58639225be50bdc3c7961f60b1fd571df29 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 23 Sep 2014 10:19:55 -0500 Subject: Adding in an additional action that is the greeter state --- src/service.vala | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'src/service.vala') diff --git a/src/service.vala b/src/service.vala index ae1840a..d715ff5 100644 --- a/src/service.vala +++ b/src/service.vala @@ -74,6 +74,10 @@ public class IndicatorSound.Service: Object { } } + bool greeter_show_track () { + return false; + } + void build_accountsservice () { clear_acts_player(); this.accounts_service = null; @@ -402,6 +406,12 @@ public class IndicatorSound.Service: Object { action.set_enabled (player.can_raise); } + SimpleAction? greeter_action = this.actions.lookup_action (player.id + ".greeter") as SimpleAction; + if (greeter_action != null) { + greeter_action.set_state (this.action_state_for_player (player, greeter_show_track())); + greeter_action.set_enabled (player.can_raise); + } + /* If we're playing then put that data in accounts service */ if (player.is_running && accounts_service != null) { accounts_service.player = player; @@ -446,6 +456,11 @@ public class IndicatorSound.Service: Object { action.activate.connect ( () => { player.activate (); }); this.actions.add_action (action); + SimpleAction greeter_action = new SimpleAction.stateful (player.id + ".greeter", null, this.action_state_for_player (player, greeter_show_track())); + greeter_action.set_enabled (player.can_raise); + greeter_action.activate.connect ( () => { player.activate (); }); + this.actions.add_action (greeter_action); + var play_action = new SimpleAction.stateful ("play." + player.id, null, player.state); play_action.activate.connect ( () => player.play_pause () ); this.actions.add_action (play_action); -- cgit v1.2.3 From 4b0ce78d9b66ae752d55d3ba7405d6bd3e87408c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 23 Sep 2014 10:32:07 -0500 Subject: Selecting the greeter players for the greeter menus --- src/service.vala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/service.vala') diff --git a/src/service.vala b/src/service.vala index d715ff5..af65b33 100644 --- a/src/service.vala +++ b/src/service.vala @@ -38,8 +38,8 @@ public class IndicatorSound.Service: Object { this.actions.add_action (this.create_mic_volume_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)); - this.menus.insert ("phone_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS)); + this.menus.insert ("desktop_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.SHOW_MUTE | SoundMenu.DisplayFlags.HIDE_PLAYERS | SoundMenu.DisplayFlags.GREETER_PLAYERS)); + this.menus.insert ("phone_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS | SoundMenu.DisplayFlags.GREETER_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)); -- cgit v1.2.3 From 92f7e3b4b41ff61742e42485ff1b7fd27c4ed449 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 23 Sep 2014 11:05:43 -0500 Subject: Drop the GSettings key and change the way we're interacting with the accounts service setting --- src/service.vala | 34 ++++++++-------------------------- 1 file changed, 8 insertions(+), 26 deletions(-) (limited to 'src/service.vala') diff --git a/src/service.vala b/src/service.vala index af65b33..059724a 100644 --- a/src/service.vala +++ b/src/service.vala @@ -47,9 +47,11 @@ public class IndicatorSound.Service: Object { this.volume_control.bind_property ("active-mic", menu, "show-mic-volume", BindingFlags.SYNC_CREATE); }); - /* Setup handling for the greeter-export setting */ - this.settings.changed["greeter-export"].connect( () => this.build_accountsservice() ); - build_accountsservice(); + /* If we're on the greeter, don't export */ + if (GLib.Environment.get_user_name() != "lightdm") { + this.accounts_service = new AccountsServiceUser(); + /* TODO: Watch for setting */ + } this.sync_preferred_players (); this.settings.changed["interested-media-players"].connect ( () => { @@ -75,28 +77,7 @@ public class IndicatorSound.Service: Object { } bool greeter_show_track () { - return false; - } - - void build_accountsservice () { - clear_acts_player(); - this.accounts_service = null; - - /* If we're not exporting, don't build anything */ - if (!this.settings.get_boolean("greeter-export")) { - debug("Accounts service export disabled due to user setting"); - return; - } - - /* If we're on the greeter, don't export */ - if (GLib.Environment.get_user_name() == "lightdm") { - debug("Accounts service export disabled due to being used on the greeter"); - return; - } - - this.accounts_service = new AccountsServiceUser(); - - this.eventually_update_player_actions(); + return export_to_accounts_service; } void clear_acts_player () { @@ -171,6 +152,7 @@ public class IndicatorSound.Service: Object { Notify.Notification notification; bool syncing_preferred_players = false; AccountsServiceUser? accounts_service = null; + bool export_to_accounts_service = false; /* Maximum volume as a scaling factor between the volume action's state and the value in * this.volume_control. See create_volume_action(). @@ -413,7 +395,7 @@ public class IndicatorSound.Service: Object { } /* If we're playing then put that data in accounts service */ - if (player.is_running && accounts_service != null) { + if (player.is_running && export_to_accounts_service && accounts_service != null) { accounts_service.player = player; clear_accounts_player = false; } -- cgit v1.2.3 From bbc0cff3994b65371d2224c6322f04c2fac01556 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 26 Sep 2014 14:25:25 -0500 Subject: Connect to the value in accounts service and update the player if appropriate --- src/service.vala | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/service.vala') diff --git a/src/service.vala b/src/service.vala index 059724a..8287b7f 100644 --- a/src/service.vala +++ b/src/service.vala @@ -50,7 +50,13 @@ public class IndicatorSound.Service: Object { /* If we're on the greeter, don't export */ if (GLib.Environment.get_user_name() != "lightdm") { this.accounts_service = new AccountsServiceUser(); - /* TODO: Watch for setting */ + + this.accounts_service.notify["showDataOnGreeter"].connect(() => { + this.export_to_accounts_service = this.accounts_service.showDataOnGreeter; + eventually_update_player_actions(); + }); + + this.export_to_accounts_service = this.accounts_service.showDataOnGreeter; } this.sync_preferred_players (); -- cgit v1.2.3 From ef4ba155bcb9361e4a856ea35566bbaab8ecf6f1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 2 Oct 2014 09:43:37 -0500 Subject: Use silent mode to determine the icon on the panel --- src/service.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/service.vala') diff --git a/src/service.vala b/src/service.vala index 8287b7f..280c12d 100644 --- a/src/service.vala +++ b/src/service.vala @@ -229,7 +229,7 @@ public class IndicatorSound.Service: Object { void update_root_icon () { double volume = this.volume_control.get_volume (); string icon; - if (this.volume_control.mute) + if (this.volume_control.mute || (this.accounts_service != null && this.accounts_service.silentMode)) 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"; -- cgit v1.2.3 From dab455206972c36d086ae97da776ddd00795899a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 2 Oct 2014 11:12:39 -0500 Subject: Create a silent mode action --- src/service.vala | 54 ++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 42 insertions(+), 12 deletions(-) (limited to 'src/service.vala') diff --git a/src/service.vala b/src/service.vala index 280c12d..d869053 100644 --- a/src/service.vala +++ b/src/service.vala @@ -25,6 +25,18 @@ public class IndicatorSound.Service: Object { this.settings.bind ("visible", this, "visible", SettingsBindFlags.GET); this.notify["visible"].connect ( () => this.update_root_icon () ); + /* If we're on the greeter, don't export */ + if (GLib.Environment.get_user_name() != "lightdm") { + this.accounts_service = new AccountsServiceUser(); + + this.accounts_service.notify["showDataOnGreeter"].connect(() => { + this.export_to_accounts_service = this.accounts_service.showDataOnGreeter; + eventually_update_player_actions(); + }); + + this.export_to_accounts_service = this.accounts_service.showDataOnGreeter; + } + this.volume_control = new VolumeControl (); this.players = playerlist; @@ -33,6 +45,7 @@ public class IndicatorSound.Service: Object { this.actions = new SimpleActionGroup (); this.actions.add_action_entries (action_entries, this); + this.actions.add_action (this.create_silent_mode_action ()); this.actions.add_action (this.create_mute_action ()); this.actions.add_action (this.create_volume_action ()); this.actions.add_action (this.create_mic_volume_action ()); @@ -47,18 +60,6 @@ public class IndicatorSound.Service: Object { this.volume_control.bind_property ("active-mic", menu, "show-mic-volume", BindingFlags.SYNC_CREATE); }); - /* If we're on the greeter, don't export */ - if (GLib.Environment.get_user_name() != "lightdm") { - this.accounts_service = new AccountsServiceUser(); - - this.accounts_service.notify["showDataOnGreeter"].connect(() => { - this.export_to_accounts_service = this.accounts_service.showDataOnGreeter; - eventually_update_player_actions(); - }); - - this.export_to_accounts_service = this.accounts_service.showDataOnGreeter; - } - this.sync_preferred_players (); this.settings.changed["interested-media-players"].connect ( () => { this.sync_preferred_players (); @@ -257,6 +258,35 @@ public class IndicatorSound.Service: Object { root_action.set_state (builder.end()); } + Action create_silent_mode_action () { + bool silentNow = false; + if (this.accounts_service != null) { + silentNow = this.accounts_service.silentMode; + } + + var silent_action = new SimpleAction.stateful ("silent-mode", null, new Variant.boolean (silentNow)); + + /* If we're not dealing with accounts service, we'll just always be out + of silent mode and that's cool. */ + if (this.accounts_service == null) { + return silent_action; + } + + this.accounts_service.notify["silentMode"].connect(() => { + silent_action.set_state(new Variant.boolean(this.accounts_service.silentMode)); + }); + + silent_action.activate.connect ((action, param) => { + action.change_state (new Variant.boolean (!action.get_state().get_boolean())); + }); + + silent_action.change_state.connect ((action, val) => { + this.accounts_service.silentMode = val.get_boolean(); + }); + + return silent_action; + } + Action create_mute_action () { var mute_action = new SimpleAction.stateful ("mute", null, new Variant.boolean (this.volume_control.mute)); -- cgit v1.2.3 From 4f500f48301cbc7140b87034d3e1326a0a3b917a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 2 Oct 2014 11:22:20 -0500 Subject: Pull complex logic into its own function --- src/service.vala | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'src/service.vala') diff --git a/src/service.vala b/src/service.vala index d869053..a78519d 100644 --- a/src/service.vala +++ b/src/service.vala @@ -227,10 +227,26 @@ public class IndicatorSound.Service: Object { return icon.serialize (); } + /* This kinda got complex with both mute and silent mode. So we're + gonna put it into a function */ + bool user_sound_output () { + if (this.volume_control.mute) { + return false; + } + + if (this.accounts_service != null) { + if (this.accounts_service.silentMode) { + return false; + } + } + + return true; + } + void update_root_icon () { double volume = this.volume_control.get_volume (); string icon; - if (this.volume_control.mute || (this.accounts_service != null && this.accounts_service.silentMode)) + if (!user_sound_output()) 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"; @@ -242,7 +258,7 @@ public class IndicatorSound.Service: Object { icon = "audio-volume-high-panel"; string accessible_name; - if (this.volume_control.mute) { + if (!user_sound_output()) { accessible_name = _("Volume (muted)"); } else { int volume_int = (int)(volume * 100); @@ -274,6 +290,7 @@ public class IndicatorSound.Service: Object { this.accounts_service.notify["silentMode"].connect(() => { silent_action.set_state(new Variant.boolean(this.accounts_service.silentMode)); + this.update_root_icon (); }); silent_action.activate.connect ((action, param) => { -- cgit v1.2.3 From 4b6d204d6cc5d193d6400b14acb520296dfb7d96 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 2 Oct 2014 11:24:54 -0500 Subject: Add a silent mode menu item --- src/service.vala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/service.vala') diff --git a/src/service.vala b/src/service.vala index a78519d..8711b6a 100644 --- a/src/service.vala +++ b/src/service.vala @@ -52,9 +52,9 @@ public class IndicatorSound.Service: Object { 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)); - this.menus.insert ("phone_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS | SoundMenu.DisplayFlags.GREETER_PLAYERS)); + this.menus.insert ("phone_greeter", new SoundMenu (null, SoundMenu.DisplayFlags.SHOW_SILENT_MODE | SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS | SoundMenu.DisplayFlags.GREETER_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)); + this.menus.insert ("phone", new SoundMenu ("indicator.phone-settings", SoundMenu.DisplayFlags.SHOW_SILENT_MODE | SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS)); this.menus.@foreach ( (profile, menu) => { this.volume_control.bind_property ("active-mic", menu, "show-mic-volume", BindingFlags.SYNC_CREATE); -- cgit v1.2.3 From af38d9e73aeca412a11b6b8e59039042375ed335 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 2 Oct 2014 16:18:21 -0500 Subject: Build the volume control first --- src/service.vala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/service.vala') diff --git a/src/service.vala b/src/service.vala index 8711b6a..18f283b 100644 --- a/src/service.vala +++ b/src/service.vala @@ -25,6 +25,8 @@ public class IndicatorSound.Service: Object { this.settings.bind ("visible", this, "visible", SettingsBindFlags.GET); this.notify["visible"].connect ( () => this.update_root_icon () ); + this.volume_control = new VolumeControl (); + /* If we're on the greeter, don't export */ if (GLib.Environment.get_user_name() != "lightdm") { this.accounts_service = new AccountsServiceUser(); @@ -37,8 +39,6 @@ public class IndicatorSound.Service: Object { this.export_to_accounts_service = this.accounts_service.showDataOnGreeter; } - this.volume_control = new VolumeControl (); - this.players = playerlist; this.players.player_added.connect (this.player_added); this.players.player_removed.connect (this.player_removed); -- cgit v1.2.3 From 9e1ec4502a70a6e91a9de96a96e26388b99e811b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 3 Oct 2014 09:27:38 -0500 Subject: Don't represent silent mode in the indicator --- src/service.vala | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'src/service.vala') diff --git a/src/service.vala b/src/service.vala index 18f283b..2a65492 100644 --- a/src/service.vala +++ b/src/service.vala @@ -227,26 +227,10 @@ public class IndicatorSound.Service: Object { return icon.serialize (); } - /* This kinda got complex with both mute and silent mode. So we're - gonna put it into a function */ - bool user_sound_output () { - if (this.volume_control.mute) { - return false; - } - - if (this.accounts_service != null) { - if (this.accounts_service.silentMode) { - return false; - } - } - - return true; - } - void update_root_icon () { double volume = this.volume_control.get_volume (); string icon; - if (!user_sound_output()) + if (this.volume_control.mute) 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"; @@ -258,7 +242,7 @@ public class IndicatorSound.Service: Object { icon = "audio-volume-high-panel"; string accessible_name; - if (!user_sound_output()) { + if (this.volume_control.mute) { accessible_name = _("Volume (muted)"); } else { int volume_int = (int)(volume * 100); -- cgit v1.2.3