From fcd670b657751f51ed1e74724c0314746d6b311b Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Sat, 13 Dec 2014 19:03:00 +0100 Subject: [PATCH 1/3] actions: seek: fix incremental seeking so it doesn't reset aftet 30 seconds --- NEWS | 1 + src/actions.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index d5cb3b0b..3a3958c3 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ ncmpcpp-0.6.2 (????-??-??) * Delete key now aditionally binds by default to action that deletes files in browser. +* Fix incremental seeking so that it doesn't reset after 30 seconds. ncmpcpp-0.6.1 (2014-11-06) diff --git a/src/actions.cpp b/src/actions.cpp index a1c9c678..16a10448 100644 --- a/src/actions.cpp +++ b/src/actions.cpp @@ -2732,7 +2732,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); From 9888c3106ed54276863efedc1692b197329cb8a3 Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Sat, 13 Dec 2014 19:03:39 +0100 Subject: [PATCH 2/3] change version to 0.6.2 --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 3a3958c3..172d2844 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -ncmpcpp-0.6.2 (????-??-??) +ncmpcpp-0.6.2 (2014-12-13) * Delete key now aditionally binds by default to action that deletes files in browser. * Fix incremental seeking so that it doesn't reset after 30 seconds. From af17e7eadf5d3bf3a2f28feccb37611bd69e4509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Dardenne?= Date: Wed, 14 Jan 2015 22:55:03 +0100 Subject: [PATCH 3/3] mpd: fix floating point exception when adding random tags/songs --- NEWS | 4 ++++ src/mpdpp.cpp | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 172d2844..442e252d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,7 @@ +ncmpcpp-0.6.3 (????-??-??) + +* Fix floating point exception when adding a specific number of random items. + ncmpcpp-0.6.2 (2014-12-13) * Delete key now aditionally binds by default to action that deletes files in browser. diff --git a/src/mpdpp.cpp b/src/mpdpp.cpp index 4bcd5aac..b715e0f3 100644 --- a/src/mpdpp.cpp +++ b/src/mpdpp.cpp @@ -505,7 +505,7 @@ bool Connection::AddRandomTag(mpd_tag_type tag, size_t number) else { 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(1); @@ -546,7 +546,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();