Merge branch '0.6.x'
Conflicts: NEWS src/mpdpp.cpp
This commit is contained in:
@@ -2623,7 +2623,7 @@ void seek()
|
||||
Status::trace();
|
||||
|
||||
unsigned howmuch = Config.incremental_seeking
|
||||
? (Timer-t).seconds()/2+Config.seek_time
|
||||
? (Timer-t).total_seconds()/2+Config.seek_time
|
||||
: Config.seek_time;
|
||||
|
||||
Key input = Key::read(*wFooter);
|
||||
|
||||
@@ -531,7 +531,7 @@ bool Connection::AddRandomTag(mpd_tag_type tag, size_t number)
|
||||
return false;
|
||||
|
||||
std::random_shuffle(tags.begin(), tags.end());
|
||||
auto it = tags.begin()+rand()%(tags.size()-number);
|
||||
auto it = tags.begin();
|
||||
for (size_t i = 0; i < number && it != tags.end(); ++i)
|
||||
{
|
||||
StartSearch(true);
|
||||
@@ -571,7 +571,7 @@ bool Connection::AddRandomSongs(size_t number)
|
||||
{
|
||||
std::random_shuffle(files.begin(), files.end());
|
||||
StartCommandsList();
|
||||
auto it = files.begin()+rand()%(std::max(size_t(1), files.size()-number));
|
||||
auto it = files.begin();
|
||||
for (size_t i = 0; i < number && it != files.end(); ++i, ++it)
|
||||
AddSong(*it);
|
||||
CommitCommandsList();
|
||||
|
||||
Reference in New Issue
Block a user