diff options
| author | Lorn Potter <lorn.potter@gmail.com> | 2022-08-09 11:22:25 +1000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-08-11 01:57:18 +0000 |
| commit | e4e5743b074f9a633c1dcb94b0e9ea0d6e5329e9 (patch) | |
| tree | e46eee277c13d6dfc99da10f1604a45187e68580 | |
| parent | 048140b2bba993cbc1f53df718ba7569c27a00e8 (diff) | |
wasm: fix QSoundEffect playing
Wasm by default, is not threaded, so moveToThread does not work as
intended.
The asserts were removed as not needed and of course, asserting, as
moveToThread does not work.
Fixes: QTBUG-104045
Change-Id: I7bda8288e5c9ea16d57b714b8cba9e57018058e5
Reviewed-by: Lars Knoll <lars.knoll@gmail.com>
(cherry picked from commit 99b2dd29862e95108356fcde7242a382df7ccf91)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/multimedia/audio/qsamplecache_p.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/multimedia/audio/qsamplecache_p.cpp b/src/multimedia/audio/qsamplecache_p.cpp index 228c4d590..1dacf4d72 100644 --- a/src/multimedia/audio/qsamplecache_p.cpp +++ b/src/multimedia/audio/qsamplecache_p.cpp @@ -142,7 +142,9 @@ QSample* QSampleCache::requestSample(const QUrl& url) m_loadingThread.start(); sample = new QSample(url, this); m_samples.insert(url, sample); +#if QT_CONFIG(thread) sample->moveToThread(&m_loadingThread); +#endif } else { sample = *it; } @@ -300,7 +302,9 @@ void QSample::addRef() // Called in loading thread void QSample::readSample() { +#if QT_CONFIG(thread) Q_ASSERT(QThread::currentThread()->objectName() == QLatin1String("QSampleCache::LoadingThread")); +#endif QMutexLocker m(&m_mutex); qint64 read = m_waveDecoder->read(m_soundData.data() + m_sampleReadLength, qMin(m_waveDecoder->bytesAvailable(), @@ -317,7 +321,9 @@ void QSample::readSample() // Called in loading thread void QSample::decoderReady() { +#if QT_CONFIG(thread) Q_ASSERT(QThread::currentThread()->objectName() == QLatin1String("QSampleCache::LoadingThread")); +#endif QMutexLocker m(&m_mutex); qCDebug(qLcSampleCache) << "QSample: decoder ready"; m_parent->refresh(m_waveDecoder->size()); @@ -343,7 +349,9 @@ QSample::State QSample::state() const // Essentially a second ctor, doesn't need locks (?) void QSample::load() { +#if QT_CONFIG(thread) Q_ASSERT(QThread::currentThread()->objectName() == QLatin1String("QSampleCache::LoadingThread")); +#endif qCDebug(qLcSampleCache) << "QSample: load [" << m_url << "]"; m_stream = m_parent->networkAccessManager().get(QNetworkRequest(m_url)); connect(m_stream, SIGNAL(errorOccurred(QNetworkReply::NetworkError)), SLOT(loadingError(QNetworkReply::NetworkError))); @@ -357,7 +365,9 @@ void QSample::load() void QSample::loadingError(QNetworkReply::NetworkError errorCode) { +#if QT_CONFIG(thread) Q_ASSERT(QThread::currentThread()->objectName() == QLatin1String("QSampleCache::LoadingThread")); +#endif QMutexLocker m(&m_mutex); qCDebug(qLcSampleCache) << "QSample: loading error" << errorCode; cleanup(); @@ -369,7 +379,9 @@ void QSample::loadingError(QNetworkReply::NetworkError errorCode) // Called in loading thread void QSample::decoderError() { +#if QT_CONFIG(thread) Q_ASSERT(QThread::currentThread()->objectName() == QLatin1String("QSampleCache::LoadingThread")); +#endif QMutexLocker m(&m_mutex); qCDebug(qLcSampleCache) << "QSample: decoder error"; cleanup(); @@ -381,7 +393,9 @@ void QSample::decoderError() // Called in loading thread from decoder when sample is done. Locked already. void QSample::onReady() { +#if QT_CONFIG(thread) Q_ASSERT(QThread::currentThread()->objectName() == QLatin1String("QSampleCache::LoadingThread")); +#endif m_audioFormat = m_waveDecoder->audioFormat(); qCDebug(qLcSampleCache) << "QSample: load ready format:" << m_audioFormat; cleanup(); |