diff options
Diffstat (limited to 'src/plugins/Transports/mms')
| -rw-r--r-- | src/plugins/Transports/mms/mmsinputfactory.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/Transports/mms/mmsinputfactory.h | 4 | ||||
| -rw-r--r-- | src/plugins/Transports/mms/mmsinputsource.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/Transports/mms/mmsinputsource.h | 1 | ||||
| -rw-r--r-- | src/plugins/Transports/mms/mmsstreamreader.cpp | 4 |
5 files changed, 13 insertions, 5 deletions
diff --git a/src/plugins/Transports/mms/mmsinputfactory.cpp b/src/plugins/Transports/mms/mmsinputfactory.cpp index beb9fbf87..b485c7d03 100644 --- a/src/plugins/Transports/mms/mmsinputfactory.cpp +++ b/src/plugins/Transports/mms/mmsinputfactory.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010-2012 by Ilya Kotov * + * Copyright (C) 2010-2013 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * diff --git a/src/plugins/Transports/mms/mmsinputfactory.h b/src/plugins/Transports/mms/mmsinputfactory.h index 8e12d7f3c..fd2bdb77e 100644 --- a/src/plugins/Transports/mms/mmsinputfactory.h +++ b/src/plugins/Transports/mms/mmsinputfactory.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2010 by Ilya Kotov * + * Copyright (C) 2010-2013 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -33,7 +33,7 @@ class QTranslator; class MMSInputFactory : public QObject, InputSourceFactory { Q_OBJECT -Q_INTERFACES(InputSourceFactory); +Q_INTERFACES(InputSourceFactory) public: const InputSourceProperties properties() const; InputSource *create(const QString &url, QObject *parent = 0); diff --git a/src/plugins/Transports/mms/mmsinputsource.cpp b/src/plugins/Transports/mms/mmsinputsource.cpp index 31f995890..8e72fa264 100644 --- a/src/plugins/Transports/mms/mmsinputsource.cpp +++ b/src/plugins/Transports/mms/mmsinputsource.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2009-2012 by Ilya Kotov * + * Copyright (C) 2009-2013 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -44,6 +44,11 @@ bool MMSInputSource::isReady() return m_reader->isOpen(); } +bool MMSInputSource::isWaiting() +{ + return (!m_reader->bytesAvailable() && m_reader->isOpen()); +} + QString MMSInputSource::contentType() const { return "audio/x-ms-wma"; diff --git a/src/plugins/Transports/mms/mmsinputsource.h b/src/plugins/Transports/mms/mmsinputsource.h index 9590e1e7c..359a96f09 100644 --- a/src/plugins/Transports/mms/mmsinputsource.h +++ b/src/plugins/Transports/mms/mmsinputsource.h @@ -37,6 +37,7 @@ public: QIODevice *ioDevice(); bool initialize(); bool isReady(); + bool isWaiting(); QString contentType() const; private: diff --git a/src/plugins/Transports/mms/mmsstreamreader.cpp b/src/plugins/Transports/mms/mmsstreamreader.cpp index db4663fb1..8bc9e9790 100644 --- a/src/plugins/Transports/mms/mmsstreamreader.cpp +++ b/src/plugins/Transports/mms/mmsstreamreader.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2012 by Ilya Kotov * + * Copyright (C) 2006-2013 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -145,6 +145,7 @@ void MMSStreamReader::run() qWarning("MMSStreamReader: connection failed"); setErrorString("connection failed"); emit error(); + QIODevice::close(); return; } m_mutex.lock(); @@ -188,6 +189,7 @@ void MMSStreamReader::run() break; DownloadThread::usleep(5000); } + QIODevice::close(); } void MMSStreamReader::checkBuffer() |