From b89c60239ccd27cefae91db88cadc1ff239ae2ed Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Tue, 8 Dec 2009 18:05:58 +0000
Subject: fixed buffering message

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@1430 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Transports/http/downloader.cpp   | 2 +-
 src/plugins/Transports/http/downloader.h     | 3 +--
 src/plugins/Transports/http/streamreader.cpp | 4 +---
 src/plugins/Transports/http/streamreader.h   | 1 -
 4 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'src/plugins/Transports')

diff --git a/src/plugins/Transports/http/downloader.cpp b/src/plugins/Transports/http/downloader.cpp
index 06653fde9..e47eeb4b9 100644
--- a/src/plugins/Transports/http/downloader.cpp
+++ b/src/plugins/Transports/http/downloader.cpp
@@ -303,7 +303,7 @@ void Downloader::checkBuffer()
     }
     else if (!m_ready)
     {
-        emit bufferingProgress(100 * m_stream.buf_fill / BUFFER_SIZE);
+        StateHandler::instance()->dispatchBuffer(100 * m_stream.buf_fill / BUFFER_SIZE);
         qApp->processEvents();
     }
 
diff --git a/src/plugins/Transports/http/downloader.h b/src/plugins/Transports/http/downloader.h
index 0ac96786d..34f046b66 100644
--- a/src/plugins/Transports/http/downloader.h
+++ b/src/plugins/Transports/http/downloader.h
@@ -27,7 +27,7 @@
 
 #include <curl/curl.h>
 
-#define BUFFER_SIZE 128000 
+#define BUFFER_SIZE 128000
 
 /*! @internal
  *   @author Ilya Kotov <forkotov02@hotmail.ru>
@@ -65,7 +65,6 @@ public:
 
 signals:
     void readyRead();
-    void bufferingProgress(int);
 
 private:
     qint64 readBuffer(char* data, qint64 maxlen);
diff --git a/src/plugins/Transports/http/streamreader.cpp b/src/plugins/Transports/http/streamreader.cpp
index 5d61c76d1..f6a9cba0c 100644
--- a/src/plugins/Transports/http/streamreader.cpp
+++ b/src/plugins/Transports/http/streamreader.cpp
@@ -19,7 +19,6 @@
  ***************************************************************************/
 #include <QApplication>
 #include <QUrl>
-
 #include "downloader.h"
 #include "streamreader.h"
 
@@ -28,13 +27,12 @@ StreamReader::StreamReader(const QString &name, QObject *parent)
 {
     m_downloader = new Downloader(this, name);
     connect(m_downloader, SIGNAL(readyRead()), SIGNAL(readyRead()));
-    connect(m_downloader, SIGNAL(bufferingProgress(int)), SIGNAL(bufferingProgress(int)));
 }
 
 StreamReader::~StreamReader()
 {
     m_downloader->abort();
-    qDebug("StreamReader::~StreamReader()");
+    qDebug("%s", Q_FUNC_INFO);
 }
 
 bool StreamReader::atEnd () const
diff --git a/src/plugins/Transports/http/streamreader.h b/src/plugins/Transports/http/streamreader.h
index e73f65389..4a8fcb169 100644
--- a/src/plugins/Transports/http/streamreader.h
+++ b/src/plugins/Transports/http/streamreader.h
@@ -64,7 +64,6 @@ public:
 
 signals:
     void readyRead();
-    void bufferingProgress(int);
 
 protected:
     qint64 readData(char*, qint64);
-- 
cgit v1.2.3-13-gbd6f