Skip to content

Make random play more random #520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rgobbel wants to merge 2 commits into from
Closed

Make random play more random #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80b4ba2
Added a call to srand(time()) in fischer_yates_shuffle, for real rand…
rgobbel Jan 25, 2021
c115766
Added a call to fischer_yates_shuffle -- SQLite's RAND function is no…
rgobbel Jan 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Slim/Player/Playlist.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,6 +687,9 @@ sub stopAndClear {
}

sub fischer_yates_shuffle {

srand(time()); # make it really random
Copy link
Contributor

@mherger mherger Jan 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We already have a call to srand() in slimserver.pl. Could you please compare results if you added the seed there instead of repeatedly calling srand() here?

Copy link
Member

@michaelherger michaelherger Apr 12, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any results?


my ($listRef) = @_;

if ($#$listRef == -1 || $#$listRef == 0) {
Expand Down
4 changes: 3 additions & 1 deletion Slim/Plugin/RandomPlay/Mixer.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@ sub getRandomYear {
$years = [ Slim::Schema->rs('Track')->search(\%cond, \%attr)->get_column('me.year')->all ];
}

Slim::Player::Playlist::fischer_yates_shuffle($years); # SQLite's RAND function is not very random. This does a better job.
Copy link
Contributor

@mherger mherger Jan 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The you could probably get rid of the sorgin in the query to save a few CPU cycles? Years lists usually aren't long, though 😀 .


my $year = shift @$years;

$cache->set('rnd_years_' . $client->id, $years, 'never');
Expand Down Expand Up @@ -324,4 +326,4 @@ sub playRandom {
}
}

1;
1;