runs on Xbox

stepmania/src/arch/ArchHooks/ArchHooks_Win32.cpp

@@ -114,4 +114,5 @@ ArchHooks::MessageBoxResult ArchHooks_Win32::MessageBoxAbortRetryIgnore( CString
  * Copyright (c) 2002-2003 by the person(s) listed below.  All rights reserved.
  *
  * Glenn Maynard
+ * Chris Danford
  */

stepmania/src/arch/LowLevelWindow/LowLevelWindow_Null.h

@@ -0,0 +1,22 @@
+#ifndef LOW_LEVEL_WINDOW_SDL_H
+#define LOW_LEVEL_WINDOW_SDL_H
+
+#include "LowLevelWindow.h"
+
+class LowLevelWindow_Null: public LowLevelWindow
+{
+	RageDisplay::VideoModeParams CurrentParams;
+public:
+	LowLevelWindow_Null() {};
+	~LowLevelWindow_Null() {};
+	void *GetProcAddress(CString s) { return NULL; };
+	bool TryVideoMode( RageDisplay::VideoModeParams p, bool &bNewDeviceOut ) { return false; };
+	void SwapBuffers() {};
+	void Update(float fDeltaTime) {};
+
+	RageDisplay::VideoModeParams GetVideoModeParams() const { return CurrentParams; }
+};
+#undef ARCH_LOW_LEVEL_WINDOW
+#define ARCH_LOW_LEVEL_WINDOW LowLevelWindow_Null
+
+#endif

stepmania/src/arch/MovieTexture/MovieTexture.cpp

@@ -13,7 +13,7 @@
 #define DEFAULT_MOVIE_DRIVER_LIST "Null"
 #endif
 
-#include <fstream>
+#include "RageFile.h"
 bool RageMovieTexture::GetFourCC( CString fn, CString &handler, CString &type )
 {
 	CString ignore, ext;

stepmania/src/arch/Sound/DSoundHelpers.cpp

@@ -9,7 +9,7 @@
 #include <math.h>
 
 #pragma comment(lib, "dsound.lib")
-#pragma comment(lib, "dxguid.lib")
+//#pragma comment(lib, "dxguid.lib")
 
 BOOL CALLBACK DSound::EnumCallback(LPGUID lpGuid, LPCSTR lpcstrDescription, LPCSTR lpcstrModule, LPVOID lpContext)
 {

stepmania/src/arch/Sound/RageSoundDriver_DSound.cpp

@@ -12,7 +12,11 @@
 #include "RageUtil.h"
 #include "RageSound.h"
 #include "RageLog.h"
+
+#ifdef _WINDOWS
 #include "archutils/win32/tls.h"
+#endif
+
 #include "SDL.h"
 
 const int channels = 2;
@@ -36,7 +40,9 @@ int RageSound_DSound::MixerThread_start(void *p)
 
 void RageSound_DSound::MixerThread()
 {
+#ifdef _WINDOWS
 	InitThreadData("Mixer thread");
+#endif
 	VDCHECKPOINT;
 
 	/* SOUNDMAN will be set once RageSoundManager's ctor returns and

stepmania/src/arch/arch.cpp

@@ -32,13 +32,10 @@ void MakeInputHandlers(vector<InputHandler *> &Add)
 {
 #if defined(_WINDOWS)
 	Add.push_back(new InputHandler_DInput);
-#else
-	Add.push_back(new InputHandler_SDL);
-#endif
-
-#if defined(_WINDOWS)
 	Add.push_back(new InputHandler_Win32_Pump);
 //	Add.push_back(new InputHandler_Win32_Para);
+#else
+	Add.push_back(new InputHandler_SDL);
 #endif
 }
 

stepmania/src/arch/arch.h

@@ -20,15 +20,26 @@ RageSoundDriver *MakeRageSoundDriver(CString drivers);
 /* Define the default list of sound drivers for each arch.  It's
  * OK to list drivers that may not be available. */
 #if defined(LINUX)
-#define DEFAULT_SOUND_DRIVER_LIST "ALSA9,OSS,Null"
+	#define DEFAULT_SOUND_DRIVER_LIST "ALSA9,OSS,Null"
 #elif defined(DARWIN)
-#define DEFAULT_SOUND_DRIVER_LIST "QT,QT1,Null"
-#elif defined(WIN32)
-#define DEFAULT_SOUND_DRIVER_LIST "DirectSound,DirectSound-sw,WaveOut"
+	#define DEFAULT_SOUND_DRIVER_LIST "QT,QT1,Null"
+#elif defined(_WINDOWS)
+	#define DEFAULT_SOUND_DRIVER_LIST "DirectSound,DirectSound-sw,WaveOut"
+#elif defined(_XBOX)
+	#define DEFAULT_SOUND_DRIVER_LIST "DirectSound"
 #else
-#define DEFAULT_SOUND_DRIVER_LIST "Null"
+	#define DEFAULT_SOUND_DRIVER_LIST "Null"
 #endif
 
+
+/* Hack for Xbox: All paths must be absolute. */
+#if defined(_XBOX)
+	#define BASE_PATH "D:\\"
+#else
+	#define BASE_PATH ""
+#endif
+
+
 #endif
 
 /*

stepmania/src/arch/arch_darwin.h

@@ -13,6 +13,8 @@
 #include "Sound/RageSoundDriver_QT1.h"
 #include "Sound/RageSoundDriver_QT.h"
 #include "LoadingWindow/LoadingWindow_Cocoa.h"
+#include "InputHandler/InputHandler_SDL.h"
+
 #include "ArchHooks/ArchHooks_darwin.h"
 
 #endif

stepmania/src/arch/arch_default.h

@@ -3,6 +3,8 @@
 
 /* All driver types should have a default, portable implementation, provided
  * here. */
+/* None of these SDL implementations run on Xbox, so I've commented 
+ * out use of this header and added the #includes to each arch_*.h */
 
 /* Load default fallback drivers; some of these may be overridden by arch-specific drivers. */
 #include "LoadingWindow/LoadingWindow_SDL.h"
@@ -10,8 +12,10 @@
 #include "ErrorDialog/ErrorDialog_null.h"
 #include "ArchHooks/ArchHooks_none.h"
 #include "Sound/RageSoundDriver_Null.h"
-#include "LowLevelWindow/LowLevelWindow_SDL.h"
-#include "InputHandler/InputHandler_SDL.h"
+#include "LowLevelWindow/LowLevelWindow_Null.h"
+
+// not supported on Xbox
+//#include "InputHandler/InputHandler_SDL.h"
 
 #endif
 

stepmania/src/arch/arch_linux.h

@@ -12,6 +12,7 @@
 #ifdef HAVE_GTK
 #  include "LoadingWindow/LoadingWindow_Gtk.h"
 #endif
+#include "InputHandler/InputHandler_SDL.h"
 
 #endif
 /*

stepmania/src/arch/arch_xbox.h

@@ -1,12 +1,12 @@
 #ifndef XBOX_ARCH_H
 #define XBOX_ARCH_H
 
-/* Load drivers for Win32. */
-#include "LoadingWindow/LoadingWindow_SDL.h"
+/* Load drivers for Xbox. */
+#include "LoadingWindow/LoadingWindow_Null.h"
 #include "ErrorDialog/ErrorDialog_null.h"
 #include "ArchHooks/ArchHooks_none.h"
 
-#include "InputHandler/InputHandler_DirectInput.h"
+#include "InputHandler/InputHandler_SDL.h"
 
 #include "Sound/RageSoundDriver_DSound.h"