diff options
Diffstat (limited to 'src/multimedia/alsa')
-rw-r--r-- | src/multimedia/alsa/qalsaaudiosink.cpp | 3 | ||||
-rw-r--r-- | src/multimedia/alsa/qalsaaudiosink_p.h | 2 | ||||
-rw-r--r-- | src/multimedia/alsa/qalsaaudiosource.cpp | 3 | ||||
-rw-r--r-- | src/multimedia/alsa/qalsaaudiosource_p.h | 2 | ||||
-rw-r--r-- | src/multimedia/alsa/qalsamediadevices.cpp | 10 | ||||
-rw-r--r-- | src/multimedia/alsa/qalsamediadevices_p.h | 6 |
6 files changed, 16 insertions, 10 deletions
diff --git a/src/multimedia/alsa/qalsaaudiosink.cpp b/src/multimedia/alsa/qalsaaudiosink.cpp index f64b03c64..138ada624 100644 --- a/src/multimedia/alsa/qalsaaudiosink.cpp +++ b/src/multimedia/alsa/qalsaaudiosink.cpp @@ -24,7 +24,8 @@ QT_BEGIN_NAMESPACE Q_LOGGING_CATEGORY(lcAlsaOutput, "qt.multimedia.alsa.output") //#define DEBUG_AUDIO 1 -QAlsaAudioSink::QAlsaAudioSink(const QByteArray &device) +QAlsaAudioSink::QAlsaAudioSink(const QByteArray &device, QObject *parent) + : QPlatformAudioSink(parent) { bytesAvailable = 0; handle = 0; diff --git a/src/multimedia/alsa/qalsaaudiosink_p.h b/src/multimedia/alsa/qalsaaudiosink_p.h index 447210d88..9df697522 100644 --- a/src/multimedia/alsa/qalsaaudiosink_p.h +++ b/src/multimedia/alsa/qalsaaudiosink_p.h @@ -36,7 +36,7 @@ class QAlsaAudioSink : public QPlatformAudioSink friend class AlsaOutputPrivate; Q_OBJECT public: - QAlsaAudioSink(const QByteArray &device); + QAlsaAudioSink(const QByteArray &device, QObject *parent); ~QAlsaAudioSink(); qint64 write( const char *data, qint64 len ); diff --git a/src/multimedia/alsa/qalsaaudiosource.cpp b/src/multimedia/alsa/qalsaaudiosource.cpp index 6427ae80d..8e82ab7d2 100644 --- a/src/multimedia/alsa/qalsaaudiosource.cpp +++ b/src/multimedia/alsa/qalsaaudiosource.cpp @@ -22,7 +22,8 @@ QT_BEGIN_NAMESPACE //#define DEBUG_AUDIO 1 -QAlsaAudioSource::QAlsaAudioSource(const QByteArray &device) +QAlsaAudioSource::QAlsaAudioSource(const QByteArray &device, QObject *parent) + : QPlatformAudioSource(parent) { bytesAvailable = 0; handle = 0; diff --git a/src/multimedia/alsa/qalsaaudiosource_p.h b/src/multimedia/alsa/qalsaaudiosource_p.h index 4ab0e9ef6..87487a6ad 100644 --- a/src/multimedia/alsa/qalsaaudiosource_p.h +++ b/src/multimedia/alsa/qalsaaudiosource_p.h @@ -62,7 +62,7 @@ class QAlsaAudioSource : public QPlatformAudioSource { Q_OBJECT public: - QAlsaAudioSource(const QByteArray &device); + QAlsaAudioSource(const QByteArray &device, QObject *parent); ~QAlsaAudioSource(); qint64 read(char* data, qint64 len); diff --git a/src/multimedia/alsa/qalsamediadevices.cpp b/src/multimedia/alsa/qalsamediadevices.cpp index 7df97dcb2..9f3b3d963 100644 --- a/src/multimedia/alsa/qalsamediadevices.cpp +++ b/src/multimedia/alsa/qalsamediadevices.cpp @@ -79,14 +79,16 @@ QList<QCameraDevice> QAlsaMediaDevices::videoInputs() const return {}; } -QPlatformAudioSource *QAlsaMediaDevices::createAudioSource(const QAudioDevice &deviceInfo) +QPlatformAudioSource *QAlsaMediaDevices::createAudioSource(const QAudioDevice &deviceInfo, + QObject *parent) { - return new QAlsaAudioSource(deviceInfo.id()); + return new QAlsaAudioSource(deviceInfo.id(), parent); } -QPlatformAudioSink *QAlsaMediaDevices::createAudioSink(const QAudioDevice &deviceInfo) +QPlatformAudioSink *QAlsaMediaDevices::createAudioSink(const QAudioDevice &deviceInfo, + QObject *parent) { - return new QAlsaAudioSink(deviceInfo.id()); + return new QAlsaAudioSink(deviceInfo.id(), parent); } QT_END_NAMESPACE diff --git a/src/multimedia/alsa/qalsamediadevices_p.h b/src/multimedia/alsa/qalsamediadevices_p.h index 149d964e2..612ea2119 100644 --- a/src/multimedia/alsa/qalsamediadevices_p.h +++ b/src/multimedia/alsa/qalsamediadevices_p.h @@ -31,8 +31,10 @@ public: QList<QAudioDevice> audioInputs() const override; QList<QAudioDevice> audioOutputs() const override; QList<QCameraDevice> videoInputs() const override; - QPlatformAudioSource *createAudioSource(const QAudioDevice &deviceInfo) override; - QPlatformAudioSink *createAudioSink(const QAudioDevice &deviceInfo) override; + QPlatformAudioSource *createAudioSource(const QAudioDevice &deviceInfo, + QObject *parent) override; + QPlatformAudioSink *createAudioSink(const QAudioDevice &deviceInfo, + QObject *parent) override; }; QT_END_NAMESPACE |