aboutsummaryrefslogtreecommitdiff
path: root/src/sound-menu.vala
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2014-03-13 16:14:36 -0500
committerTed Gould <ted@gould.cx>2014-03-13 16:14:36 -0500
commit9d8c46ee62ab13bf21e2b03d0b42193b20e9dafd (patch)
tree8e2869d1bafaefaf95ffdb7c3c0952a63040d854 /src/sound-menu.vala
parentccfe01dbcb292ae482068e03db65400577a46136 (diff)
parentaa729767217df6e3058b439552ba166cef6c6053 (diff)
downloadayatana-indicator-sound-9d8c46ee62ab13bf21e2b03d0b42193b20e9dafd.tar.gz
ayatana-indicator-sound-9d8c46ee62ab13bf21e2b03d0b42193b20e9dafd.tar.bz2
ayatana-indicator-sound-9d8c46ee62ab13bf21e2b03d0b42193b20e9dafd.zip
Merge trunk
Diffstat (limited to 'src/sound-menu.vala')
-rw-r--r--src/sound-menu.vala15
1 files changed, 9 insertions, 6 deletions
diff --git a/src/sound-menu.vala b/src/sound-menu.vala
index ebb7632..e37c4e9 100644
--- a/src/sound-menu.vala
+++ b/src/sound-menu.vala
@@ -23,7 +23,7 @@ public class SoundMenu: Object
NONE = 0,
SHOW_MUTE = 1,
HIDE_INACTIVE_PLAYERS = 2,
- DONT_SHOW_PLAYERS = 4
+ HIDE_PLAYERS = 4
}
public SoundMenu (string? settings_action, DisplayFlags flags) {
@@ -32,8 +32,6 @@ public class SoundMenu: Object
* it has a dynamic amount of player sections, one for each registered player.
*/
- this.no_players = ((flags & DisplayFlags.DONT_SHOW_PLAYERS) != 0);
-
this.volume_section = new Menu ();
if ((flags & DisplayFlags.SHOW_MUTE) != 0)
volume_section.append (_("Mute"), "indicator.mute");
@@ -58,6 +56,7 @@ public class SoundMenu: Object
this.root = new Menu ();
root.append_item (root_item);
+ this.hide_players = (flags & DisplayFlags.HIDE_PLAYERS) != 0;
this.hide_inactive = (flags & DisplayFlags.HIDE_INACTIVE_PLAYERS) != 0;
this.notify_handlers = new HashTable<MediaPlayer, ulong> (direct_hash, direct_equal);
}
@@ -90,8 +89,6 @@ public class SoundMenu: Object
}
public void add_player (MediaPlayer player) {
- if (this.no_players)
- return;
if (this.notify_handlers.contains (player))
return;
@@ -134,7 +131,7 @@ public class SoundMenu: Object
bool mic_volume_shown;
bool settings_shown = false;
bool hide_inactive;
- bool no_players;
+ bool hide_players = false;
HashTable<MediaPlayer, ulong> notify_handlers;
/* returns the position in this.menu of the section that's associated with @player */
@@ -157,6 +154,9 @@ public class SoundMenu: Object
}
void insert_player_section (MediaPlayer player) {
+ if (this.hide_players)
+ return;
+
var section = new Menu ();
Icon icon;
@@ -188,6 +188,9 @@ public class SoundMenu: Object
}
void remove_player_section (MediaPlayer player) {
+ if (this.hide_players)
+ return;
+
int index = this.find_player_section (player);
if (index >= 0)
this.menu.remove (index);