From 5f0d6f3c6d317913d6e3a489d258ce1a6cd37bd1 Mon Sep 17 00:00:00 2001 From: Ivan Sorokin Date: Tue, 21 Oct 2014 12:11:22 +0400 Subject: [PATCH 1/2] Fix incorrect ETA calculation --- src/qtlibtorrent/torrentspeedmonitor.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/qtlibtorrent/torrentspeedmonitor.cpp b/src/qtlibtorrent/torrentspeedmonitor.cpp index 437a28a5b..9375f07f9 100644 --- a/src/qtlibtorrent/torrentspeedmonitor.cpp +++ b/src/qtlibtorrent/torrentspeedmonitor.cpp @@ -141,6 +141,10 @@ qlonglong TorrentSpeedMonitor::getETA(const QString &hash, const libtorrent::tor void TorrentSpeedMonitor::statsReceived(const stats_alert &stats) { - m_samples[misc::toQString(stats.handle.info_hash())].addSample(stats.transferred[stats_alert::download_payload] * 1000 / stats.interval, - stats.transferred[stats_alert::upload_payload] * 1000 / stats.interval); + Q_ASSERT(stats.interval >= 1000); + + int speedDL = static_cast(static_cast(stats.transferred[stats_alert::download_payload]) * 1000 / stats.interval); + int speedUL = static_cast(static_cast(stats.transferred[stats_alert::upload_payload]) * 1000 / stats.interval); + + m_samples[misc::toQString(stats.handle.info_hash())].addSample(speedDL, speedUL); } From 637246c1c78b466dc8b809f161738b901ae4405c Mon Sep 17 00:00:00 2001 From: Ivan Sorokin Date: Tue, 21 Oct 2014 12:12:24 +0400 Subject: [PATCH 2/2] Cleaup includes --- src/qtlibtorrent/torrentspeedmonitor.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/qtlibtorrent/torrentspeedmonitor.cpp b/src/qtlibtorrent/torrentspeedmonitor.cpp index 9375f07f9..f898e4acc 100644 --- a/src/qtlibtorrent/torrentspeedmonitor.cpp +++ b/src/qtlibtorrent/torrentspeedmonitor.cpp @@ -29,8 +29,6 @@ */ #include -#include -#include #include "qbtsession.h" #include "misc.h"