aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/Transports/mms
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/Transports/mms')
-rw-r--r--src/plugins/Transports/mms/downloader.cpp5
-rw-r--r--src/plugins/Transports/mms/downloader.h1
-rw-r--r--src/plugins/Transports/mms/mmsinputsource.cpp5
-rw-r--r--src/plugins/Transports/mms/mmsinputsource.h1
-rw-r--r--src/plugins/Transports/mms/streamreader.cpp9
-rw-r--r--src/plugins/Transports/mms/streamreader.h4
6 files changed, 6 insertions, 19 deletions
diff --git a/src/plugins/Transports/mms/downloader.cpp b/src/plugins/Transports/mms/downloader.cpp
index b0451a38e..a3c1abd5a 100644
--- a/src/plugins/Transports/mms/downloader.cpp
+++ b/src/plugins/Transports/mms/downloader.cpp
@@ -71,11 +71,6 @@ QMutex *Downloader::mutex()
return &m_mutex;
}
-QString Downloader::contentType()
-{
- return "audio/x-ms-wma";
-}
-
void Downloader::abort()
{
m_mutex.lock();
diff --git a/src/plugins/Transports/mms/downloader.h b/src/plugins/Transports/mms/downloader.h
index ba4971630..0a6d237a9 100644
--- a/src/plugins/Transports/mms/downloader.h
+++ b/src/plugins/Transports/mms/downloader.h
@@ -43,7 +43,6 @@ public:
qint64 read(char* data, qint64 maxlen);
QMutex *mutex();
- QString contentType();
void abort();
qint64 bytesAvailable();
void checkBuffer();
diff --git a/src/plugins/Transports/mms/mmsinputsource.cpp b/src/plugins/Transports/mms/mmsinputsource.cpp
index 07328e051..a8120899f 100644
--- a/src/plugins/Transports/mms/mmsinputsource.cpp
+++ b/src/plugins/Transports/mms/mmsinputsource.cpp
@@ -43,6 +43,11 @@ bool MMSInputSource::isReady()
return m_reader->isOpen();
}
+QString MMSInputSource::contentType() const
+{
+ return "audio/x-ms-wma";
+}
+
void MMSInputSource::open()
{
m_reader->open(QIODevice::ReadOnly);
diff --git a/src/plugins/Transports/mms/mmsinputsource.h b/src/plugins/Transports/mms/mmsinputsource.h
index 20509c8c2..d8695b7c2 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();
+ QString contentType() const;
private slots:
void open();
diff --git a/src/plugins/Transports/mms/streamreader.cpp b/src/plugins/Transports/mms/streamreader.cpp
index 4210958ab..ca99d7991 100644
--- a/src/plugins/Transports/mms/streamreader.cpp
+++ b/src/plugins/Transports/mms/streamreader.cpp
@@ -123,12 +123,3 @@ void StreamReader::downloadFile()
m_downloader->start();
}
-const QString &StreamReader::contentType()
-{
- m_downloader->mutex()->lock ();
- m_contentType = m_downloader->contentType();
- m_downloader->mutex()->unlock();
- qApp->processEvents();
- qDebug("StreamReader: content type: %s", qPrintable(m_contentType));
- return m_contentType;
-}
diff --git a/src/plugins/Transports/mms/streamreader.h b/src/plugins/Transports/mms/streamreader.h
index 8195126d1..1ada6aea5 100644
--- a/src/plugins/Transports/mms/streamreader.h
+++ b/src/plugins/Transports/mms/streamreader.h
@@ -56,10 +56,6 @@ public:
bool waitForBytesWritten ( int msecs );
bool waitForReadyRead ( int msecs );
- /**
- * returns content type of a stream
- */
- const QString &contentType();
void downloadFile();
signals: