reapack

commit c599b87bc445875eb77b9574a90337f86196f764
parent 9b2a1a7455b16714d713eacb8f4733fa0220517c
Author: cfillion <cfillion@users.noreply.github.com>
Date:   Mon,  6 Feb 2017 00:47:06 -0500

download: remove unused progress calculation

Diffstat:
M
src/download.cpp
 | 
26
++------------------------
M
src/download.hpp
 | 
3
---

2 files changed, 2 insertions(+), 27 deletions(-)
diff --git a/src/download.cpp b/src/download.cpp
@@ -73,21 +73,14 @@ size_t Download::WriteData(char *ptr, size_t rawsize, size_t nmemb, void *data)
   return size;
 }
 
-int Download::UpdateProgress(void *ptr, const double dltotal, const double dlnow,
-    const double ultotal, const double ulnow)
+int Download::UpdateProgress(void *ptr, const double, const double,
+    const double, const double)
 {
   Download *dl = static_cast<Download *>(ptr);
 
   if(dl->isAborted())
     return 1;
 
-  const double total = ultotal + dltotal;
-
-  if(total > 0) {
-    const short progress = (short)((ulnow + dlnow / total) * 100);
-    dl->setProgress(min(progress, (short)100));
-  }
-
   return 0;
 }
 
@@ -110,14 +103,6 @@ void Download::reset()
   m_state = Idle;
   m_aborted = false;
   m_contents.clear();
-  m_progress = 0;
-}
-
-void Download::setProgress(const short percent)
-{
-  WDL_MutexLock lock(&m_mutex);
-
-  m_progress = percent;
 }
 
 void Download::finish(const State state, const string &contents)
@@ -153,13 +138,6 @@ bool Download::isAborted()
   return m_aborted;
 }
 
-short Download::progress()
-{
-  WDL_MutexLock lock(&m_mutex);
-
-  return m_progress;
-}
-
 void Download::start()
 {
   DownloadThread *thread = new DownloadThread;
diff --git a/src/download.hpp b/src/download.hpp
@@ -66,7 +66,6 @@ public:
   State state() const { return m_state; }
   const std::string &contents() { return m_contents; }
   bool isAborted();
-  short progress();
 
   void onStart(const VoidSignal::slot_type &slot) { m_onStart.connect(slot); }
   void onFinish(const VoidSignal::slot_type &slot) { m_onFinish.connect(slot); }
@@ -81,7 +80,6 @@ private:
   static size_t WriteData(char *, size_t, size_t, void *);
   static int UpdateProgress(void *, double, double, double, double);
 
-  void setProgress(short);
   void finish(const State state, const std::string &contents);
   void reset();
 
@@ -95,7 +93,6 @@ private:
   State m_state;
   bool m_aborted;
   std::string m_contents;
-  short m_progress;
 
   VoidSignal m_onStart;
   VoidSignal m_onFinish;