[Scummvm-cvs-logs] SF.net SVN: scummvm: [24506] scummvm/trunk/backends/platform/ds/arm9/source
Tramboi at users.sourceforge.net
Tramboi at users.sourceforge.net
Wed Oct 25 21:37:48 CEST 2006
Revision: 24506
http://svn.sourceforge.net/scummvm/?rev=24506&view=rev
Author: Tramboi
Date: 2006-10-25 12:37:43 -0700 (Wed, 25 Oct 2006)
Log Message:
-----------
DS : Blind backends changes to comply to fingolfin's changes
Modified Paths:
--------------
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/osystem_ds.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp 2006-10-25 19:32:01 UTC (rev 24505)
+++ scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp 2006-10-25 19:37:43 UTC (rev 24506)
@@ -51,12 +51,22 @@
OSystem_DS::~OSystem_DS() {
}
+static int timer_handler(int t)
+{
+ DSTimerManager *tm = (DSTimerManager *)g_system->getTimerManager();
+ tm->handler();
+ return t;
+}
+
void OSystem_DS::initBackend() {
ConfMan.setInt("autosave_period", 0);
ConfMan.setBool("FM_low_quality", true);
_mixer = new DSAudioMixer;
_timer = new DSTimerManager;
+ DS::setSoundProc(Audio::Mixer::mixCallback, _mixer);
+ DS::setTimerCallback(&timer_handler, 10);
+
OSystem::initBackend();
}
@@ -367,12 +377,6 @@
DS::addEventsToQueue();
}
-void OSystem_DS::setTimerCallback(TimerProc callback, int interval)
-{
-// consolePrintf("Settimercallback interval=%d\n", interval);
- DS::setTimerCallback(callback, interval);
-}
-
OSystem::MutexRef OSystem_DS::createMutex(void)
{
return NULL;
@@ -390,13 +394,6 @@
{
}
-bool OSystem_DS::setSoundCallback(SoundProc proc, void *param)
-{
-// consolePrintf("Setsoundcallback");
- DS::setSoundProc(proc, param);
- return true;
-}
-
void OSystem_DS::clearSoundCallback()
{
consolePrintf("Clearing sound callback");
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:32:01 UTC (rev 24505)
+++ scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h 2006-10-25 19:37:43 UTC (rev 24506)
@@ -100,14 +100,11 @@
virtual uint32 getMillis();
virtual void delayMillis(uint msecs);
- virtual void setTimerCallback(TimerProc callback, int interval);
-
virtual MutexRef createMutex(void);
virtual void lockMutex(MutexRef mutex);
virtual void unlockMutex(MutexRef mutex);
virtual void deleteMutex(MutexRef mutex);
- virtual bool setSoundCallback(SoundProc proc, void *param);
virtual void clearSoundCallback();
virtual int getOutputSampleRate() const;
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