Noise

Merge lp:~marcus-lundgren/noise/add-playlist-badge-listener-refactored into lp:~elementary-apps/noise/trunk

  1. add-playlist-badge-listener-refactored
  2. Merge into trunk
Proposed by Marcus Lundgren
Status: Merged
Merged at revision: 1292
Proposed branch: lp:~marcus-lundgren/noise/add-playlist-badge-listener-refactored
Merge into: lp:~elementary-apps/noise/trunk
Diff against target: 38 lines (+8/-6)
1 file modified
src/LibraryWindow.vala (+8/-6)
To merge this branch: bzr merge lp:~marcus-lundgren/noise/add-playlist-badge-listener-refactored
Reviewer Review Type Date Requested Status
Corentin Noël Approve
Review via email: mp+146298@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Corentin Noël (tintou) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/LibraryWindow.vala'
2--- src/LibraryWindow.vala 2013-02-03 01:03:51 +0000
3+++ src/LibraryWindow.vala 2013-02-03 11:05:25 +0000
4@@ -698,6 +698,12 @@
5
6 }
7
8+ public void update_badge_on_playlist_update (Playlist p, SourceListEntry entry) {
9+ match_playlist_entry.set (p, entry);
10+ p.media_added.connect((s) => { update_playlist_badge (p); });
11+ p.media_removed.connect((s) => { update_playlist_badge (p); });
12+ }
13+
14 private void update_playlist_badge (Playlist playlist) {
15 var entry = match_playlist_entry.get (playlist);
16 int media_count = playlist.medias.size;
17@@ -726,9 +732,7 @@
18 view_number = view_container.add_view (queue_view);
19 entry = source_list_view.add_item (view_number, App.player.queue_playlist.name,
20 ViewWrapper.Hint.READ_ONLY_PLAYLIST, Icons.MUSIC.gicon);
21- match_playlist_entry.set (p, entry);
22- p.media_added.connect(() => { update_playlist_badge (p); });
23- p.media_removed.connect(() => { update_playlist_badge (p); });
24+ update_badge_on_playlist_update (p, entry);
25 set_treeviewsetup_from_playlist (App.player.queue_playlist, library_manager.queue_setup);
26 } else if (p.name == _("History")) {
27 var history_view = new ReadOnlyPlaylistViewWrapper (App.player.history_playlist.rowid);
28@@ -743,9 +747,7 @@
29 view_number = view_container.add_view (view);
30 entry = source_list_view.add_item (view_number, p.name, ViewWrapper.Hint.READ_ONLY_PLAYLIST, Icons.PLAYLIST.gicon);
31 if (p.show_badge == true) {
32- match_playlist_entry.set (p, entry);
33- p.media_added.connect((s) => { update_playlist_badge (p); });
34- p.media_removed.connect((s) => { update_playlist_badge (p); });
35+ update_badge_on_playlist_update (p, entry);
36 }
37 }
38 }

Subscribers

People subscribed via source and target branches