use random() instead of rand()
git-svn-id: https://svn.musicpd.org/mpd/trunk@2420 09075e82-0dd4-0310-85a5-a0d7c8717e4f
This commit is contained in:
parent
fb2c5f5d5f
commit
38ade145bc
@ -177,7 +177,7 @@ void initPlaylist() {
|
|||||||
|
|
||||||
memset(playlist.songs,0,sizeof(char *)*playlist_max_length);
|
memset(playlist.songs,0,sizeof(char *)*playlist_max_length);
|
||||||
|
|
||||||
srand(time(NULL));
|
srandom(time(NULL));
|
||||||
|
|
||||||
playlist_stateFile = parseConfigFilePath(CONF_STATE_FILE, 0);
|
playlist_stateFile = parseConfigFilePath(CONF_STATE_FILE, 0);
|
||||||
|
|
||||||
@ -643,7 +643,7 @@ int addSongToPlaylist(FILE * fp, Song * song) {
|
|||||||
else */if(playlist.queued>=0) start = playlist.queued+1;
|
else */if(playlist.queued>=0) start = playlist.queued+1;
|
||||||
else start = playlist.current+1;
|
else start = playlist.current+1;
|
||||||
if(start < playlist.length) {
|
if(start < playlist.length) {
|
||||||
swap = rand()%(playlist.length-start);
|
swap = random()%(playlist.length-start);
|
||||||
swap+=start;
|
swap+=start;
|
||||||
swapOrder(playlist.length-1,swap);
|
swapOrder(playlist.length-1,swap);
|
||||||
}
|
}
|
||||||
@ -1137,7 +1137,7 @@ void randomizeOrder(int start,int end) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for(i=start;i<=end;i++) {
|
for(i=start;i<=end;i++) {
|
||||||
ri = rand()%(end-start+1)+start;
|
ri = random()%(end-start+1)+start;
|
||||||
if(ri==playlist.current) playlist.current = i;
|
if(ri==playlist.current) playlist.current = i;
|
||||||
else if(i==playlist.current) playlist.current = ri;
|
else if(i==playlist.current) playlist.current = ri;
|
||||||
swapOrder(i,ri);
|
swapOrder(i,ri);
|
||||||
@ -1228,7 +1228,7 @@ int shufflePlaylist(FILE * fp) {
|
|||||||
}
|
}
|
||||||
/* shuffle the rest of the list */
|
/* shuffle the rest of the list */
|
||||||
for(;i<playlist.length;i++) {
|
for(;i<playlist.length;i++) {
|
||||||
ri = rand()%(playlist.length-1)+1;
|
ri = random()%(playlist.length-1)+1;
|
||||||
swapSongs(i,ri);
|
swapSongs(i,ri);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user