From 1d6066c83700e95ef6b518079151188f0d77e2bf Mon Sep 17 00:00:00 2001
From: Thijs Wenker <me@thoys.nl>
Date: Sat, 10 Jan 2015 01:41:07 +0100
Subject: [PATCH] replaced GetVersionEx with new Version helpers to resolve
 deprecation warnings.

---
 interface/src/Audio.cpp | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/interface/src/Audio.cpp b/interface/src/Audio.cpp
index bd106d9bc6..7c2586b55c 100644
--- a/interface/src/Audio.cpp
+++ b/interface/src/Audio.cpp
@@ -25,6 +25,7 @@
 #include <mmdeviceapi.h>
 #include <devicetopology.h>
 #include <Functiondiscoverykeys_devpkey.h>
+#include <VersionHelpers.h>
 #endif
 
 #include <AudioConstants.h>
@@ -179,12 +180,7 @@ QAudioDeviceInfo defaultAudioDeviceForMode(QAudio::Mode mode) {
 #ifdef WIN32
     QString deviceName;
     //Check for Windows Vista or higher, IMMDeviceEnumerator doesn't work below that.
-    OSVERSIONINFO osvi;
-    ZeroMemory(&osvi, sizeof(OSVERSIONINFO));
-    osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-    GetVersionEx(&osvi);
-    const DWORD VISTA_MAJOR_VERSION = 6;
-    if (osvi.dwMajorVersion < VISTA_MAJOR_VERSION) {// lower then vista
+    if (!IsWindowsVistaOrGreater()) { // lower then vista
         if (mode == QAudio::AudioInput) {
             WAVEINCAPS wic;
             // first use WAVE_MAPPER to get the default devices manufacturer ID
@@ -223,9 +219,7 @@ QAudioDeviceInfo defaultAudioDeviceForMode(QAudio::Mode mode) {
             pPropertyStore->Release();
             pPropertyStore = NULL;
             deviceName = QString::fromWCharArray((wchar_t*)pv.pwszVal);
-            const DWORD WINDOWS7_MAJOR_VERSION = 6;
-            const DWORD WINDOWS7_MINOR_VERSION = 1;
-            if (osvi.dwMajorVersion <= WINDOWS7_MAJOR_VERSION && osvi.dwMinorVersion <= WINDOWS7_MINOR_VERSION) {
+            if (!IsWindows8OrGreater()) {
                 // Windows 7 provides only the 31 first characters of the device name.
                 const DWORD QT_WIN7_MAX_AUDIO_DEVICENAME_LEN = 31;
                 deviceName = deviceName.left(QT_WIN7_MAX_AUDIO_DEVICENAME_LEN);