[Scummvm-cvs-logs] SF.net SVN: scummvm: [27799] scummvm/trunk/backends/platform
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sat Jun 30 23:20:48 CEST 2007
Revision: 27799
http://scummvm.svn.sourceforge.net/scummvm/?rev=27799&view=rev
Author: fingolfin
Date: 2007-06-30 14:20:47 -0700 (Sat, 30 Jun 2007)
Log Message:
-----------
Adding some missing stuff to the PS2 port (it still will require quite some work to get it working again)
Modified Paths:
--------------
scummvm/trunk/backends/platform/ps2/systemps2.cpp
scummvm/trunk/backends/platform/ps2/systemps2.h
scummvm/trunk/backends/platform/psp/osys_psp.h
Modified: scummvm/trunk/backends/platform/ps2/systemps2.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/systemps2.cpp 2007-06-30 21:02:58 UTC (rev 27798)
+++ scummvm/trunk/backends/platform/ps2/systemps2.cpp 2007-06-30 21:20:47 UTC (rev 27799)
@@ -332,6 +332,16 @@
OSystem_PS2::~OSystem_PS2(void) {
}
+void OSystem_PS2::initBackend() {
+ // FIXME: Should probably move lots of stuff from the constructor to here
+ _mixer = new Audio::Mixer();
+ _timer = new DefaultTimerManager();
+ setSoundCallback(Audio::Mixer::mixCallback, _mixer);
+ setTimerCallback(&timer_handler, 10);
+
+ OSystem::initBackend();
+}
+
void OSystem_PS2::initTimer(void) {
// first setup the two threads that get activated by the timer:
// the timerthread and the soundthread
Modified: scummvm/trunk/backends/platform/ps2/systemps2.h
===================================================================
--- scummvm/trunk/backends/platform/ps2/systemps2.h 2007-06-30 21:02:58 UTC (rev 27798)
+++ scummvm/trunk/backends/platform/ps2/systemps2.h 2007-06-30 21:20:47 UTC (rev 27799)
@@ -48,6 +48,9 @@
public:
OSystem_PS2(const char *elfPath);
virtual ~OSystem_PS2(void);
+
+ virtual void initBackend();
+
virtual void initSize(uint width, uint height);
virtual int16 getHeight(void);
@@ -103,6 +106,8 @@
virtual void colorToRGB(OverlayColor color, uint8 &r, uint8 &g, uint8 &b);
virtual Common::SaveFileManager *getSavefileManager();
+ virtual Audio::Mixer *getMixer() { return _mixer; }
+ virtual Common::TimerManager *getTimerManager() { return _timer; }
void timerThread(void);
void soundThread(void);
@@ -129,6 +134,8 @@
bool _useMouse, _useKbd, _useHdd, _usbMassLoaded, _usbMassConnected;
Ps2SaveFileManager *_saveManager;
+ Audio::Mixer *_mixer;
+ Common::TimerManager *_timer;
Gs2dScreen *_screen;
Ps2Input *_input;
Modified: scummvm/trunk/backends/platform/psp/osys_psp.h
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp.h 2007-06-30 21:02:58 UTC (rev 27798)
+++ scummvm/trunk/backends/platform/psp/osys_psp.h 2007-06-30 21:20:47 UTC (rev 27799)
@@ -38,15 +38,6 @@
CENTERED_362X272
};
-namespace Graphics {
- struct Surface;
-}
-
-namespace Common {
- class SaveFileManager;
- class TimerManager;
-}
-
class OSystem_PSP : public OSystem {
public:
static const OSystem::GraphicsMode s_supportedGraphicsModes[];
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