publish changes

Src/Plugins/Input/in_mp3/CVbriHeader.cpp

@@ -14,7 +14,7 @@
 //
 //--------------------------------------------------------------------------/
 
-#include <windows.h>
+#include <arch.h>
 
 #include "CVbriHeader.h"
 #include "LAMEInfo.h"

Src/Plugins/Input/in_mp3/DXHEAD.C

@@ -10,7 +10,7 @@ mod 12/7/98 add vbr scale
  
 Copyright 1998 Xing Technology Corp.
 -----------------------------------------------------------*/
-#include <windows.h>
+#include <arch.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <float.h>

Src/Plugins/Input/in_mp3/DecodeThread.h

@@ -1,7 +1,7 @@
 #ifndef NULLSOFT_DECODETHREADH
 #define NULLSOFT_DECODETHREADH
 
-#include <windows.h>
+#include <arch.h>
 
 DWORD WINAPI DecodeThread(LPVOID b);
 

Src/Plugins/Input/in_mp3/ID3v1.cpp

@@ -1,6 +1,6 @@
 #include "ID3v1.h"
 #include "../nu/ns_wc.h"
-#include <windows.h>
+#include <arch.h>
 #include "config.h"
 #include <strsafe.h>
 

Src/Plugins/Input/in_mp3/LAMEinfo.cpp

@@ -1,5 +1,5 @@
 #include "LAMEinfo.h"
-#include <windows.h>
+#include <arch.h>
 #include <memory.h>
 #include <math.h>
 #include "api__in_mp3.h"

Src/Plugins/Input/in_mp3/Lyrics3.cpp

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <arch.h>
 #include "Lyrics3.h"
 #include "config.h"
 #include <strsafe.h>

Src/Plugins/Input/in_mp3/MP3Info.h

@@ -2,7 +2,7 @@
 #define NULLSOFT_IN_MP3_MP3_INFO_H
 
 #include "Metadata.h"
-#include <windows.h>
+#include <arch.h>
 
 class MP3Info 
 {

Src/Plugins/Input/in_mp3/about.cpp

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <arch.h>
 #include "main.h"
 #if 1
 BOOL CALLBACK AboutProc(HWND hwndDlg, UINT uMsg, WPARAM wParam,LPARAM lParam)

Src/Plugins/Input/in_mp3/config.cpp

@@ -1,7 +1,7 @@
 #include "main.h"
 #include <shlobj.h>
 #include <commctrl.h>
-#include <windows.h>
+#include <arch.h>
 #include "../winamp/wa_ipc.h"
 #include "config.h"
 #include "api__in_mp3.h"

Src/Plugins/Input/in_mp3/giofile.h

@@ -17,7 +17,7 @@
 #define _GIOFILE_H
 
 /* ------------------------ includes --------------------------------------*/
-#include <windows.h>
+#include <arch.h>
 
 #include "CVbriHeader.h"
 #include "jnetlib/jnetlib.h"

Src/Plugins/Input/in_mp3/graphics/filterWater.h

@@ -1,7 +1,7 @@
 #ifndef NULLSOFT_ML_IMAGE_FILTERWATER_HEADER
 #define NULLSOFT_ML_IMAGE_FILTERWATER_HEADER
 
-#include <windows.h>
+#include <arch.h>
 #include ".\image.h"
 
 class MLImageFilterWater

Src/Plugins/Input/in_mp3/graphics/image.h

@@ -1,7 +1,7 @@
 #ifndef NULLSOFT_ML_IMAGE_HEADER
 #define NULLSOFT_ML_IMAGE_HEADER
 
-#include <windows.h>
+#include <arch.h>
 
 #define RGBA(r,g,b,a)  ((COLORREF)(((BYTE)(r)|((WORD)(g)<<8))|(((DWORD)(BYTE)(b))<<16)|(((DWORD)(BYTE)(a))<<24)))
 #define FIXCOLORREF(clr) RGBA(GetBValue(clr),GetGValue(clr), GetRValue(clr),((DWORD)(clr)) >> 24)

Src/Plugins/Input/in_mp3/graphics/imageFilters.h

@@ -1,7 +1,7 @@
 #ifndef NULLSOFT_ML_IMAGE_FILTER_HEADER
 #define NULLSOFT_ML_IMAGE_FILTER_HEADER
 
-#include <windows.h>
+#include <arch.h>
 #include ".\image.h"
 #include ".\filterwater.h"
 

Src/Plugins/Input/in_mp3/in_mp3.vcxproj

@@ -92,26 +92,26 @@
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
     <VcpkgConfiguration>Debug</VcpkgConfiguration>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
     <VcpkgConfiguration>Debug</VcpkgConfiguration>
   </PropertyGroup>
   <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <VcpkgInstalledDir>
     </VcpkgInstalledDir>
     <VcpkgUseStatic>false</VcpkgUseStatic>
-    <VcpkgTriplet>x86-windows-static-md</VcpkgTriplet>
+    <VcpkgTriplet>x86-arch-static-md</VcpkgTriplet>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>

Src/Plugins/Input/in_mp3/main.h

@@ -2,7 +2,7 @@
 #ifndef  WIN32_LEAN_AND_MEAN
 	#define WIN32_LEAN_AND_MEAN
 #endif
-#include <windows.h>
+#include <arch.h>
 #include "giofile.h"
 #include "dxhead.h"
 #include "CVbriHeader.h"

Src/Plugins/Input/in_mp3/pdtimer.h

@@ -1,7 +1,7 @@
 #ifndef NULLSOFT_PDTIMERH
 #define NULLSOFT_PDTIMERH
 
-#include <windows.h>
+#include <arch.h>
 
 __int64 pdReadResolution(void);
 __int64 pdReadTimer(void);

Src/Plugins/Input/in_mp3/tagz.cpp

@@ -1,4 +1,4 @@
-#include <windows.h>
+#include <arch.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>

Src/Plugins/Input/in_mp3/todo.txt

@@ -15,7 +15,7 @@ Changes:
   * [a4] fixed pause right after playback starts bug
   * fixed crash/hang/freeze when reading some mp3 files with a weird id3v2 tag (as found in some
     real jukebox generated mp3s, etc...)
-  * this one will break a few things (i.e. windowshade vis), because justin is updating it to go 
+  * this one will break a few things (i.e. archhade vis), because justin is updating it to go 
     with winamp 2.7
   * all code is now win32 file io
   * %a will now display id3v1.1/v2 track #