Removed backends/intern.h

svn-id: r30611

18 files changed, 37 insertions, 15 deletions

diff --git a/backends/platform/PalmOS/Src/os5_sound.cpp b/backends/platform/PalmOS/Src/os5_sound.cpp
index f34d010bca..92147ef2a0 100644
--- a/backends/platform/PalmOS/Src/os5_sound.cpp
+++ b/backends/platform/PalmOS/Src/os5_sound.cpp
@@ -24,9 +24,19 @@
  */
 
 #include "be_os5.h"
-#include "backends/intern.h"
 #include "common/config-manager.h"
 
+#ifdef PALMOS_ARM
+#	ifdef COMPILE_ZODIAC
+#		define SAMPLES_PER_SEC 44100
+#	else
+#		define SAMPLES_PER_SEC 22050
+#	endif
+#else
+#	define SAMPLES_PER_SEC 8000
+#endif
+
+
 SoundExType _soundEx;
 
 static Err sndCallback(void* UserDataP, SndStreamRef stream, void* bufferP, UInt32 *bufferSizeP) {
diff --git a/backends/platform/gp2x/gp2x-common.h b/backends/platform/gp2x/gp2x-common.h
index 2dbc868ab2..1aa5107fcc 100644
--- a/backends/platform/gp2x/gp2x-common.h
+++ b/backends/platform/gp2x/gp2x-common.h
@@ -32,7 +32,6 @@
 #include "common/scummsys.h"
 #include "common/system.h"
 #include "graphics/scaler.h"
-#include "backends/intern.h"
 
 #include <SDL.h>
 #include <SDL_gp2x.h>
diff --git a/backends/platform/gp2x/gp2x.cpp b/backends/platform/gp2x/gp2x.cpp
index 724731aafb..7b99d9cfeb 100644
--- a/backends/platform/gp2x/gp2x.cpp
+++ b/backends/platform/gp2x/gp2x.cpp
@@ -54,6 +54,8 @@
 #include "config.h"
 #endif
 
+#define	SAMPLES_PER_SEC	11025
+
 static Uint32 timer_handler(Uint32 interval, void *param) {
 	((DefaultTimerManager *)param)->handler();
 	return interval;
diff --git a/backends/platform/gp32/gp32_osys.h b/backends/platform/gp32/gp32_osys.h
index 3c6e0686f4..44a313265f 100644
--- a/backends/platform/gp32/gp32_osys.h
+++ b/backends/platform/gp32/gp32_osys.h
@@ -29,7 +29,6 @@
 //Standard ScummVM includes.
 #include "common/scummsys.h"
 #include "common/system.h"
-#include "backends/intern.h"
 
 #include "engines/engine.h"
 
diff --git a/backends/platform/gp32/gp32std.cpp b/backends/platform/gp32/gp32std.cpp
index 898d4669b6..13ec3a1a2a 100644
--- a/backends/platform/gp32/gp32std.cpp
+++ b/backends/platform/gp32/gp32std.cpp
@@ -26,7 +26,6 @@
 #include "common/scummsys.h"
 //#include "graphics/scaler.h"
 #include "common/system.h"
-#include "backends/intern.h"
 
 #include "engines/engine.h"
 
diff --git a/backends/platform/gp32/gp32std_file.cpp b/backends/platform/gp32/gp32std_file.cpp
index 61fe3da0ee..6c7076c4d4 100644
--- a/backends/platform/gp32/gp32std_file.cpp
+++ b/backends/platform/gp32/gp32std_file.cpp
@@ -27,7 +27,6 @@
 #include "common/scummsys.h"
 //#include "graphics/scaler.h"
 #include "common/system.h"
-#include "backends/intern.h"
 
 #include "gp32std.h"
 #include "gp32std_file.h"
diff --git a/backends/platform/gp32/gp32std_grap.cpp b/backends/platform/gp32/gp32std_grap.cpp
index 50349d6708..a60f61c66b 100644
--- a/backends/platform/gp32/gp32std_grap.cpp
+++ b/backends/platform/gp32/gp32std_grap.cpp
@@ -25,7 +25,6 @@
 
 #include "common/scummsys.h"
 #include "common/system.h"
-#include "backends/intern.h"
 
 #include "gp32std.h"
 #include "gp32std_grap.h"
diff --git a/backends/platform/gp32/gp32std_memory.cpp b/backends/platform/gp32/gp32std_memory.cpp
index 607ea7659a..9d7ef9a124 100644
--- a/backends/platform/gp32/gp32std_memory.cpp
+++ b/backends/platform/gp32/gp32std_memory.cpp
@@ -26,7 +26,6 @@
 #include "common/scummsys.h"
 //#include "graphics/scaler.h"
 #include "common/system.h"
-#include "backends/intern.h"
 
 #include "engines/engine.h"
 
diff --git a/backends/platform/iphone/osys_iphone.cpp b/backends/platform/iphone/osys_iphone.cpp
index c957191cdb..4dc5948aaf 100644
--- a/backends/platform/iphone/osys_iphone.cpp
+++ b/backends/platform/iphone/osys_iphone.cpp
@@ -41,7 +41,6 @@
 
 #include "backends/saves/default/default-saves.h"
 #include "backends/timer/default/default-timer.h"
-#include "backends/intern.h"
 #include "sound/mixer.h"
 #include "gui/message.h"
 
diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp
index cc64c3b6d3..8856dcc77b 100644
--- a/backends/platform/psp/osys_psp.cpp
+++ b/backends/platform/psp/osys_psp.cpp
@@ -39,6 +39,8 @@
 
 #include "./trace.h"
 
+#define	SAMPLES_PER_SEC	44100
+
 #define	SCREEN_WIDTH	480
 #define	SCREEN_HEIGHT	272
 
diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h
index a7a4834441..78bdd5bd1e 100644
--- a/backends/platform/psp/osys_psp.h
+++ b/backends/platform/psp/osys_psp.h
@@ -25,7 +25,6 @@
 
 #include "common/scummsys.h"
 #include "common/system.h"
-#include "backends/intern.h"
 #include "graphics/surface.h"
 
 #include <SDL.h>
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index c12e4001ef..9e71ebe0a5 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -34,6 +34,11 @@
 
 #include "icons/scummvm.xpm"
 
+//#define SAMPLES_PER_SEC 11025
+#define SAMPLES_PER_SEC 22050
+//#define SAMPLES_PER_SEC 44100
+
+
 static Uint32 timer_handler(Uint32 interval, void *param) {
 	((DefaultTimerManager *)param)->handler();
 	return interval;
diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h
index c78919748c..827e8c300b 100644
--- a/backends/platform/sdl/sdl.h
+++ b/backends/platform/sdl/sdl.h
@@ -35,7 +35,6 @@
 #include "common/scummsys.h"
 #include "common/system.h"
 #include "graphics/scaler.h"
-#include "backends/intern.h"
 
 
 namespace Audio {
diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp
index 2837501a4a..bca7b86a07 100644
--- a/backends/platform/symbian/src/SymbianOS.cpp
+++ b/backends/platform/symbian/src/SymbianOS.cpp
@@ -35,6 +35,13 @@
 
 #include "..\..\sdl\main.cpp"
 
+#ifdef SAMPLES_PER_SEC_8000 // the GreanSymbianMMP format cannot handle values for defines :(
+  #define SAMPLES_PER_SEC 8000
+#else
+  #define SAMPLES_PER_SEC 16000
+#endif
+
+
 ////////// extern "C" ///////////////////////////////////////////////////
 namespace Symbian {
 
@@ -52,8 +59,7 @@ void FatalError(const char *msg) {
 }
 
 // make this easily available everywhere
-char* GetExecutablePath()
-{
+char* GetExecutablePath() {
 	return CSDLApp::GetExecutablePathCStr();	
 }
 
diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp
index e29444552e..dcfa345e43 100644
--- a/backends/platform/wince/wince-sdl.cpp
+++ b/backends/platform/wince/wince-sdl.cpp
@@ -68,6 +68,9 @@
 extern "C" _CRTIMP FILE* __cdecl   _wfreopen (const wchar_t*, const wchar_t*, FILE*);
 #endif
 
+#define SAMPLES_PER_SEC_OLD 11025
+#define SAMPLES_PER_SEC_NEW 22050
+
 using namespace CEGUI;
 
 // ********************************************************************************************
diff --git a/backends/platform/wince/wince-sdl.h b/backends/platform/wince/wince-sdl.h
index 21fe46b281..daa7e832f6 100644
--- a/backends/platform/wince/wince-sdl.h
+++ b/backends/platform/wince/wince-sdl.h
@@ -29,7 +29,6 @@
 #include "common/scummsys.h"
 #include "common/system.h"
 #include "graphics/scaler.h"
-#include "backends/intern.h"
 #include "backends/platform/sdl/sdl.h"
 
 #include "CEGUI.h"
diff --git a/backends/platform/x11/x11.cpp b/backends/platform/x11/x11.cpp
index e82b4bf2d6..3acc40e861 100644
--- a/backends/platform/x11/x11.cpp
+++ b/backends/platform/x11/x11.cpp
@@ -30,7 +30,6 @@
 #include "common/system.h"
 #include "common/util.h"
 #include "base/main.h"
-#include "backends/intern.h"
 #include "backends/platform/x11/x11.h"
 #include "backends/plugins/posix/posix-provider.h"
 
@@ -61,6 +60,12 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
+
+//#define SAMPLES_PER_SEC 11025
+#define SAMPLES_PER_SEC 22050
+//#define SAMPLES_PER_SEC 44100
+
+
 int main(int argc, char *argv[]) {
 	g_system = OSystem_X11::create(0, 0);
 	assert(g_system);
diff --git a/common/system.cpp b/common/system.cpp
index 786b3cec1a..faced65993 100644
--- a/common/system.cpp
+++ b/common/system.cpp
@@ -23,7 +23,6 @@
  *
  */
 
-#include "backends/intern.h"
 #include "backends/events/default/default-events.h"
 
 #include "common/config-manager.h"