diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/service.vala | 2 | ||||
| -rw-r--r-- | src/sound-menu.vala | 89 |
2 files changed, 64 insertions, 27 deletions
diff --git a/src/service.vala b/src/service.vala index 29b8670..2228ba2 100644 --- a/src/service.vala +++ b/src/service.vala @@ -94,7 +94,7 @@ public class IndicatorSound.Service: Object { this.menus = new HashTable<string, SoundMenu> (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.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 ("desktop", new SoundMenu ("indicator.desktop-settings", SoundMenu.DisplayFlags.SHOW_MUTE | SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS_PLAY_CONTROLS)); this.menus.insert ("phone", new SoundMenu ("indicator.phone-settings", SoundMenu.DisplayFlags.SHOW_SILENT_MODE | SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS)); this.menus.@foreach ( (profile, menu) => { diff --git a/src/sound-menu.vala b/src/sound-menu.vala index 604e484..896b7d2 100644 --- a/src/sound-menu.vala +++ b/src/sound-menu.vala @@ -25,9 +25,18 @@ public class SoundMenu: Object HIDE_INACTIVE_PLAYERS = 2, HIDE_PLAYERS = 4, GREETER_PLAYERS = 8, - SHOW_SILENT_MODE = 16 + SHOW_SILENT_MODE = 16, + HIDE_INACTIVE_PLAYERS_PLAY_CONTROLS = 32 } + public enum PlayerSectionPosistion { + LABEL = 0, + PLAYER_CONTROLS = 1, + PLAYLIST = 2 + } + + const string PLAYBACK_ITEM_TYPE = "com.canonical.unity.playback-item"; + public SoundMenu (string? settings_action, DisplayFlags flags) { /* A sound menu always has at least two sections: the volume section (this.volume_section) * at the start of the menu, and the settings section at the end. Between those two, @@ -68,6 +77,7 @@ public class SoundMenu: Object this.hide_players = (flags & DisplayFlags.HIDE_PLAYERS) != 0; this.hide_inactive = (flags & DisplayFlags.HIDE_INACTIVE_PLAYERS) != 0; + this.hide_inactive_player_controls = (flags & DisplayFlags.HIDE_INACTIVE_PLAYERS_PLAY_CONTROLS) != 0; this.notify_handlers = new HashTable<MediaPlayer, ulong> (direct_hash, direct_equal); this.greeter_players = (flags & DisplayFlags.GREETER_PLAYERS) != 0; @@ -148,6 +158,15 @@ public class SoundMenu: Object return -1; } + public void update_all_players_play_section() { + foreach (var player_stored in notify_handlers.get_keys ()) { + int index = this.find_player_section(player_stored); + if (index != -1) { + // just update to verify if we must hide the player controls + update_player_section (player_stored, index); + } + } + } public void add_player (MediaPlayer player) { if (this.notify_handlers.contains (player)) @@ -158,21 +177,32 @@ public class SoundMenu: Object this.update_playlists (player); var handler_id = player.notify["is-running"].connect ( () => { + int index = this.find_player_section(player); if (player.is_running) { - int index = this.find_player_section(player); if (index == -1) { this.insert_player_section (player); } else { update_player_section (player, index); } + number_of_running_players++; } else { + number_of_running_players--; if (this.hide_inactive) this.remove_player_section (player); + else { + if (index != -1) { + // just update to verify if we must hide the player controls + update_player_section (player, index); + } + } } - this.update_playlists (player); + + // we need to update the rest of players, because we might have + // a non running player still showing the playback controls + update_all_players_play_section(); }); this.notify_handlers.insert (player, handler_id); @@ -239,8 +269,10 @@ public class SoundMenu: Object bool high_volume_warning_shown = false; bool hide_inactive; bool hide_players = false; + bool hide_inactive_player_controls = false; HashTable<MediaPlayer, ulong> notify_handlers; bool greeter_players = false; + int number_of_running_players = 0; /* returns the position in this.menu of the section that's associated with @player */ int find_player_section (MediaPlayer player) { @@ -261,6 +293,18 @@ public class SoundMenu: Object return -1; } + int find_player_playback_controls_section (Menu player_menu) { + int n = player_menu.get_n_items (); + for (int i = 0; i < n; i++) { + string type; + player_menu.get_item_attribute (i, "x-canonical-type", "s", out type); + if (type == PLAYBACK_ITEM_TYPE) + return i; + } + + return -1; + } + MenuItem create_playback_menu_item (MediaPlayer player) { var playback_item = new MenuItem (null, null); playback_item.set_attribute ("x-canonical-type", "s", "com.canonical.unity.playback-item"); @@ -301,24 +345,10 @@ public class SoundMenu: Object player_item.set_attribute_value ("icon", icon.serialize ()); section.append_item (player_item); - var playback_item = new MenuItem (null, null); - playback_item.set_attribute ("x-canonical-type", "s", "com.canonical.unity.playback-item"); - playback_item.set_attribute ("x-canonical-play-action", "s", "indicator.play." + player.id + ".disabled"); - playback_item.set_attribute ("x-canonical-next-action", "s", "indicator.next." + player.id + ".disabled"); - playback_item.set_attribute ("x-canonical-previous-action", "s", "indicator.previous." + player.id + ".disabled"); - - if (player.is_running) { - if (player.can_do_play) { - playback_item.set_attribute ("x-canonical-play-action", "s", "indicator.play." + player.id); - } - if (player.can_do_next) { - playback_item.set_attribute ("x-canonical-next-action", "s", "indicator.next." + player.id); - } - if (player.can_do_prev) { - playback_item.set_attribute ("x-canonical-previous-action", "s", "indicator.previous." + player.id); - } + var playback_item = create_playback_menu_item (player); + if (player.is_running|| !this.hide_inactive_player_controls) { + section.insert_item (PlayerSectionPosistion.PLAYER_CONTROLS, playback_item); } - section.append_item (playback_item); /* Add new players to the end of the player sections, just before the settings */ if (settings_shown) { @@ -339,13 +369,20 @@ public class SoundMenu: Object void update_player_section (MediaPlayer player, int index) { var player_section = this.menu.get_item_link(index, Menu.LINK_SECTION) as Menu; - if (player_section.get_n_items () == 2 || player_section.get_n_items () == 3) { - // we have 2 items, the second one is the playback item - // if we have 3 items, it means we also have the playlist item. - // remove the playbak item first - player_section.remove (1); + + int play_control_index = find_player_playback_controls_section (player_section); + if (player.is_running || !this.hide_inactive_player_controls) { MenuItem playback_item = create_playback_menu_item (player); - player_section.insert_item (1, playback_item); + if (play_control_index != -1) { + player_section.remove (PlayerSectionPosistion.PLAYER_CONTROLS); + } + player_section.insert_item (PlayerSectionPosistion.PLAYER_CONTROLS, playback_item); + } else { + if (play_control_index != -1 && number_of_running_players >= 1) { + // remove both, playlist and play controls + player_section.remove (PlayerSectionPosistion.PLAYLIST); + player_section.remove (PlayerSectionPosistion.PLAYER_CONTROLS); + } } } |