summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar waker <wakeroid@gmail.com>2010-12-15 21:59:15 +0100
committerGravatar waker <wakeroid@gmail.com>2010-12-15 21:59:15 +0100
commit62a8c05579b9b36c22fb9870fefea88aedbcafcf (patch)
treee0a21338dd63030acb31e614b61ca8d49792a3eb
parent0e2f01f377362d85ec02cc4ce2b1d9eb67fd1845 (diff)
shuffle albums now takes artist into consideration too
-rw-r--r--playlist.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/playlist.c b/playlist.c
index c399c56a..e36a2317 100644
--- a/playlist.c
+++ b/playlist.c
@@ -1648,7 +1648,7 @@ plt_insert_item (playlist_t *playlist, playItem_t *after, playItem_t *it) {
// shuffle
playItem_t *prev = it->prev[PL_MAIN];
- if (pl_order == PLAYBACK_ORDER_SHUFFLE_ALBUMS && prev && pl_find_meta (prev, "album") == pl_find_meta (it, "album")) {
+ if (pl_order == PLAYBACK_ORDER_SHUFFLE_ALBUMS && prev && pl_find_meta (prev, "album") == pl_find_meta (it, "album") && pl_find_meta (prev, "artist") == pl_find_meta (it, "artist")) {
it->shufflerating = prev->shufflerating;
}
else {
@@ -2420,7 +2420,7 @@ plt_reshuffle (playlist_t *playlist, playItem_t **ppmin, playItem_t **ppmax) {
playItem_t *pmax = NULL;
playItem_t *prev = NULL;
for (playItem_t *it = playlist->head[PL_MAIN]; it; it = it->next[PL_MAIN]) {
- if (pl_order == PLAYBACK_ORDER_SHUFFLE_ALBUMS && prev && pl_find_meta (prev, "album") == pl_find_meta (it, "album")) {
+ if (pl_order == PLAYBACK_ORDER_SHUFFLE_ALBUMS && prev && pl_find_meta (prev, "album") == pl_find_meta (it, "album") && pl_find_meta (prev, "artist") == pl_find_meta (it, "artist")) {
it->shufflerating = prev->shufflerating;
}
else {