Unscatter arch includes.
This commit is contained in:
Steve Checkoway
@@ -3,7 +3,6 @@
|
|||||||
#include "RageLog.h"
|
#include "RageLog.h"
|
||||||
#include "arch/InputHandler/InputHandler.h"
|
#include "arch/InputHandler/InputHandler.h"
|
||||||
#include "arch/arch.h"
|
#include "arch/arch.h"
|
||||||
#include "arch/arch_default.h"
|
|
||||||
#include "Foreach.h"
|
#include "Foreach.h"
|
||||||
#include "Preference.h"
|
#include "Preference.h"
|
||||||
#include "LuaManager.h"
|
#include "LuaManager.h"
|
||||||
@@ -25,10 +24,6 @@ RageInput::RageInput()
|
|||||||
LUA->Release( L );
|
LUA->Release( L );
|
||||||
}
|
}
|
||||||
|
|
||||||
m_sDriverList = g_sInputDrivers;
|
|
||||||
if( m_sDriverList.empty() )
|
|
||||||
m_sDriverList = DEFAULT_INPUT_DRIVER_LIST;
|
|
||||||
|
|
||||||
LoadDrivers();
|
LoadDrivers();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -49,7 +44,7 @@ void RageInput::LoadDrivers()
|
|||||||
m_pDevices.clear();
|
m_pDevices.clear();
|
||||||
|
|
||||||
/* Init optional devices. */
|
/* Init optional devices. */
|
||||||
MakeInputHandlers( m_sDriverList, m_pDevices );
|
MakeInputHandlers( g_sInputDrivers, m_pDevices );
|
||||||
|
|
||||||
/* If no input devices are loaded, the user won't be able to input anything. */
|
/* If no input devices are loaded, the user won't be able to input anything. */
|
||||||
if( m_pDevices.size() == 0 )
|
if( m_pDevices.size() == 0 )
|
||||||
|
|||||||
@@ -31,7 +31,6 @@ public:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
vector<InputHandler *> m_pDevices;
|
vector<InputHandler *> m_pDevices;
|
||||||
RString m_sDriverList;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
extern RageInput* INPUTMAN; // global and accessable from anywhere in our program
|
extern RageInput* INPUTMAN; // global and accessable from anywhere in our program
|
||||||
|
|||||||
@@ -1,48 +0,0 @@
|
|||||||
#ifndef SELECTOR_ARCH_HOOKS_H
|
|
||||||
#define SELECTOR_ARCH_HOOKS_H
|
|
||||||
|
|
||||||
#include "arch/arch_platform.h"
|
|
||||||
|
|
||||||
/* ArchHooks driver selector. */
|
|
||||||
#if defined(MACOSX)
|
|
||||||
#include "ArchHooks_darwin.h"
|
|
||||||
|
|
||||||
#elif defined(UNIX)
|
|
||||||
#include "ArchHooks_Unix.h"
|
|
||||||
|
|
||||||
#elif defined(WINDOWS)
|
|
||||||
#include "ArchHooks_Win32.h"
|
|
||||||
|
|
||||||
#elif defined(HAVE_XDK)
|
|
||||||
#include "ArchHooks_Xbox.h"
|
|
||||||
|
|
||||||
#else
|
|
||||||
#error "No suitable ArchHooks available."
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* (c) 2005 Ben Anderson.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
||||||
* copy of this software and associated documentation files (the
|
|
||||||
* "Software"), to deal in the Software without restriction, including
|
|
||||||
* without limitation the rights to use, copy, modify, merge, publish,
|
|
||||||
* distribute, and/or sell copies of the Software, and to permit persons to
|
|
||||||
* whom the Software is furnished to do so, provided that the above
|
|
||||||
* copyright notice(s) and this permission notice appear in all copies of
|
|
||||||
* the Software and that both the above copyright notice(s) and this
|
|
||||||
* permission notice appear in supporting documentation.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
||||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
|
|
||||||
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
|
|
||||||
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
|
|
||||||
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
|
|
||||||
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
|
||||||
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
||||||
* PERFORMANCE OF THIS SOFTWARE.
|
|
||||||
*/
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
#ifndef SELECTOR_DIALOG_H
|
|
||||||
#define SELECTOR_DIALOG_H
|
|
||||||
|
|
||||||
#include "arch/arch_platform.h"
|
|
||||||
|
|
||||||
/* Dialog drivers selector. */
|
|
||||||
#if defined(WIN32) && !defined(XBOX)
|
|
||||||
#include "DialogDriver_Win32.h"
|
|
||||||
|
|
||||||
#elif defined(MACOSX)
|
|
||||||
#include "DialogDriver_Cocoa.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "DialogDriver.h" // DialogDriver_Null is in here
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* (c) 2005 Ben Anderson.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
||||||
* copy of this software and associated documentation files (the
|
|
||||||
* "Software"), to deal in the Software without restriction, including
|
|
||||||
* without limitation the rights to use, copy, modify, merge, publish,
|
|
||||||
* distribute, and/or sell copies of the Software, and to permit persons to
|
|
||||||
* whom the Software is furnished to do so, provided that the above
|
|
||||||
* copyright notice(s) and this permission notice appear in all copies of
|
|
||||||
* the Software and that both the above copyright notice(s) and this
|
|
||||||
* permission notice appear in supporting documentation.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
||||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
|
|
||||||
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
|
|
||||||
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
|
|
||||||
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
|
|
||||||
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
|
||||||
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
||||||
* PERFORMANCE OF THIS SOFTWARE.
|
|
||||||
*/
|
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
#ifndef SELECTOR_INPUT_HANDLER_H
|
|
||||||
#define SELECTOR_INPUT_HANDLER_H
|
|
||||||
|
|
||||||
#include "arch/arch_platform.h"
|
|
||||||
|
|
||||||
/* InputHandler drivers selector. */
|
|
||||||
#if defined(HAVE_DIRECTX) && !defined(HAVE_XDK)
|
|
||||||
#include "InputHandler_DirectInput.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(LINUX)
|
|
||||||
#include "InputHandler_Linux_Joystick.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "InputHandler_MonkeyKeyboard.h"
|
|
||||||
|
|
||||||
#if defined(HAVE_X11)
|
|
||||||
#include "InputHandler_X11.h"
|
|
||||||
#elif defined(MACOSX)
|
|
||||||
#include "InputHandler_Carbon.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(WINDOWS)
|
|
||||||
#include "InputHandler_Win32_Pump.h"
|
|
||||||
#include "InputHandler_Win32_Para.h"
|
|
||||||
#include "InputHandler_Win32_MIDI.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_XDK
|
|
||||||
#include "InputHandler_Xbox.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* (c) 2005 Ben Anderson.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
||||||
* copy of this software and associated documentation files (the
|
|
||||||
* "Software"), to deal in the Software without restriction, including
|
|
||||||
* without limitation the rights to use, copy, modify, merge, publish,
|
|
||||||
* distribute, and/or sell copies of the Software, and to permit persons to
|
|
||||||
* whom the Software is furnished to do so, provided that the above
|
|
||||||
* copyright notice(s) and this permission notice appear in all copies of
|
|
||||||
* the Software and that both the above copyright notice(s) and this
|
|
||||||
* permission notice appear in supporting documentation.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
||||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
|
|
||||||
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
|
|
||||||
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
|
|
||||||
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
|
|
||||||
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
|
||||||
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
||||||
* PERFORMANCE OF THIS SOFTWARE.
|
|
||||||
*/
|
|
||||||
@@ -1,44 +0,0 @@
|
|||||||
#ifndef SELECTOR_LIGHTS_DRIVER_H
|
|
||||||
#define SELECTOR_LIGHTS_DRIVER_H
|
|
||||||
|
|
||||||
#include "arch/arch_platform.h"
|
|
||||||
|
|
||||||
/* LightsDriver selector. */
|
|
||||||
#if defined(WINDOWS)
|
|
||||||
#include "LightsDriver_Win32Parallel.h"
|
|
||||||
#endif
|
|
||||||
#if defined(LINUX)
|
|
||||||
#ifndef __PPC__
|
|
||||||
#include "LightsDriver_LinuxParallel.h"
|
|
||||||
#endif
|
|
||||||
#include "LightsDriver_LinuxWeedTech.h"
|
|
||||||
#endif
|
|
||||||
#include "LightsDriver_SystemMessage.h"
|
|
||||||
#include "LightsDriver_Null.h"
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* (c) 2005 Ben Anderson.
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
||||||
* copy of this software and associated documentation files (the
|
|
||||||
* "Software"), to deal in the Software without restriction, including
|
|
||||||
* without limitation the rights to use, copy, modify, merge, publish,
|
|
||||||
* distribute, and/or sell copies of the Software, and to permit persons to
|
|
||||||
* whom the Software is furnished to do so, provided that the above
|
|
||||||
* copyright notice(s) and this permission notice appear in all copies of
|
|
||||||
* the Software and that both the above copyright notice(s) and this
|
|
||||||
* permission notice appear in supporting documentation.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
||||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
|
|
||||||
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
|
|
||||||
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
|
|
||||||
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
|
|
||||||
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
|
||||||
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
||||||
* PERFORMANCE OF THIS SOFTWARE.
|
|
||||||
*/
|
|
||||||
@@ -1,47 +0,0 @@
|
|||||||
#ifndef SELECTOR_LOADING_WINDOW_H
|
|
||||||
#define SELECTOR_LOADING_WINDOW_H
|
|
||||||
|
|
||||||
#include "arch/arch_platform.h"
|
|
||||||
|
|
||||||
/* LoadingWindow driver selector. */
|
|
||||||
#include "LoadingWindow_Null.h"
|
|
||||||
|
|
||||||
#if defined(MACOSX)
|
|
||||||
#include "LoadingWindow_Cocoa.h"
|
|
||||||
|
|
||||||
#elif defined(HAVE_GTK)
|
|
||||||
#include "LoadingWindow_Gtk.h"
|
|
||||||
|
|
||||||
#elif defined(WINDOWS)
|
|
||||||
#include "LoadingWindow_Win32.h"
|
|
||||||
|
|
||||||
#elif defined(HAVE_XDK)
|
|
||||||
#include "LoadingWindow_Xbox.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* (c) 2005 Ben Anderson
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
||||||
* copy of this software and associated documentation files (the
|
|
||||||
* "Software"), to deal in the Software without restriction, including
|
|
||||||
* without limitation the rights to use, copy, modify, merge, publish,
|
|
||||||
* distribute, and/or sell copies of the Software, and to permit persons to
|
|
||||||
* whom the Software is furnished to do so, provided that the above
|
|
||||||
* copyright notice(s) and this permission notice appear in all copies of
|
|
||||||
* the Software and that both the above copyright notice(s) and this
|
|
||||||
* permission notice appear in supporting documentation.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
||||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
|
|
||||||
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
|
|
||||||
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
|
|
||||||
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
|
|
||||||
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
|
||||||
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
||||||
* PERFORMANCE OF THIS SOFTWARE.
|
|
||||||
*/
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
#ifndef SELECTOR_LOW_LEVEL_WINDOW_H
|
|
||||||
#define SELECTOR_LOW_LEVEL_WINDOW_H
|
|
||||||
|
|
||||||
/* LowLevelWindow selector. */
|
|
||||||
#if defined(WINDOWS)
|
|
||||||
#include "LowLevelWindow_Win32.h"
|
|
||||||
#elif defined(HAVE_X11)
|
|
||||||
#include "LowLevelWindow_X11.h"
|
|
||||||
#elif defined(MACOSX)
|
|
||||||
#include "LowLevelWindow_Cocoa.h"
|
|
||||||
#else
|
|
||||||
#error "No suitable LowLevelWindow available."
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* (c) 2005 Ben Anderson
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
||||||
* copy of this software and associated documentation files (the
|
|
||||||
* "Software"), to deal in the Software without restriction, including
|
|
||||||
* without limitation the rights to use, copy, modify, merge, publish,
|
|
||||||
* distribute, and/or sell copies of the Software, and to permit persons to
|
|
||||||
* whom the Software is furnished to do so, provided that the above
|
|
||||||
* copyright notice(s) and this permission notice appear in all copies of
|
|
||||||
* the Software and that both the above copyright notice(s) and this
|
|
||||||
* permission notice appear in supporting documentation.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
||||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
|
|
||||||
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
|
|
||||||
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
|
|
||||||
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
|
|
||||||
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
|
||||||
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
||||||
* PERFORMANCE OF THIS SOFTWARE.
|
|
||||||
*/
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
#ifndef SELECTOR_MEMORY_CARD_DRIVER_H
|
|
||||||
#define SELECTOR_MEMORY_CARD_DRIVER_H
|
|
||||||
|
|
||||||
/* MemoryCardDriver selector. */
|
|
||||||
#if defined(LINUX)
|
|
||||||
# include "MemoryCardDriverThreaded_Linux.h"
|
|
||||||
#elif defined(WINDOWS)
|
|
||||||
# include "MemoryCardDriverThreaded_Windows.h"
|
|
||||||
#elif defined(MACOSX)
|
|
||||||
# include "MemoryCardDriverThreaded_OSX.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* (c) 2005 Ben Anderson
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
||||||
* copy of this software and associated documentation files (the
|
|
||||||
* "Software"), to deal in the Software without restriction, including
|
|
||||||
* without limitation the rights to use, copy, modify, merge, publish,
|
|
||||||
* distribute, and/or sell copies of the Software, and to permit persons to
|
|
||||||
* whom the Software is furnished to do so, provided that the above
|
|
||||||
* copyright notice(s) and this permission notice appear in all copies of
|
|
||||||
* the Software and that both the above copyright notice(s) and this
|
|
||||||
* permission notice appear in supporting documentation.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
||||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
|
|
||||||
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
|
|
||||||
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
|
|
||||||
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
|
|
||||||
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
|
||||||
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
||||||
* PERFORMANCE OF THIS SOFTWARE.
|
|
||||||
*/
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
#ifndef SELECTOR_MOVIE_TEXTURE_H
|
|
||||||
#define SELECTOR_MOVIE_TEXTURE_H
|
|
||||||
|
|
||||||
#include "arch/arch_platform.h"
|
|
||||||
|
|
||||||
/* MovieTexture driver selector. */
|
|
||||||
#if defined(HAVE_DIRECTX) && !defined(HAVE_XDK)
|
|
||||||
#include "MovieTexture_DShow.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_THEORA
|
|
||||||
#include "MovieTexture_Theora.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_FFMPEG
|
|
||||||
#include "MovieTexture_FFMpeg.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "MovieTexture_Null.h"
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* (c) 2005 Ben Anderson
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
||||||
* copy of this software and associated documentation files (the
|
|
||||||
* "Software"), to deal in the Software without restriction, including
|
|
||||||
* without limitation the rights to use, copy, modify, merge, publish,
|
|
||||||
* distribute, and/or sell copies of the Software, and to permit persons to
|
|
||||||
* whom the Software is furnished to do so, provided that the above
|
|
||||||
* copyright notice(s) and this permission notice appear in all copies of
|
|
||||||
* the Software and that both the above copyright notice(s) and this
|
|
||||||
* permission notice appear in supporting documentation.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
||||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
|
|
||||||
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
|
|
||||||
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
|
|
||||||
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
|
|
||||||
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
|
||||||
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
||||||
* PERFORMANCE OF THIS SOFTWARE.
|
|
||||||
*/
|
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
#ifndef SELECTOR_RAGE_SOUND_DRIVER_H
|
|
||||||
#define SELECTOR_RAGE_SOUND_DRIVER_H
|
|
||||||
|
|
||||||
#include "arch/arch_platform.h"
|
|
||||||
|
|
||||||
/* RageSoundDriver selector. */
|
|
||||||
#ifdef HAVE_ALSA
|
|
||||||
#include "RageSoundDriver_ALSA9.h"
|
|
||||||
#include "RageSoundDriver_ALSA9_Software.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(MACOSX)
|
|
||||||
#include "RageSoundDriver_CA.h"
|
|
||||||
#include "RageSoundDriver_AU.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_DIRECTX
|
|
||||||
#include "RageSoundDriver_DSound.h"
|
|
||||||
#include "RageSoundDriver_DSound_Software.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "RageSoundDriver_Null.h"
|
|
||||||
|
|
||||||
#ifdef HAVE_OSS
|
|
||||||
#include "RageSoundDriver_OSS.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(WIN32) && !defined(_XBOX)
|
|
||||||
#include "RageSoundDriver_WaveOut.h"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* (c) 2005 Ben Anderson
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
||||||
* copy of this software and associated documentation files (the
|
|
||||||
* "Software"), to deal in the Software without restriction, including
|
|
||||||
* without limitation the rights to use, copy, modify, merge, publish,
|
|
||||||
* distribute, and/or sell copies of the Software, and to permit persons to
|
|
||||||
* whom the Software is furnished to do so, provided that the above
|
|
||||||
* copyright notice(s) and this permission notice appear in all copies of
|
|
||||||
* the Software and that both the above copyright notice(s) and this
|
|
||||||
* permission notice appear in supporting documentation.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
||||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
|
|
||||||
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
|
|
||||||
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
|
|
||||||
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
|
|
||||||
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
|
||||||
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
||||||
* PERFORMANCE OF THIS SOFTWARE.
|
|
||||||
*/
|
|
||||||
@@ -10,12 +10,12 @@
|
|||||||
#include "arch_platform.h"
|
#include "arch_platform.h"
|
||||||
#include "Foreach.h"
|
#include "Foreach.h"
|
||||||
#include "LocalizedString.h"
|
#include "LocalizedString.h"
|
||||||
#include "arch/arch_default.h"
|
#include "arch_default.h"
|
||||||
|
|
||||||
#include "InputHandler/Selector_InputHandler.h"
|
|
||||||
static LocalizedString INPUT_HANDLERS_EMPTY( "Arch", "Input Handlers cannot be empty." );
|
static LocalizedString INPUT_HANDLERS_EMPTY( "Arch", "Input Handlers cannot be empty." );
|
||||||
void MakeInputHandlers( const RString &drivers, vector<InputHandler *> &Add )
|
void MakeInputHandlers( const RString &drivers_, vector<InputHandler *> &Add )
|
||||||
{
|
{
|
||||||
|
const RString drivers = drivers_.empty()? RString(DEFAULT_INPUT_DRIVER_LIST):drivers_;
|
||||||
vector<RString> DriversToTry;
|
vector<RString> DriversToTry;
|
||||||
split( drivers, ",", DriversToTry, true );
|
split( drivers, ",", DriversToTry, true );
|
||||||
|
|
||||||
@@ -67,7 +67,6 @@ void MakeInputHandlers( const RString &drivers, vector<InputHandler *> &Add )
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "Lights/Selector_LightsDriver.h"
|
|
||||||
void MakeLightsDrivers( const RString &driver, vector<LightsDriver *> &Add )
|
void MakeLightsDrivers( const RString &driver, vector<LightsDriver *> &Add )
|
||||||
{
|
{
|
||||||
LOG->Trace( "Initializing lights driver: %s", driver.c_str() );
|
LOG->Trace( "Initializing lights driver: %s", driver.c_str() );
|
||||||
@@ -92,7 +91,6 @@ void MakeLightsDrivers( const RString &driver, vector<LightsDriver *> &Add )
|
|||||||
Add.push_back( new LightsDriver_SystemMessage );
|
Add.push_back( new LightsDriver_SystemMessage );
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "LoadingWindow/Selector_LoadingWindow.h"
|
|
||||||
LoadingWindow *MakeLoadingWindow()
|
LoadingWindow *MakeLoadingWindow()
|
||||||
{
|
{
|
||||||
if( !PREFSMAN->m_bShowLoadingWindow )
|
if( !PREFSMAN->m_bShowLoadingWindow )
|
||||||
@@ -149,15 +147,12 @@ LoadingWindow *MakeLoadingWindow()
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if defined(SUPPORT_OPENGL)
|
#if defined(SUPPORT_OPENGL)
|
||||||
#include "LowLevelWindow/Selector_LowLevelWindow.h"
|
|
||||||
LowLevelWindow *MakeLowLevelWindow()
|
LowLevelWindow *MakeLowLevelWindow()
|
||||||
{
|
{
|
||||||
return new ARCH_LOW_LEVEL_WINDOW;
|
return new ARCH_LOW_LEVEL_WINDOW;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "MemoryCard/MemoryCardDriver_Null.h"
|
|
||||||
#include "MemoryCard/Selector_MemoryCardDriver.h"
|
|
||||||
MemoryCardDriver *MakeMemoryCardDriver()
|
MemoryCardDriver *MakeMemoryCardDriver()
|
||||||
{
|
{
|
||||||
MemoryCardDriver *ret = NULL;
|
MemoryCardDriver *ret = NULL;
|
||||||
@@ -173,7 +168,6 @@ MemoryCardDriver *MakeMemoryCardDriver()
|
|||||||
}
|
}
|
||||||
|
|
||||||
static Preference<RString> g_sMovieDrivers( "MovieDrivers", "" ); // "" == default
|
static Preference<RString> g_sMovieDrivers( "MovieDrivers", "" ); // "" == default
|
||||||
#include "MovieTexture/Selector_MovieTexture.h"
|
|
||||||
static void DumpAVIDebugInfo( const RString& fn );
|
static void DumpAVIDebugInfo( const RString& fn );
|
||||||
/* Try drivers in order of preference until we find one that works. */
|
/* Try drivers in order of preference until we find one that works. */
|
||||||
static LocalizedString MOVIE_DRIVERS_EMPTY ( "Arch", "Movie Drivers cannot be empty." );
|
static LocalizedString MOVIE_DRIVERS_EMPTY ( "Arch", "Movie Drivers cannot be empty." );
|
||||||
@@ -232,7 +226,6 @@ RageMovieTexture *MakeRageMovieTexture( RageTextureID ID )
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "Sound/Selector_RageSoundDriver.h"
|
|
||||||
static LocalizedString SOUND_DRIVERS_CANNOT_EMPTY( "Arch", "Sound Drivers cannot be empty." );
|
static LocalizedString SOUND_DRIVERS_CANNOT_EMPTY( "Arch", "Sound Drivers cannot be empty." );
|
||||||
RageSoundDriver *MakeRageSoundDriver( const RString &drivers )
|
RageSoundDriver *MakeRageSoundDriver( const RString &drivers )
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,34 +1,112 @@
|
|||||||
#ifndef ARCH_DEFAULT_H
|
#ifndef ARCH_DEFAULT_H
|
||||||
#define ARCH_DEFAULT_H
|
#define ARCH_DEFAULT_H
|
||||||
|
|
||||||
#include "arch/arch_platform.h"
|
|
||||||
|
|
||||||
/* Define the default driver sets. */
|
/* Define the default driver sets. */
|
||||||
|
#if defined(_WINDOWS)
|
||||||
/* InputHandler drivers */
|
#include "ArchHooks_Win32.h"
|
||||||
#if defined (HAVE_XDK)
|
#include "DialogDriver_Win32.h"
|
||||||
#define DEFAULT_INPUT_DRIVER_LIST "Xbox"
|
#include "InputHandler_DirectInput.h"
|
||||||
#elif defined(HAVE_DIRECTX)
|
#include "InputHandler_Win32_Pump.h"
|
||||||
|
#include "InputHandler_Win32_Para.h"
|
||||||
|
#include "InputHandler_Win32_MIDI.h"
|
||||||
|
#include "LightsDriver_Win32Parallel.h"
|
||||||
|
#include "LoadingWindow_Win32.h"
|
||||||
|
#include "LowLevelWindow_Win32.h"
|
||||||
|
#include "MemoryCardDriverThreaded_Windows.h"
|
||||||
|
#include "MovieTexture_DShow.h"
|
||||||
|
#include "RageSoundDriver_DSound.h"
|
||||||
|
#include "RageSoundDriver_DSound_Software.h"
|
||||||
|
#include "RageSoundDriver_WaveOut.h"
|
||||||
#define DEFAULT_INPUT_DRIVER_LIST "DirectInput,Pump,Para"
|
#define DEFAULT_INPUT_DRIVER_LIST "DirectInput,Pump,Para"
|
||||||
#elif defined(HAVE_X11)
|
#define DEFAULT_MOVIE_DRIVER_LIST "Theora,FFMpeg,DShow,Null"
|
||||||
#define DEFAULT_INPUT_DRIVER_LIST "X11,Joystick"
|
#define DEFAULT_SOUND_DRIVER_LIST "DirectSound,DirectSound-sw,WaveOut,Null"
|
||||||
|
|
||||||
|
|
||||||
#elif defined(MACOSX)
|
#elif defined(MACOSX)
|
||||||
|
#include "ArchHooks_darwin.h"
|
||||||
|
#include "DialogDriver_Cocoa.h"
|
||||||
|
#include "InputHandler_Carbon.h"
|
||||||
|
#include "LoadingWindow_Cocoa.h"
|
||||||
|
#include "LowLevelWindow_Cocoa.h"
|
||||||
|
#include "MemoryCardDriverThreaded_OSX.h"
|
||||||
|
#include "RageSoundDriver_CA.h"
|
||||||
|
#include "RageSoundDriver_AU.h"
|
||||||
#define DEFAULT_INPUT_DRIVER_LIST "Carbon"
|
#define DEFAULT_INPUT_DRIVER_LIST "Carbon"
|
||||||
#elif defined(LINUX)
|
#define DEFAULT_MOVIE_DRIVER_LIST "Theora,FFMpeg,Null"
|
||||||
#define DEFAULT_INPUT_DRIVER_LIST "Joystick"
|
#define DEFAULT_SOUND_DRIVER_LIST "AudioUnit,CoreAudio,Null"
|
||||||
#else
|
|
||||||
#define DEFAULT_INPUT_DRIVER_LIST "Null"
|
|
||||||
|
#elif defined(_XBOX)
|
||||||
|
#include "ArchHooks_Xbox.h"
|
||||||
|
#include "InputHandler_Xbox.h"
|
||||||
|
#include "LoadingWindow_Xbox.h"
|
||||||
|
#include "LowLevelWindow_Win32.h"
|
||||||
|
#include "MemoryCardDriverThreaded_Windows.h"
|
||||||
|
#include "RageSoundDriver_DSound.h"
|
||||||
|
#include "RageSoundDriver_DSound_Software.h"
|
||||||
|
#define DEFAULT_INPUT_DRIVER_LIST "Xbox"
|
||||||
|
#define DEFAULT_MOVIE_DRIVER_LIST "Theora,FFMpeg,DShow,Null"
|
||||||
|
#define DEFAULT_SOUND_DRIVER_LIST "DirectSound,DirectSound-sw,Null"
|
||||||
|
|
||||||
|
|
||||||
|
#elif defined(UNIX)
|
||||||
|
#include "ArchHooks_Unix.h"
|
||||||
|
#include "LowLevelWindow_X11.h"
|
||||||
|
|
||||||
|
#if defined(LINUX)
|
||||||
|
#include "InputHandler_Linux_Joystick.h"
|
||||||
|
#include "LightsDriver_LinuxWeedTech.h"
|
||||||
|
#include "MemoryCardDriverThreaded_Linux.h"
|
||||||
|
|
||||||
|
#ifndef __PPC__
|
||||||
|
#include "LightsDriver_LinuxParallel.h"
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* MovieTexture drivers */
|
#include "InputHandler_X11.h"
|
||||||
#define DEFAULT_MOVIE_DRIVER_LIST "Theora,FFMpeg,DShow,Null"
|
#if defined(HAVE_GTK)
|
||||||
|
#include "LoadingWindow_Gtk.h"
|
||||||
|
#endif
|
||||||
|
#ifdef HAVE_ALSA
|
||||||
|
#include "RageSoundDriver_ALSA9.h"
|
||||||
|
#include "RageSoundDriver_ALSA9_Software.h"
|
||||||
|
#endif
|
||||||
|
#ifdef HAVE_OSS
|
||||||
|
#include "RageSoundDriver_OSS.h"
|
||||||
|
#endif
|
||||||
|
#if defined(LINUX)
|
||||||
|
#define DEFAULT_INPUT_DRIVER_LIST "X11,Joystick"
|
||||||
|
#else
|
||||||
|
#define DEFAULT_INPUT_DRIVER_LIST "X11"
|
||||||
|
#endif
|
||||||
|
#define DEFAULT_MOVIE_DRIVER_LIST "Theora,FFMpeg,Null"
|
||||||
|
#define DEFAULT_SOUND_DRIVER_LIST "ALSA,ALSA-sw,OSS,Null"
|
||||||
|
#else
|
||||||
|
#error Which arch?
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
#ifdef HAVE_THEORA
|
||||||
|
#include "MovieTexture_Theora.h"
|
||||||
|
#endif
|
||||||
|
#ifdef HAVE_FFMPEG
|
||||||
|
#include "MovieTexture_FFMpeg.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* All use these. */
|
||||||
|
#include "DialogDriver.h"
|
||||||
|
#include "InputHandler_MonkeyKeyboard.h"
|
||||||
|
#include "LightsDriver_SystemMessage.h"
|
||||||
|
#include "LightsDriver_Null.h"
|
||||||
|
#include "LoadingWindow_Null.h"
|
||||||
|
#include "MovieTexture_Null.h"
|
||||||
|
#include "RageSoundDriver_Null.h"
|
||||||
|
#include "MemoryCard/MemoryCardDriver_Null.h"
|
||||||
|
|
||||||
/* RageSoundDrivers */
|
|
||||||
#define DEFAULT_SOUND_DRIVER_LIST "ALSA,DirectSound,ALSA-sw,DirectSound-sw,AudioUnit,CoreAudio,OSS,WaveOut,Null"
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* (c) 2002-2005 Glenn Maynard, Ben Anderson
|
* (c) 2002-2006 Glenn Maynard, Ben Anderson, Steve Checkoway
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
||||||
|
|||||||
@@ -1,40 +0,0 @@
|
|||||||
#ifndef ARCH_PLATFORM_H
|
|
||||||
#define ARCH_PLATFORM_H
|
|
||||||
|
|
||||||
// In here, you define which APIs are guaranteed to be available on which OSes.
|
|
||||||
// Don't ever actually #include anything here -- that's for */Selector_*.h.
|
|
||||||
#if defined(_WINDOWS)
|
|
||||||
#define HAVE_DIRECTX
|
|
||||||
#define HAVE_FFMPEG
|
|
||||||
#endif
|
|
||||||
#if defined(_XBOX)
|
|
||||||
#define HAVE_DIRECTX
|
|
||||||
#define HAVE_XDK
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* (c) 2002-2005 Glenn Maynard, Ben Anderson
|
|
||||||
* All rights reserved.
|
|
||||||
*
|
|
||||||
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
||||||
* copy of this software and associated documentation files (the
|
|
||||||
* "Software"), to deal in the Software without restriction, including
|
|
||||||
* without limitation the rights to use, copy, modify, merge, publish,
|
|
||||||
* distribute, and/or sell copies of the Software, and to permit persons to
|
|
||||||
* whom the Software is furnished to do so, provided that the above
|
|
||||||
* copyright notice(s) and this permission notice appear in all copies of
|
|
||||||
* the Software and that both the above copyright notice(s) and this
|
|
||||||
* permission notice appear in supporting documentation.
|
|
||||||
*
|
|
||||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
||||||
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
|
|
||||||
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
|
|
||||||
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
|
|
||||||
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
|
|
||||||
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
|
||||||
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
||||||
* PERFORMANCE OF THIS SOFTWARE.
|
|
||||||
*/
|
|
||||||
Reference in New Issue
Block a user