anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

libsaria: Iterate past invisible songs when choosing next 

If the PL_FILTER flag is enabled, then we skip songs that aren't
currenly visible.
This commit is contained in:
Bryan Schumaker 2012-02-21 10:00:22 -05:00
parent c8ad4371d6
commit 9980f53f63
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsaria/library/library.cpp
View File

@ -10,7 +10,7 @@ using namespace std;
#include "library.h"
list<libsaria::LibraryPath> path_list;
libsaria::Playlist lib_playlist(PL_RANDOM | PL_SEQUENTIAL);
libsaria::Playlist lib_playlist(PL_RANDOM | PL_SEQUENTIAL | PL_FILTER);
static map<sid_t, libsaria::Track *> lookup_map;
void library_map_track(libsaria::Track *track)

10
libsaria/playlist/next.cpp
View File

@ -14,7 +14,6 @@ namespace libsaria
void Playlist::sequential_next()
{
sid_t songid;
list<Track *>::iterator it = cur;
do {
@ -23,8 +22,13 @@ namespace libsaria
incr_iter(it);
break;
}
songid = (*it)->get_songid();
} while (!libsaria::index::is_visible(songid));
if (flags & PL_FILTER) {
sid_t songid = (*it)->get_songid();
if (libsaria::index::is_visible(songid))
break;
}
} while (true);
cur = it;
}