Commit 8d0e08e9 authored by Hannah von Reth's avatar Hannah von Reth
Browse files

WMF plugin: Prevent detaching of QMediaResourceList


Change-Id: I2bf0fa346a166bdb20ce76b1fd4d7227680810dd
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: default avatarYoann Lopes <yoann.lopes@qt.io>
Showing with 4 additions and 4 deletions
...@@ -158,7 +158,7 @@ HRESULT STDMETHODCALLTYPE SourceResolver::GetParameters(DWORD*, DWORD*) ...@@ -158,7 +158,7 @@ HRESULT STDMETHODCALLTYPE SourceResolver::GetParameters(DWORD*, DWORD*)
return E_NOTIMPL; return E_NOTIMPL;
} }
void SourceResolver::load(QMediaResourceList& resources, QIODevice* stream) void SourceResolver::load(const QMediaResourceList &resources, QIODevice* stream)
{ {
QMutexLocker locker(&m_mutex); QMutexLocker locker(&m_mutex);
HRESULT hr = S_OK; HRESULT hr = S_OK;
...@@ -176,7 +176,7 @@ void SourceResolver::load(QMediaResourceList& resources, QIODevice* stream) ...@@ -176,7 +176,7 @@ void SourceResolver::load(QMediaResourceList& resources, QIODevice* stream)
} else if (stream) { } else if (stream) {
QString url; QString url;
if (!resources.isEmpty()) if (!resources.isEmpty())
url = resources.takeFirst().url().toString(); url = resources.constFirst().url().toString();
m_stream = new MFStream(stream, false); m_stream = new MFStream(stream, false);
hr = m_sourceResolver->BeginCreateObjectFromByteStream( hr = m_sourceResolver->BeginCreateObjectFromByteStream(
m_stream, url.isEmpty() ? 0 : reinterpret_cast<LPCWSTR>(url.utf16()), m_stream, url.isEmpty() ? 0 : reinterpret_cast<LPCWSTR>(url.utf16()),
...@@ -187,7 +187,7 @@ void SourceResolver::load(QMediaResourceList& resources, QIODevice* stream) ...@@ -187,7 +187,7 @@ void SourceResolver::load(QMediaResourceList& resources, QIODevice* stream)
emit error(hr); emit error(hr);
} }
} else { } else {
QMediaResource resource = resources.takeFirst(); QMediaResource resource = resources.constFirst();
QUrl url = resource.url(); QUrl url = resource.url();
#ifdef DEBUG_MEDIAFOUNDATION #ifdef DEBUG_MEDIAFOUNDATION
qDebug() << "loading :" << url; qDebug() << "loading :" << url;
......
...@@ -59,7 +59,7 @@ public: ...@@ -59,7 +59,7 @@ public:
HRESULT STDMETHODCALLTYPE GetParameters(DWORD*, DWORD*); HRESULT STDMETHODCALLTYPE GetParameters(DWORD*, DWORD*);
void load(QMediaResourceList& resources, QIODevice* stream); void load(const QMediaResourceList &resources, QIODevice* stream);
void cancel(); void cancel();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment