Remove QMediaSource dependency from QAudioDecoder

Nothing needs this here.

Change-Id: I66d5a7f22495dd24d2fdebd780f1c0ad574b55de
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

2 files changed, 9 insertions, 5 deletions

diff --git a/src/multimedia/audio/qaudiodecoder.cpp b/src/multimedia/audio/qaudiodecoder.cpp
index b192ddce2..94cca780a 100644
--- a/src/multimedia/audio/qaudiodecoder.cpp
+++ b/src/multimedia/audio/qaudiodecoder.cpp
@@ -120,9 +120,7 @@ void QAudioDecoderPrivate::_q_error(int error, const QString &errorString)
     parented to \a parent.
 */
 QAudioDecoder::QAudioDecoder(QObject *parent)
-    : QMediaSource(*new QAudioDecoderPrivate,
-                   parent,
-                   nullptr)
+    : QObject(*new QAudioDecoderPrivate, parent)
 {
     Q_D(QAudioDecoder);
 
@@ -156,6 +154,11 @@ QAudioDecoder::~QAudioDecoder()
         delete d->control;
 }
 
+bool QAudioDecoder::isAvailable() const
+{
+    return d_func()->control != nullptr;
+}
+
 QAudioDecoder::State QAudioDecoder::state() const
 {
     return d_func()->state;
diff --git a/src/multimedia/audio/qaudiodecoder.h b/src/multimedia/audio/qaudiodecoder.h
index 670af4027..00c5eed95 100644
--- a/src/multimedia/audio/qaudiodecoder.h
+++ b/src/multimedia/audio/qaudiodecoder.h
@@ -40,7 +40,7 @@
 #ifndef QAUDIODECODER_H
 #define QAUDIODECODER_H
 
-#include <QtMultimedia/qmediasource.h>
+#include <QtCore/qobject.h>
 #include <QtMultimedia/qmediaenumdebug.h>
 
 #include <QtMultimedia/qaudiobuffer.h>
@@ -48,7 +48,7 @@
 QT_BEGIN_NAMESPACE
 
 class QAudioDecoderPrivate;
-class Q_MULTIMEDIA_EXPORT QAudioDecoder : public QMediaSource
+class Q_MULTIMEDIA_EXPORT QAudioDecoder : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QString sourceFilename READ sourceFilename WRITE setSourceFilename NOTIFY sourceChanged)
@@ -78,6 +78,7 @@ public:
     explicit QAudioDecoder(QObject *parent = nullptr);
     ~QAudioDecoder();
 
+    bool isAvailable() const;
     State state() const;
 
     QString sourceFilename() const;