From c3b9a8a6bc2a3dc3907f1cc349a7279916b599a4 Mon Sep 17 00:00:00 2001
From: Val Doroshchuk <valentyn.doroshchuk@qt.io>
Date: Fri, 3 Apr 2020 15:23:12 +0200
Subject: WindowsAudio: Send stateChanged when QAudioOutput::reset() is called

Fixes: QTBUG-83240
Change-Id: Iaa01ee4553f4c0c4d9a1ad829e65b40f13d3847d
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
---
 src/plugins/windowsaudio/qwindowsaudiooutput.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/windowsaudio/qwindowsaudiooutput.cpp b/src/plugins/windowsaudio/qwindowsaudiooutput.cpp
index 1182647fc..6ccffc8b2 100644
--- a/src/plugins/windowsaudio/qwindowsaudiooutput.cpp
+++ b/src/plugins/windowsaudio/qwindowsaudiooutput.cpp
@@ -630,7 +630,7 @@ qreal QWindowsAudioOutput::volume() const
 
 void QWindowsAudioOutput::reset()
 {
-    close();
+    stop();
 }
 
 OutputPrivate::OutputPrivate(QWindowsAudioOutput* audio)
-- 
cgit v1.2.3


From 5edb1597cf71cebbffb3d05f975cf55702c53abd Mon Sep 17 00:00:00 2001
From: Marius Kittler <mariuskittler@gmx.de>
Date: Sun, 29 Dec 2019 00:39:46 +0100
Subject: Fix case of header file includes for building with mingw-w64

Change-Id: Ie0e6599234c38c5e5a75b681a911f3728871861e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 config.tests/wshellitem/main.cpp                            | 2 +-
 src/plugins/directshow/player/directshowmetadatacontrol.cpp | 2 +-
 src/plugins/winrt/qwinrtcameracontrol.cpp                   | 2 +-
 src/plugins/wmf/player/mfplayersession.cpp                  | 2 +-
 src/plugins/wmf/player/mftvideo.cpp                         | 2 +-
 src/plugins/wmf/sourceresolver.cpp                          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config.tests/wshellitem/main.cpp b/config.tests/wshellitem/main.cpp
index 799ee5556..459992b77 100644
--- a/config.tests/wshellitem/main.cpp
+++ b/config.tests/wshellitem/main.cpp
@@ -26,7 +26,7 @@
 **
 ****************************************************************************/
 
-#include <ShlObj.h>
+#include <shlobj.h>
 
 int main(int, char**)
 {
diff --git a/src/plugins/directshow/player/directshowmetadatacontrol.cpp b/src/plugins/directshow/player/directshowmetadatacontrol.cpp
index 46674143e..d9864870a 100644
--- a/src/plugins/directshow/player/directshowmetadatacontrol.cpp
+++ b/src/plugins/directshow/player/directshowmetadatacontrol.cpp
@@ -64,7 +64,7 @@
 #endif
 
 #if QT_CONFIG(wshellitem)
-#include <ShlObj.h>
+#include <shlobj.h>
 #include <propkeydef.h>
 #include <private/qsystemlibrary_p.h>
 
diff --git a/src/plugins/winrt/qwinrtcameracontrol.cpp b/src/plugins/winrt/qwinrtcameracontrol.cpp
index ede3f6b04..98dd7c2f7 100644
--- a/src/plugins/winrt/qwinrtcameracontrol.cpp
+++ b/src/plugins/winrt/qwinrtcameracontrol.cpp
@@ -54,7 +54,7 @@
 
 #include <functional>
 #include <mfapi.h>
-#include <Mferror.h>
+#include <mferror.h>
 #include <mfidl.h>
 #include <wrl.h>
 #include <windows.devices.enumeration.h>
diff --git a/src/plugins/wmf/player/mfplayersession.cpp b/src/plugins/wmf/player/mfplayersession.cpp
index 9761fd993..1d145edc4 100644
--- a/src/plugins/wmf/player/mfplayersession.cpp
+++ b/src/plugins/wmf/player/mfplayersession.cpp
@@ -56,7 +56,7 @@
 #include "mfplayersession.h"
 #include "mfplayerservice.h"
 #include "mfmetadatacontrol.h"
-#include <Mferror.h>
+#include <mferror.h>
 #include <nserror.h>
 #include "sourceresolver.h"
 #include "samplegrabber.h"
diff --git a/src/plugins/wmf/player/mftvideo.cpp b/src/plugins/wmf/player/mftvideo.cpp
index 879911d55..9dce654f2 100644
--- a/src/plugins/wmf/player/mftvideo.cpp
+++ b/src/plugins/wmf/player/mftvideo.cpp
@@ -40,7 +40,7 @@
 #include "mftvideo.h"
 #include "mfvideoprobecontrol.h"
 #include <private/qmemoryvideobuffer_p.h>
-#include <Mferror.h>
+#include <mferror.h>
 #include <strmif.h>
 #include <uuids.h>
 #include <InitGuid.h>
diff --git a/src/plugins/wmf/sourceresolver.cpp b/src/plugins/wmf/sourceresolver.cpp
index c6f4e8566..15ef6f0ab 100644
--- a/src/plugins/wmf/sourceresolver.cpp
+++ b/src/plugins/wmf/sourceresolver.cpp
@@ -39,7 +39,7 @@
 
 #include "mfstream.h"
 #include "sourceresolver.h"
-#include <Mferror.h>
+#include <mferror.h>
 #include <nserror.h>
 #include <QtCore/qfile.h>
 #include <QtCore/qdebug.h>
-- 
cgit v1.2.3