improved stream support

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@157 90c681e8-e032-0410-971d-27865f9a5e38

1 files changed, 3 insertions, 9 deletions

diff --git a/lib/streamreader.cpp b/lib/streamreader.cpp
index d43f8c4f8..30bb9c3a7 100644
--- a/lib/streamreader.cpp
+++ b/lib/streamreader.cpp
@@ -28,6 +28,7 @@ StreamReader::StreamReader(const QString &name, QObject *parent)
 {
     m_downloader = new Downloader(this, name);
     connect(m_downloader, SIGNAL(titleChanged()),SLOT(updateTitle()));
+    connect(m_downloader, SIGNAL(readyRead()), SIGNAL(readyRead()));
 }
 
 StreamReader::~StreamReader()
@@ -70,9 +71,9 @@ bool StreamReader::open ( OpenMode mode )
 {
     if (mode != QIODevice::ReadOnly)
         return FALSE;
-    downloadFile();
+    //downloadFile();
     setOpenMode(QIODevice::ReadOnly);
-    if (m_downloader->isRunning())
+    if (m_downloader->isRunning() && m_downloader->isReady())
         return TRUE;
     else
         return FALSE;
@@ -119,14 +120,7 @@ qint64 StreamReader::writeData(const char*, qint64)
 
 void StreamReader::downloadFile()
 {
-    qDebug("StreamReader: buffering...");
     m_downloader->start();
-    while (m_downloader->bytesAvailable () < BUFFER_SIZE*0.5 && m_downloader->isRunning ())
-    {
-        qApp->processEvents();
-        //sleep(1);
-    }
-    qDebug("StreamReader: ready");
 }
 
 void StreamReader::updateTitle()