Merge lp:~larsu/indicator-sound/lp1381069 into lp:indicator-sound/14.10

[Lars Karlitski]

phone menu: hide player controls

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:461
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/158/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-utopic-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-utopic-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-utopic-armhf-ci/25/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-sound-ci/158/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

So I think this should just hide the full player and not the controls:

<rickspencer3> larsu, I don't know specifically what is the correct thing to do, I guess having the currently playing song doesn't make much sense if there are no controls and album art

review: Needs Fixing

[Lars Karlitski (larsu)]

tvoss said he'll fix the media-hub instead. I don't think we'll need to do this at all.

[Ted Gould (ted)]

Marking as WIP for now.

Unmerged revisions

461. By Lars Karlitski on 2014-10-14

phone menu: hide player controls

=== modified file 'src/service.vala'
--- src/service.vala	2014-10-03 14:27:38 +0000
+++ src/service.vala	2014-10-14 14:06:02 +0000
@@ -51,10 +51,24 @@
 		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 | 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 ("phone", new SoundMenu ("indicator.phone-settings", SoundMenu.DisplayFlags.SHOW_SILENT_MODE | 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.SHOW_SILENT_MODE |
+			SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS |
+			SoundMenu.DisplayFlags.HIDE_CONTROLS |
+			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.SHOW_SILENT_MODE |
+			SoundMenu.DisplayFlags.HIDE_CONTROLS |
+			SoundMenu.DisplayFlags.HIDE_INACTIVE_PLAYERS));
 
 		this.menus.@foreach ( (profile, menu) => {
 			this.volume_control.bind_property ("active-mic", menu, "show-mic-volume", BindingFlags.SYNC_CREATE);

=== modified file 'src/sound-menu.vala'
--- src/sound-menu.vala	2014-10-08 01:57:56 +0000
+++ src/sound-menu.vala	2014-10-14 14:06:02 +0000
@@ -25,7 +25,8 @@
 		HIDE_INACTIVE_PLAYERS = 2,
 		HIDE_PLAYERS = 4,
 		GREETER_PLAYERS = 8,
-		SHOW_SILENT_MODE = 16
+		SHOW_SILENT_MODE = 16,
+		HIDE_CONTROLS = 32
 	}
 
 	public SoundMenu (string? settings_action, DisplayFlags flags) {
@@ -67,6 +68,7 @@
 
 		this.hide_players = (flags & DisplayFlags.HIDE_PLAYERS) != 0;
 		this.hide_inactive = (flags & DisplayFlags.HIDE_INACTIVE_PLAYERS) != 0;
+		this.hide_controls = (flags & DisplayFlags.HIDE_CONTROLS) != 0;
 		this.notify_handlers = new HashTable<MediaPlayer, ulong> (direct_hash, direct_equal);
 
 		this.greeter_players = (flags & DisplayFlags.GREETER_PLAYERS) != 0;
@@ -143,6 +145,7 @@
 	bool settings_shown = false;
 	bool hide_inactive;
 	bool hide_players = false;
+	bool hide_controls = false;
 	HashTable<MediaPlayer, ulong> notify_handlers;
 	bool greeter_players = false;
 
@@ -188,12 +191,14 @@
 			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);
-		playback_item.set_attribute ("x-canonical-next-action", "s", "indicator.next." + player.id);
-		playback_item.set_attribute ("x-canonical-previous-action", "s", "indicator.previous." + player.id);
-		section.append_item (playback_item);
+		if (!this.hide_controls) {
+			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);
+			playback_item.set_attribute ("x-canonical-next-action", "s", "indicator.next." + player.id);
+			playback_item.set_attribute ("x-canonical-previous-action", "s", "indicator.previous." + player.id);
+			section.append_item (playback_item);
+		}
 
 		/* Add new players to the end of the player sections, just before the settings */
 		if (settings_shown) {