Fix namespaced build on Windows

Fixes: QTBUG-100050
Change-Id: Iaca58f6cf92eb25aac52b780dadd6f38fe998204
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit fb3b880052df64564cc2d4bde59c0877544b79c7)

3 files changed, 13 insertions, 4 deletions

diff --git a/src/multimedia/platform/windows/audio/qwindowsaudiodevice_p.h b/src/multimedia/platform/windows/audio/qwindowsaudiodevice_p.h
index 7bb34d08f..2e5b38ea1 100644
--- a/src/multimedia/platform/windows/audio/qwindowsaudiodevice_p.h
+++ b/src/multimedia/platform/windows/audio/qwindowsaudiodevice_p.h
@@ -62,11 +62,10 @@
 #include <private/qaudiodevice_p.h>
 #include <private/qwindowsiupointer_p.h>
 
+struct IMMDevice;
 
 QT_BEGIN_NAMESPACE
 
-struct IMMDevice;
-
 const unsigned int MAX_SAMPLE_RATES = 5;
 const unsigned int SAMPLE_RATES[] = { 8000, 11025, 22050, 44100, 48000 };
 
diff --git a/src/multimedia/platform/windows/common/qwindowsresampler.cpp b/src/multimedia/platform/windows/common/qwindowsresampler.cpp
index 74e85b3b2..aa7160ee2 100644
--- a/src/multimedia/platform/windows/common/qwindowsresampler.cpp
+++ b/src/multimedia/platform/windows/common/qwindowsresampler.cpp
@@ -46,6 +46,8 @@
 #include <mfapi.h>
 #include <mferror.h>
 
+QT_BEGIN_NAMESPACE
+
 Q_LOGGING_CATEGORY(qLcAudioResampler, "qt.multimedia.audioresampler")
 
 QWindowsResampler::QWindowsResampler()
@@ -267,3 +269,5 @@ bool QWindowsResampler::setup(const QAudioFormat &fin, const QAudioFormat &fout)
 
     return true;
 }
+
+QT_END_NAMESPACE
diff --git a/src/multimedia/platform/windows/common/qwindowsresampler_p.h b/src/multimedia/platform/windows/common/qwindowsresampler_p.h
index 4b586f4ec..63dfc0e58 100644
--- a/src/multimedia/platform/windows/common/qwindowsresampler_p.h
+++ b/src/multimedia/platform/windows/common/qwindowsresampler_p.h
@@ -58,6 +58,11 @@
 #include <private/qwindowsiupointer_p.h>
 #include <qt_windows.h>
 
+struct IMFSample;
+struct IMFTransform;
+
+QT_BEGIN_NAMESPACE
+
 class QWindowsResampler
 {
 public:
@@ -67,7 +72,7 @@ public:
     bool setup(const QAudioFormat &in, const QAudioFormat &out);
 
     QByteArray resample(const QByteArrayView &in);
-    QByteArray resample(struct IMFSample *sample);
+    QByteArray resample(IMFSample *sample);
 
     QAudioFormat inputFormat() const { return m_inputFormat; }
     QAudioFormat outputFormat() const { return m_outputFormat; }
@@ -82,7 +87,7 @@ private:
     HRESULT processInput(const QByteArrayView &in);
     HRESULT processOutput(QByteArray &out);
 
-    QWindowsIUPointer<struct IMFTransform> m_resampler;
+    QWindowsIUPointer<IMFTransform> m_resampler;
 
     bool m_resamplerNeedsSampleBuffer = false;
     quint64 m_totalInputBytes = 0;
@@ -93,5 +98,6 @@ private:
     DWORD m_inputStreamID = 0;
 };
 
+QT_END_NAMESPACE
 
 #endif // QT_QWINDOWSRESAMPLER_H