dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use C++17 (#579)

Browse Source 
* Use C++17

* Replace std::random_shuffle with std::shuffle

* Add random include
This commit is contained in:
Jonas Kvinge
2020-11-05 22:28:49 +01:00
committed by GitHub
parent 6272965143
commit 160e4570a2
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/playlist/playlist.cpp
View File

@@ -29,6 +29,7 @@
#include <iterator>
#include <type_traits>
#include <unordered_map>
#include <random>
#include <QtGlobal>
#include <QObject>
@@ -1819,6 +1820,9 @@ void Playlist::ReshuffleIndices() {
if (current_virtual_index_ != -1)
std::advance(begin, current_virtual_index_ + 1);
std::random_device rd;
std::mt19937 g(rd());
switch (playlist_sequence_->shuffle_mode()) {
case PlaylistSequence::Shuffle_Off:
// Handled above.
@@ -1826,7 +1830,7 @@ void Playlist::ReshuffleIndices() {
case PlaylistSequence::Shuffle_All:
case PlaylistSequence::Shuffle_InsideAlbum:
std::random_shuffle(begin, end);
std::shuffle(begin, end, g);
break;
case PlaylistSequence::Shuffle_Albums: {
@@ -1843,7 +1847,7 @@ void Playlist::ReshuffleIndices() {
// Shuffle them
QStringList shuffled_album_keys = album_key_set.values();
std::random_shuffle(shuffled_album_keys.begin(), shuffled_album_keys.end());
std::shuffle(shuffled_album_keys.begin(), shuffled_album_keys.end(), g);
// If the user is currently playing a song, force its album to be first
// Or if the song was not playing but it was selected, force its album to be first.