Merge lp:~xavi-garcia-mena/indicator-sound/bug-1245495-playback-controls-with-playlist into lp:indicator-sound/15.10

[Xavi Garcia]

Fixing the playback controls when we have the playlist as the last item in the player section.
As number of items was 3 when having the playlist section we were not updating the player controls and the next/previous buttons were not working at all.

Fixing the playback controls when we have the playlist as the last item in the player section.
As number of items was 3 when having the playlist section we were not updating the player controls and the next/previous buttons were not working at all.

[Charles Kerr (charlesk)]

This manual indexing in update_player_section() is so ugly. Not new with this patch though :)

In terms of addressing Bug #1245495 with a minimal diff, LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:524
http://jenkins.qa.ubuntu.com/job/indicator-sound-ci/306/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-amd64-ci/81
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/82
        deb: http://jenkins.qa.ubuntu.com/job/indicator-sound-wily-armhf-ci/82/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'src/sound-menu.vala'
--- src/sound-menu.vala	2016-01-07 05:28:51 +0000
+++ src/sound-menu.vala	2016-01-20 17:20:44 +0000
@@ -339,12 +339,13 @@
 
 	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) {
+		if (player_section.get_n_items () == 2 || player_section.get_n_items () == 3) {
 			// we have 2 items, the second one is the playback item
-			// remove it first
+			// if we have 3 items, it means we also have the playlist item.
+			// remove the playbak item first
 			player_section.remove (1);
 			MenuItem playback_item = create_playback_menu_item (player);
-			player_section.append_item (playback_item);
+			player_section.insert_item (1, playback_item);
 		}
 	}