oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix for priority order bug if reordering in SetRandom()

Browse Source 
Fix for the problem where order with priorities gets out of whack in case it's
reordered by SetRandom() while another song is currently playing.
What happens is, if some song is already playing and you have set some
priorities before switching on the random mode, and then turn the mode on, the
original code swaps position of the first song in the order (i.e., the highest
priority song) with current, so that current is 0 (which it should be). The
problem is, the "original" first song then goes to the place "current" song was
after reordering, wherever that is, instead of going after the "current" song.
This patch fixes the issue.
Also the fix makes MoveOrder() public, because why shouldn't it be, anyway.  It
certainly makes more sense than just having SwapOrders() public for some
reason.

Signed-off-by: Eugene Baklanov <miltenfiremage@gmail.com>
This commit is contained in:
Eugene Baklanov 2016-11-12 08:11:14 +07:00 committed by Max Kellermann
parent f445a13051
commit bd14afe347
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/queue/Playlist.cxx
View File

@ -310,7 +310,7 @@ playlist::SetRandom(PlayerControl &pc, bool status)
playlist is played after that */
unsigned current_order =
queue.PositionToOrder(current_position);
queue.SwapOrders(0, current_order);
queue.MoveOrder(current_order, 0);
current = 0;
} else
current = -1;

10
src/queue/Queue.hxx
View File

@ -282,6 +282,11 @@ struct Queue {
std::swap(order[order1], order[order2]);
}
/**
* Moves a song to a new position in the "order" list.
*/
void MoveOrder(unsigned from_order, unsigned to_order);
/**
* Moves a song to a new position.
*/
@ -350,11 +355,6 @@ struct Queue {
uint8_t priority, int after_order);
private:
/**
* Moves a song to a new position in the "order" list.
*/
void MoveOrder(unsigned from_order, unsigned to_order);
void MoveItemTo(unsigned from, unsigned to) {
unsigned from_id = items[from].id;