From 69a5cb805ca22a531164b2ee3f9ee3641b4d67a7 Mon Sep 17 00:00:00 2001
From: lordmulder <mulder2@gmx.de>
Date: Sat, 24 Dec 2016 16:50:15 +0100
Subject: [PATCH] Adapt for latest MUtils changes.

---
 src/main.cpp   |  5 +++--
 src/version.h  |  2 +-
 src/win_main.h | 11 +++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 1698961..846094a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -137,10 +137,11 @@ static int simple_x264_main(int &argc, char **argv)
 
 	//Detect CPU capabilities
 	const MUtils::CPUFetaures::cpu_info_t cpuFeatures = MUtils::CPUFetaures::detect();
-	qDebug("   CPU vendor id  :  %s (Intel=%s)", cpuFeatures.vendor, MUTILS_BOOL2STR(cpuFeatures.intel));
+	qDebug("   CPU vendor id  :  %s (Intel=%s)", cpuFeatures.idstr, MUTILS_BOOL2STR(cpuFeatures.vendor & MUtils::CPUFetaures::VENDOR_INTEL));
 	qDebug("CPU brand string  :  %s", cpuFeatures.brand);
 	qDebug("   CPU signature  :  Family=%d Model=%d Stepping=%d", cpuFeatures.family, cpuFeatures.model, cpuFeatures.stepping);
-	qDebug("CPU capabilities  :  MMX=%s SSE=%s SSE2=%s SSE3=%s SSSE3=%s SSE4=%s SSE4.2=%s x64=%s", MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_MMX), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE2), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE3), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSSE3), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE4), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE42), MUTILS_BOOL2STR(cpuFeatures.x64));
+	qDebug("CPU capabilities  :  CMOV=%s MMX=%s SSE=%s SSE2=%s SSE3=%s SSSE3=%s", MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_CMOV), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_MMX), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE2), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE3), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSSE3));
+	qDebug("CPU capabilities  :  SSE4.1=%s SSE4.2=%s AVX=%s EM64T/AMD64=%s", MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE4), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_SSE42), MUTILS_BOOL2STR(cpuFeatures.features & MUtils::CPUFetaures::FLAG_AVX), MUTILS_BOOL2STR(cpuFeatures.x64));
 	qDebug(" Number of CPU's  :  %d\n", cpuFeatures.count);
 
 	//Initialize Qt
diff --git a/src/version.h b/src/version.h
index fee1f39..4f7e34d 100644
--- a/src/version.h
+++ b/src/version.h
@@ -26,7 +26,7 @@
 #define VER_X264_MAJOR 2
 #define VER_X264_MINOR 7
 #define VER_X264_PATCH 7
-#define VER_X264_BUILD 1073
+#define VER_X264_BUILD 1075
 
 #define VER_X264_PORTABLE_EDITION (0)
 
diff --git a/src/win_main.h b/src/win_main.h
index b4cbe1a..c36758a 100644
--- a/src/win_main.h
+++ b/src/win_main.h
@@ -27,6 +27,7 @@
 //Qt
 #include <QMainWindow>
 
+//Forward declarations
 class JobListModel;
 class OptionsModel;
 class SysinfoModel;
@@ -48,14 +49,12 @@ namespace Ui
 
 namespace MUtils
 {
-	namespace CPUFetaures
-	{
-		struct _cpu_info_t;
-		typedef struct _cpu_info_t cpu_info_t;
-	}
-
 	class IPCChannel;
 	class Taskbar7;
+	namespace CPUFetaures
+	{
+		typedef struct _cpu_info_t cpu_info_t;
+	}
 }
 
 class MainWindow: public QMainWindow