[Scummvm-cvs-logs] SF.net SVN: scummvm: [24504] scummvm/trunk/backends/platform/ds/arm9/source

[Tramboi at users.sourceforge.net]

Revision: 24504
          http://svn.sourceforge.net/scummvm/?rev=24504&view=rev
Author:   Tramboi
Date:     2006-10-25 12:18:38 -0700 (Wed, 25 Oct 2006)

Log Message:
-----------
DS backend : Compile fixes for the new backends system, still needs plugging the old callbacks

Modified Paths:
--------------
    scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp
    scummvm/trunk/backends/platform/ds/arm9/source/dsmain.h
    scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp
    scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h

Modified: scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp	2006-10-25 19:01:34 UTC (rev 24503)
+++ scummvm/trunk/backends/platform/ds/arm9/source/dsmain.cpp	2006-10-25 19:18:38 UTC (rev 24504)
@@ -69,7 +69,7 @@
 // Timer Callback
 int callbackInterval;
 int callbackTimer;
-OSystem::TimerProc callback;
+OSystem_DS::TimerProc callback;
 
 // Scaled
 bool scaledMode;
@@ -99,7 +99,7 @@
 bool indyFightState;
 bool indyFightRight;
 
-OSystem::SoundProc soundCallback;
+OSystem_DS::SoundProc soundCallback;
 void* soundParam;
 int lastCallbackFrame;
 bool bufferFirstHalf;
@@ -603,7 +603,7 @@
 	return BG_GFX + 0x10000;		// 16bit qty!
 }
 
-void setSoundProc(OSystem::SoundProc proc, void* param) {
+void setSoundProc(OSystem_DS::SoundProc proc, void* param) {
 //	consolePrintf("Set sound callback");
 	soundCallback = proc;
 	soundParam = param;
@@ -1464,7 +1464,7 @@
 //	return frameCount * FRAME_TIME;
 }
 
-void setTimerCallback(OSystem::TimerProc proc, int interval) {
+void setTimerCallback(OSystem_DS::TimerProc proc, int interval) {
 //	consolePrintf("Set timer proc %x, int %d\n", proc, interval);
 	callback = proc;
 	callbackInterval = interval;

Modified: scummvm/trunk/backends/platform/ds/arm9/source/dsmain.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/dsmain.h	2006-10-25 19:01:34 UTC (rev 24503)
+++ scummvm/trunk/backends/platform/ds/arm9/source/dsmain.h	2006-10-25 19:18:38 UTC (rev 24504)
@@ -23,7 +23,7 @@
 
 #include <nds.h>
 #include "stdafx.h"
-#include "system.h"
+#include "osystem_ds.h"
 #include "scummconsole.h"
 #include "NDS/scummvm_ipc.h"
 
@@ -63,12 +63,12 @@
 void 	setTopScreenTarget(int x, int y);
 
 // Timers
-void 	setTimerCallback(OSystem::TimerProc proc, int interval);		// Setup a callback function at a regular interval
+void 	setTimerCallback(OSystem_DS::TimerProc proc, int interval);		// Setup a callback function at a regular interval
 int 	getMillis();													// Return the current runtime in milliseconds
 void 	doTimerCallback();												// Call callback function if required
 
 // Sound
-void 	setSoundProc(OSystem::SoundProc proc, void* param);			// Setup a callback function for sound
+void 	setSoundProc(OSystem_DS::SoundProc proc, void* param);			// Setup a callback function for sound
 void 	doSoundCallback();												// Call function if sound buffers need more data
 void 	playSound(const void* data, u32 length, bool loop, bool adpcm = false, int rate = 22050);		// Start a sound
 void 	stopSound(int channel);

Modified: scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp	2006-10-25 19:01:34 UTC (rev 24503)
+++ scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp	2006-10-25 19:18:38 UTC (rev 24504)
@@ -44,6 +44,8 @@
 	lastPenFrame = 0;
 	queuePos = 0;
 	_instance = this;
+	_mixer = NULL;
+    _timer = NULL;
 }
 
 OSystem_DS::~OSystem_DS() {
@@ -53,6 +55,8 @@
 	ConfMan.setInt("autosave_period", 0);
 	ConfMan.setBool("FM_low_quality", true);
 
+	_mixer = new DSAudioMixer;
+	_timer = new DSTimerManager;
 	OSystem::initBackend();
 }
 

Modified: scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h	2006-10-25 19:01:34 UTC (rev 24503)
+++ scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h	2006-10-25 19:18:38 UTC (rev 24504)
@@ -25,7 +25,19 @@
 #include "nds.h"
 #include "ramsave.h"
 #include "gbampsave.h"
+#include "backends/saves/default/default-saves.h"
+#include "backends/timer/default/default-timer.h"
+#include "sound/mixer.h"
 
+class DSAudioMixer : public Audio::Mixer
+{	
+};
+
+class DSTimerManager : public DefaultTimerManager
+{	
+};
+
+
 class OSystem_DS : public OSystem {
 public:
 	static OSystem_DS *instance() { return _instance; }
@@ -37,8 +49,13 @@
 	
 	DSSaveFileManager saveManager;
 	GBAMPSaveFileManager mpSaveManager;
+    DSAudioMixer* _mixer;
+    DSTimerManager* _timer;
+    	
+	static OSystem_DS* _instance;
 	
-	static OSystem_DS* _instance;
+	typedef void (*SoundProc)(void *param, byte *buf, int len);
+    typedef int  (*TimerProc)(int interval);
 
 public:
 
@@ -119,6 +136,9 @@
 	virtual void clearFocusRectangle();
 	
 	virtual void initBackend();
+	
+	virtual Audio::Mixer*            getMixer()           { return _mixer; }
+    virtual Common::TimerManager*    getTimerManager()    { return _timer; }
 };
 
 static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.