publish changes

Src/Plugins/Input/in_wmvdrm/ASXLoader.cpp

@@ -463,7 +463,7 @@ int ASXLoader::Load(const wchar_t *filename, ifc_playlistloadercallback *playlis
 		parser->xmlreader_registerCallback(L"ASX\fENTRY\fTITLE", &asxXml.title);
 		parser->xmlreader_registerCallback(L"ASX\fENTRY\fAUTHOR", &asxXml.artist);
 		parser->xmlreader_open();
-		parser->xmlreader_setEncoding(L"windows-1252");
+		parser->xmlreader_setEncoding(L"arch-1252");
 		
 		int ret;
 		if (wcsstr(filename, L"://"))

Src/Plugins/Input/in_wmvdrm/Main.h

@@ -5,7 +5,7 @@
 
 #include "WinampInterface.h"
 #include "../Winamp/in2.h"
-#include <windows.h>
+#include <arch.h>
 #include "WMDRMModule.h"
 #include <shlwapi.h>
 #include <wmsdk.h>

Src/Plugins/Input/in_wmvdrm/StatusHook.cpp

@@ -1,5 +1,5 @@
 #if 0
-#include <windows.h>
+#include <arch.h>
 #include "../Winamp/wa_ipc.h"
 #include "Main.h"
 #include <shlwapi.h>

Src/Plugins/Input/in_wmvdrm/StatusHook.h

@@ -1,7 +1,7 @@
 #ifndef NULLSOFT_STATUSHOOKH
 #define NULLSOFT_STATUSHOOKH
 
-#include <windows.h>
+#include <arch.h>
 void Hook(HWND winamp);
 void Unhook(HWND winamp);
 #endif

Src/Plugins/Input/in_wmvdrm/VideoThread.cpp

@@ -2,7 +2,7 @@
 #include "VideoThread.h"
 #include "VideoLayer.h"
 #include "config.h"
-#include <windows.h>
+#include <arch.h>
 
 DWORD WINAPI VidThread_stub(void *ptr)
 {

Src/Plugins/Input/in_wmvdrm/WinampInterface.h

@@ -2,7 +2,7 @@
 #define NULLSOFT_WINAMPINTERFACEH
 
 #include "Main.h"
-#include <windows.h>
+#include <arch.h>
 #include "../Winamp/wa_ipc.h"
 #include "../Winamp/In2.h"
 #include "../Winamp/strutil.h"

Src/Plugins/Input/in_wmvdrm/api.cpp

@@ -1,6 +1,6 @@
 #include "main.h"
 #include "api.h"
-#include <windows.h>
+#include <arch.h>
 #include "../Winamp/wa_ipc.h"
 #include "FactoryHelper.h"
 #include "MetaTagFactory.h"

Src/Plugins/Input/in_wmvdrm/api.h

@@ -1,7 +1,7 @@
 #ifndef NULLSOFT_API_H
 #define NULLSOFT_API_H
 
-#include <windows.h>
+#include <arch.h>
 int LoadWasabi();
 void UnloadWasabi();
 

Src/Plugins/Input/in_wmvdrm/loadini.h

@@ -1,7 +1,7 @@
 #ifndef NULLSOFT_LOADINIH
 #define NULLSOFT_LOADINIH
 
-#include <windows.h>
+#include <arch.h>
 extern wchar_t INI_FILE[MAX_PATH];
 void IniFile(HWND hMainWindow);
 

Src/Plugins/Input/in_wmvdrm/output/AudioOut.h

@@ -1,7 +1,7 @@
 #ifndef NULLSOFT_AUDIOOUTH
 #define NULLSOFT_AUDIOOUTH
 
-#include <windows.h>
+#include <arch.h>
 #include "../../../../Winamp/out.h"
 
 enum InitState

Src/Plugins/Input/in_wmvdrm/util.h

@@ -1,7 +1,7 @@
 #ifndef NULLSOFT_UTILH
 #define NULLSOFT_UTILH
 
-#include <windows.h>
+#include <arch.h>
 
 void WaitForEvent(HANDLE hEvent, DWORD msMaxWaitTime);
 char *HRErrorCode(HRESULT hr);

Src/Plugins/Input/in_wmvdrm/vid_ddraw.cpp

@@ -710,7 +710,7 @@ void DDrawVideoOutput::displayFrame(const char * /*buf*/, int size, int time)
 	ClientToScreen(hwnd, (LPPOINT)&r);
 	ClientToScreen(hwnd, ((LPPOINT)&r) + 1);
 
-	// transform coords from windows desktop coords (where 0,0==upper-left corner of box encompassing all monitors)
+	// transform coords from arch desktop coords (where 0,0==upper-left corner of box encompassing all monitors)
 	// to the coords for the monitor we're displaying on:
 	r.left -= m_mon_x;
 	r.right -= m_mon_x;

Src/Plugins/Input/in_wmvdrm/vid_overlay.cpp

@@ -1,5 +1,5 @@
 #include "main.h"
-#include <windows.h>
+#include <arch.h>
 #include <multimon.h>
 #include "vid_overlay.h"
 #include "directdraw.h"