From bfdb4693472053281808e15009a9aa33ddce1864 Mon Sep 17 00:00:00 2001
From: "Jake.Stine" <Jake.Stine@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Sat, 5 Sep 2009 01:05:47 +0000
Subject: [PATCH] SPU2-X: Minor cleanups and updated DLL/resource versioning
 info (which never got updated for v1.2, oops)

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1740 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 plugins/spu2-x/src/Windows/SndOut_XAudio2.cpp | 33 +++++++++----------
 plugins/spu2-x/src/Windows/Spu2-X.rc          | 26 ++++++++++-----
 2 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/plugins/spu2-x/src/Windows/SndOut_XAudio2.cpp b/plugins/spu2-x/src/Windows/SndOut_XAudio2.cpp
index fe286264e6..606b3e4630 100644
--- a/plugins/spu2-x/src/Windows/SndOut_XAudio2.cpp
+++ b/plugins/spu2-x/src/Windows/SndOut_XAudio2.cpp
@@ -112,17 +112,16 @@ private:
 			WAVEFORMATEXTENSIBLE wfx;
 
 			memset(&wfx, 0, sizeof(WAVEFORMATEXTENSIBLE)); 
-			wfx.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE;
-			wfx.Format.nSamplesPerSec = SampleRate;
-			wfx.Format.nChannels = m_nChannels;
-			wfx.Format.wBitsPerSample = 16;
-			wfx.Format.nBlockAlign = wfx.Format.nChannels*wfx.Format.wBitsPerSample/8;
-			wfx.Format.nAvgBytesPerSec = SampleRate * wfx.Format.nBlockAlign;
-			wfx.Format.cbSize=22;
-			wfx.Samples.wValidBitsPerSample=0;
-			//wfx.dwChannelMask=SPEAKER_FRONT_LEFT|SPEAKER_FRONT_RIGHT|SPEAKER_FRONT_CENTER|SPEAKER_LOW_FREQUENCY|SPEAKER_BACK_LEFT|SPEAKER_BACK_RIGHT;
-			wfx.dwChannelMask=chanConfig;
-			wfx.SubFormat=KSDATAFORMAT_SUBTYPE_PCM;
+			wfx.Format.wFormatTag		= WAVE_FORMAT_EXTENSIBLE;
+			wfx.Format.nSamplesPerSec	= SampleRate;
+			wfx.Format.nChannels		= m_nChannels;
+			wfx.Format.wBitsPerSample	= 16;
+			wfx.Format.nBlockAlign		= wfx.Format.nChannels*wfx.Format.wBitsPerSample/8;
+			wfx.Format.nAvgBytesPerSec	= SampleRate * wfx.Format.nBlockAlign;
+			wfx.Format.cbSize			= 22;
+			wfx.Samples.wValidBitsPerSample = 0;
+			wfx.dwChannelMask			= chanConfig;
+			wfx.SubFormat				= KSDATAFORMAT_SUBTYPE_PCM;
 
 			//
 			// Create an XAudio2 voice to stream this wave
@@ -192,12 +191,12 @@ private:
 			int chanMask = 0;
 			switch(m_nChannels)
 			{
-			case 1: chanMask |= SPEAKER_FRONT_CENTER; break;
-			case 2: chanMask |= SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; break;
-			case 3: chanMask |= SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_LOW_FREQUENCY; break;
-			case 4: chanMask |= SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT; break;
-			case 5: chanMask |= SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT; break;
-			case 6: chanMask |= SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT | SPEAKER_LOW_FREQUENCY; break;
+				case 1: chanMask |= SPEAKER_FRONT_CENTER; break;
+				case 2: chanMask |= SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT; break;
+				case 3: chanMask |= SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_LOW_FREQUENCY; break;
+				case 4: chanMask |= SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT; break;
+				case 5: chanMask |= SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT; break;
+				case 6: chanMask |= SPEAKER_FRONT_LEFT | SPEAKER_FRONT_RIGHT | SPEAKER_FRONT_CENTER | SPEAKER_BACK_LEFT | SPEAKER_BACK_RIGHT | SPEAKER_LOW_FREQUENCY; break;
 			}
 			_init( pXAudio2, chanMask );
 		}
diff --git a/plugins/spu2-x/src/Windows/Spu2-X.rc b/plugins/spu2-x/src/Windows/Spu2-X.rc
index ebd58aa1e2..de577a1b1f 100644
--- a/plugins/spu2-x/src/Windows/Spu2-X.rc
+++ b/plugins/spu2-x/src/Windows/Spu2-X.rc
@@ -7,7 +7,9 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxresmw.h"

+#include "svnrev.h"
+#include "afxresmw.h"
+
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 
@@ -267,9 +269,14 @@ IDB_SPU2X_SMALL         BITMAP                  "..\\..\\spu2-x-sm.bmp"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,1,0
- PRODUCTVERSION 1,1,1,0
+ FILEVERSION 1,3,0,SVN_REV
+ PRODUCTVERSION 1,3,0,SVN_REV
  FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
  FILEOS 0x4L
  FILETYPE 0x2L
  FILESUBTYPE 0x0L
@@ -279,14 +286,14 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "Comments", "SPU2 Plugin for PS2 Emulators"
-            VALUE "CompanyName", "Pcsx2 Dev Team"
-            VALUE "FileDescription", "SPU2-X Plugin v1.1"
-            VALUE "FileVersion", "1, 1, 1, 0"
+            VALUE "CompanyName", "PCSX2 Dev Team"
+            VALUE "FileDescription", "SPU2-X Plugin (svn build)"
+            VALUE "FileVersion", "1.3.SVN"
             VALUE "InternalName", "SPU2-X"
             VALUE "LegalCopyright", "Copyright (C) 2009"
-            VALUE "OriginalFilename", "SPU2-X-1.1.dll"
+            VALUE "OriginalFilename", "SPU2-X-1.3.dll"
             VALUE "ProductName", "SPU2-X"
-            VALUE "ProductVersion", "1, 1, 1, 0"
+            VALUE "ProductVersion", "1.3.SVN"
         END
     END
     BLOCK "VarFileInfo"
@@ -321,7 +328,8 @@ END
 
 2 TEXTINCLUDE 
 BEGIN
-    "#include ""afxresmw.h""\r\0"
+    "#include ""svnrev.h""\r\n"
+    "#include ""afxresmw.h""\0"
 END
 
 3 TEXTINCLUDE