Merge lp:~vikoadi/noise/fix-getNext into lp:~elementary-apps/noise/trunk

[Viko Adi Rahmawan]

- Fix crash on playing next media
- fix _current not getting filtered

[Victor Martinez (victored)]

Looks good. I'm still not sure if there are any bad side effects when using get_search_result instead of get_media (gotta check with Corentin), but limiting the playback to the current search results makes sense :)

review: Approve

[Viko Adi Rahmawan (vikoadi)]

I was wrong, using get_search_result doesn't take column view or album view into account...

[Viko Adi Rahmawan (vikoadi)]

CMIIW, but after some further research I found that its neither get_medias nor get_search_result that we want, but get_visible_media from Noise.ListView and a comparable function on GridView

Some possible options that i can think are:
1. write a fucntion which will return Collection of media with the same album as last played media on GridView and use those function to get_visible_media
2. save list of _current and restore it on start
3. revert rev1778 and reopen bug1253758 and do 1 or 2 in other commit
4. revert rev1778 and reopen bug1253758 wait for carl's code to land in trunk and work on it

i prefer option 3 or 4 as currently playing a song then press next on shuffle mode give

ERROR:linkedlist.c:1014:gee_linked_list_real_get: assertion failed: (index < this._size)
Aborted

Unmerged revisions

1782. By Viko Adi Rahmawan on 2015-03-13

clear on previous too

1781. By Viko Adi Rahmawan on 2015-03-13

fix crash on getNext and filtering

=== modified file 'src/PlaybackManager.vala'
--- src/PlaybackManager.vala	2015-03-10 00:20:38 +0000
+++ src/PlaybackManager.vala	2015-03-13 04:15:54 +0000
@@ -277,8 +277,9 @@
             rv = poll_queue();
             _playing_queued_song = true;
         } else if (main_settings.shuffle_mode != Noise.Settings.Shuffle.OFF) {
-            if (_current_shuffled.is_empty ) {
-                foreach (Media s in library.get_medias ())
+            if (_current_shuffled.is_empty) {
+                clearCurrent ();
+                foreach (Media s in library.get_search_result ())
                     addToCurrent (s);    //first initialize the current selection the reshuffle it
                 reshuffle ();
             }
@@ -369,7 +370,7 @@
                 
                 rv = _current.get (_current_index);
             } else {
-                foreach (Media s in library.get_medias ()) {
+                foreach (Media s in library.get_search_result ()) {
                     addToCurrent(s);
                 }
                 
@@ -392,7 +393,8 @@
         var main_settings = Settings.Main.get_default ();
         if(main_settings.shuffle_mode != Noise.Settings.Shuffle.OFF) {
             if (_current_shuffled.is_empty)
-                foreach (Media s in library.get_medias ())
+                _current.clear ();
+                foreach (Media s in library.get_search_result ())
                     addToCurrent (s);    //first initialize the current selection the reshuffle it
                 reshuffle ();
             _playing_queued_song = false;
@@ -458,7 +460,7 @@
                 
                 rv = _current.get(_current_index);
             } else {
-                foreach(Media s in library.get_medias ())
+                foreach(Media s in library.get_search_result ())
                     addToCurrent(s);
                 
                 _current_index = _current.size - 1;