[Scummvm-cvs-logs] SF.net SVN: scummvm: [30611] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Tue Jan 22 15:16:02 CET 2008
Revision: 30611
http://scummvm.svn.sourceforge.net/scummvm/?rev=30611&view=rev
Author: fingolfin
Date: 2008-01-22 06:16:02 -0800 (Tue, 22 Jan 2008)
Log Message:
-----------
Removed backends/intern.h
Modified Paths:
--------------
scummvm/trunk/backends/platform/PalmOS/Src/os5_sound.cpp
scummvm/trunk/backends/platform/gp2x/gp2x-common.h
scummvm/trunk/backends/platform/gp2x/gp2x.cpp
scummvm/trunk/backends/platform/gp32/gp32_osys.h
scummvm/trunk/backends/platform/gp32/gp32std.cpp
scummvm/trunk/backends/platform/gp32/gp32std_file.cpp
scummvm/trunk/backends/platform/gp32/gp32std_grap.cpp
scummvm/trunk/backends/platform/gp32/gp32std_memory.cpp
scummvm/trunk/backends/platform/iphone/osys_iphone.cpp
scummvm/trunk/backends/platform/psp/osys_psp.cpp
scummvm/trunk/backends/platform/psp/osys_psp.h
scummvm/trunk/backends/platform/sdl/sdl.cpp
scummvm/trunk/backends/platform/sdl/sdl.h
scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
scummvm/trunk/backends/platform/wince/wince-sdl.cpp
scummvm/trunk/backends/platform/wince/wince-sdl.h
scummvm/trunk/backends/platform/x11/x11.cpp
scummvm/trunk/common/system.cpp
Modified: scummvm/trunk/backends/platform/PalmOS/Src/os5_sound.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/os5_sound.cpp 2008-01-22 09:47:10 UTC (rev 30610)
+++ scummvm/trunk/backends/platform/PalmOS/Src/os5_sound.cpp 2008-01-22 14:16:02 UTC (rev 30611)
@@ -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) {
Modified: scummvm/trunk/backends/platform/gp2x/gp2x-common.h
===================================================================
--- scummvm/trunk/backends/platform/gp2x/gp2x-common.h 2008-01-22 09:47:10 UTC (rev 30610)
+++ scummvm/trunk/backends/platform/gp2x/gp2x-common.h 2008-01-22 14:16:02 UTC (rev 30611)
@@ -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>
Modified: scummvm/trunk/backends/platform/gp2x/gp2x.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp2x/gp2x.cpp 2008-01-22 09:47:10 UTC (rev 30610)
+++ scummvm/trunk/backends/platform/gp2x/gp2x.cpp 2008-01-22 14:16:02 UTC (rev 30611)
@@ -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;
Modified: scummvm/trunk/backends/platform/gp32/gp32_osys.h
===================================================================
--- scummvm/trunk/backends/platform/gp32/gp32_osys.h 2008-01-22 09:47:10 UTC (rev 30610)
+++ scummvm/trunk/backends/platform/gp32/gp32_osys.h 2008-01-22 14:16:02 UTC (rev 30611)
@@ -29,7 +29,6 @@
//Standard ScummVM includes.
#include "common/scummsys.h"
#include "common/system.h"
-#include "backends/intern.h"
#include "engines/engine.h"
Modified: scummvm/trunk/backends/platform/gp32/gp32std.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp32/gp32std.cpp 2008-01-22 09:47:10 UTC (rev 30610)
+++ scummvm/trunk/backends/platform/gp32/gp32std.cpp 2008-01-22 14:16:02 UTC (rev 30611)
@@ -26,7 +26,6 @@
#include "common/scummsys.h"
//#include "graphics/scaler.h"
#include "common/system.h"
-#include "backends/intern.h"
#include "engines/engine.h"
Modified: scummvm/trunk/backends/platform/gp32/gp32std_file.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp32/gp32std_file.cpp 2008-01-22 09:47:10 UTC (rev 30610)
+++ scummvm/trunk/backends/platform/gp32/gp32std_file.cpp 2008-01-22 14:16:02 UTC (rev 30611)
@@ -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"
Modified: scummvm/trunk/backends/platform/gp32/gp32std_grap.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp32/gp32std_grap.cpp 2008-01-22 09:47:10 UTC (rev 30610)
+++ scummvm/trunk/backends/platform/gp32/gp32std_grap.cpp 2008-01-22 14:16:02 UTC (rev 30611)
@@ -25,7 +25,6 @@
#include "common/scummsys.h"
#include "common/system.h"
-#include "backends/intern.h"
#include "gp32std.h"
#include "gp32std_grap.h"
Modified: scummvm/trunk/backends/platform/gp32/gp32std_memory.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp32/gp32std_memory.cpp 2008-01-22 09:47:10 UTC (rev 30610)
+++ scummvm/trunk/backends/platform/gp32/gp32std_memory.cpp 2008-01-22 14:16:02 UTC (rev 30611)
@@ -26,7 +26,6 @@
#include "common/scummsys.h"
//#include "graphics/scaler.h"
#include "common/system.h"
-#include "backends/intern.h"
#include "engines/engine.h"
Modified: scummvm/trunk/backends/platform/iphone/osys_iphone.cpp
===================================================================
--- scummvm/trunk/backends/platform/iphone/osys_iphone.cpp 2008-01-22 09:47:10 UTC (rev 30610)
+++ scummvm/trunk/backends/platform/iphone/osys_iphone.cpp 2008-01-22 14:16:02 UTC (rev 30611)
@@ -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"
Modified: scummvm/trunk/backends/platform/psp/osys_psp.cpp
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp.cpp 2008-01-22 09:47:10 UTC (rev 30610)
+++ scummvm/trunk/backends/platform/psp/osys_psp.cpp 2008-01-22 14:16:02 UTC (rev 30611)
@@ -39,6 +39,8 @@
#include "./trace.h"
+#define SAMPLES_PER_SEC 44100
+
#define SCREEN_WIDTH 480
#define SCREEN_HEIGHT 272
Modified: scummvm/trunk/backends/platform/psp/osys_psp.h
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp.h 2008-01-22 09:47:10 UTC (rev 30610)
+++ scummvm/trunk/backends/platform/psp/osys_psp.h 2008-01-22 14:16:02 UTC (rev 30611)
@@ -25,7 +25,6 @@
#include "common/scummsys.h"
#include "common/system.h"
-#include "backends/intern.h"
#include "graphics/surface.h"
#include <SDL.h>
Modified: scummvm/trunk/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.cpp 2008-01-22 09:47:10 UTC (rev 30610)
+++ scummvm/trunk/backends/platform/sdl/sdl.cpp 2008-01-22 14:16:02 UTC (rev 30611)
@@ -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;
Modified: scummvm/trunk/backends/platform/sdl/sdl.h
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.h 2008-01-22 09:47:10 UTC (rev 30610)
+++ scummvm/trunk/backends/platform/sdl/sdl.h 2008-01-22 14:16:02 UTC (rev 30611)
@@ -35,7 +35,6 @@
#include "common/scummsys.h"
#include "common/system.h"
#include "graphics/scaler.h"
-#include "backends/intern.h"
namespace Audio {
Modified: scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp 2008-01-22 09:47:10 UTC (rev 30610)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp 2008-01-22 14:16:02 UTC (rev 30611)
@@ -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 @@
}
// make this easily available everywhere
-char* GetExecutablePath()
-{
+char* GetExecutablePath() {
return CSDLApp::GetExecutablePathCStr();
}
Modified: scummvm/trunk/backends/platform/wince/wince-sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2008-01-22 09:47:10 UTC (rev 30610)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.cpp 2008-01-22 14:16:02 UTC (rev 30611)
@@ -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;
// ********************************************************************************************
Modified: scummvm/trunk/backends/platform/wince/wince-sdl.h
===================================================================
--- scummvm/trunk/backends/platform/wince/wince-sdl.h 2008-01-22 09:47:10 UTC (rev 30610)
+++ scummvm/trunk/backends/platform/wince/wince-sdl.h 2008-01-22 14:16:02 UTC (rev 30611)
@@ -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"
Modified: scummvm/trunk/backends/platform/x11/x11.cpp
===================================================================
--- scummvm/trunk/backends/platform/x11/x11.cpp 2008-01-22 09:47:10 UTC (rev 30610)
+++ scummvm/trunk/backends/platform/x11/x11.cpp 2008-01-22 14:16:02 UTC (rev 30611)
@@ -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);
Modified: scummvm/trunk/common/system.cpp
===================================================================
--- scummvm/trunk/common/system.cpp 2008-01-22 09:47:10 UTC (rev 30610)
+++ scummvm/trunk/common/system.cpp 2008-01-22 14:16:02 UTC (rev 30611)
@@ -23,7 +23,6 @@
*
*/
-#include "backends/intern.h"
#include "backends/events/default/default-events.h"
#include "common/config-manager.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list