6 files changed, 21 insertions, 68 deletions

diff --git a/src/plugins/Transports/mms/downloader.cpp b/src/plugins/Transports/mms/downloader.cpp
index a3c1abd5a..9acdcb813 100644
--- a/src/plugins/Transports/mms/downloader.cpp
+++ b/src/plugins/Transports/mms/downloader.cpp
@@ -148,7 +148,7 @@ void Downloader::checkBuffer()
         QMap<Qmmp::MetaData, QString> metaData;
         metaData.insert(Qmmp::URL, m_url);
         StateHandler::instance()->dispatch(metaData);
-        emit readyRead();
+        emit ready();
     }
     else if (!m_ready)
     {
diff --git a/src/plugins/Transports/mms/downloader.h b/src/plugins/Transports/mms/downloader.h
index 0a6d237a9..bfab9e24b 100644
--- a/src/plugins/Transports/mms/downloader.h
+++ b/src/plugins/Transports/mms/downloader.h
@@ -49,7 +49,7 @@ public:
     bool isReady();
 
 signals:
-    void readyRead();
+    void ready();
 
 private:
     QMutex m_mutex;
diff --git a/src/plugins/Transports/mms/mmsinputsource.cpp b/src/plugins/Transports/mms/mmsinputsource.cpp
index a8120899f..10f9e6983 100644
--- a/src/plugins/Transports/mms/mmsinputsource.cpp
+++ b/src/plugins/Transports/mms/mmsinputsource.cpp
@@ -24,7 +24,7 @@
 MMSInputSource::MMSInputSource(const QString &url, QObject *parent) : InputSource(url,parent)
 {
     m_reader = new StreamReader(url, this);
-    connect(m_reader, SIGNAL(readyRead()),SLOT(open()));
+    connect(m_reader, SIGNAL(ready()),SLOT(ready()));
 }
 
 QIODevice *MMSInputSource::ioDevice()
@@ -48,8 +48,3 @@ QString  MMSInputSource::contentType() const
     return "audio/x-ms-wma";
 }
 
-void MMSInputSource::open()
-{
-    m_reader->open(QIODevice::ReadOnly);
-    emit(ready(this));
-}
diff --git a/src/plugins/Transports/mms/mmsinputsource.h b/src/plugins/Transports/mms/mmsinputsource.h
index d8695b7c2..c4e7bce67 100644
--- a/src/plugins/Transports/mms/mmsinputsource.h
+++ b/src/plugins/Transports/mms/mmsinputsource.h
@@ -39,9 +39,6 @@ public:
     bool isReady();
     QString contentType() const;
 
-private slots:
-    void open();
-
 private:
     StreamReader *m_reader;
 
diff --git a/src/plugins/Transports/mms/streamreader.cpp b/src/plugins/Transports/mms/streamreader.cpp
index ca99d7991..951238e0e 100644
--- a/src/plugins/Transports/mms/streamreader.cpp
+++ b/src/plugins/Transports/mms/streamreader.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2010 by Ilya Kotov                                      *
+ *   Copyright (C) 2006-2008 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -26,7 +26,7 @@ StreamReader::StreamReader(const QString &name, QObject *parent)
         : QIODevice(parent)
 {
     m_downloader = new Downloader(this, name);
-    connect(m_downloader, SIGNAL(readyRead()), SIGNAL(readyRead()));
+    connect(m_downloader, SIGNAL(ready()), SIGNAL(ready()));
 }
 
 StreamReader::~StreamReader()
@@ -50,14 +50,10 @@ qint64 StreamReader::bytesToWrite () const
     return -1;
 }
 
-bool StreamReader::canReadLine () const
-{
-    return false;
-}
-
 void StreamReader::close ()
 {
     m_downloader->abort();
+    QIODevice::close();
 }
 
 bool StreamReader::isSequential () const
@@ -65,49 +61,20 @@ bool StreamReader::isSequential () const
     return true;
 }
 
-bool StreamReader::open ( OpenMode mode )
+bool StreamReader::open (OpenMode mode)
 {
     if (mode != QIODevice::ReadOnly)
         return false;
-    //downloadFile();
-    setOpenMode(QIODevice::ReadOnly);
-    if (m_downloader->isReady())
-        return true;
-    else
-        return false;
+    QIODevice::open(mode);
+    return m_downloader->isReady();
 }
 
-bool StreamReader::reset ()
+bool StreamReader::seek (qint64 pos)
 {
-    QIODevice::reset();
-    return true;
-}
-
-bool StreamReader::seek ( qint64 pos )
-{
-    QIODevice::seek(pos);
+    Q_UNUSED(pos);
     return false;
 }
 
-qint64 StreamReader::size () const
-{
-    return bytesAvailable ();
-}
-
-bool StreamReader::waitForBytesWritten (int msecs)
-{
-    Q_UNUSED(msecs);
-    //usleep(msecs*1000);
-    return true;
-}
-
-bool StreamReader::waitForReadyRead (int msecs)
-{
-    Q_UNUSED(msecs);
-    //usleep(msecs*1000);
-    return true;
-}
-
 qint64 StreamReader::readData(char* data, qint64 maxlen)
 {
     return m_downloader->read (data, maxlen);
@@ -115,11 +82,10 @@ qint64 StreamReader::readData(char* data, qint64 maxlen)
 
 qint64 StreamReader::writeData(const char*, qint64)
 {
-    return 0;
+    return -1;
 }
 
 void StreamReader::downloadFile()
 {
     m_downloader->start();
 }
-
diff --git a/src/plugins/Transports/mms/streamreader.h b/src/plugins/Transports/mms/streamreader.h
index 1ada6aea5..a0c18119c 100644
--- a/src/plugins/Transports/mms/streamreader.h
+++ b/src/plugins/Transports/mms/streamreader.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2010 by Ilya Kotov                                      *
+ *   Copyright (C) 2006-2008 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -39,35 +39,30 @@ public:
 
     ~StreamReader();
 
-    /** 
+    /**
      *  QIODevice API
      */
     bool atEnd () const;
     qint64 bytesAvailable () const;
     qint64 bytesToWrite () const;
-    bool canReadLine () const;
     void close ();
     bool isSequential () const;
-    bool open ( OpenMode mode );
-    //qint64 pos () const;
-    bool reset ();
-    bool seek ( qint64 pos );
-    qint64 size () const;
-    bool waitForBytesWritten ( int msecs );
-    bool waitForReadyRead ( int msecs );
-
+    bool open (OpenMode mode);
+    bool seek (qint64 pos);
+    /**
+     *  helper functions
+     */
     void downloadFile();
 
 signals:
-    void readyRead();
+    void ready();
+    void error();
 
 protected:
     qint64 readData(char*, qint64);
     qint64 writeData(const char*, qint64);
 
 private:
-    //void downloadFile();
-    void fillBuffer();
     QUrl m_url;
     QString m_contentType;
     Downloader *m_downloader;