[Scummvm-cvs-logs] SF.net SVN: scummvm:[54318] scummvm/trunk/backends
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Thu Nov 18 14:17:26 CET 2010
Revision: 54318
http://scummvm.svn.sourceforge.net/scummvm/?rev=54318&view=rev
Author: fingolfin
Date: 2010-11-18 13:17:25 +0000 (Thu, 18 Nov 2010)
Log Message:
-----------
DS: Add some FIXME/TODO comments on changes that need to be applied to the DS backend
Modified Paths:
--------------
scummvm/trunk/backends/fs/ds/ds-fs.h
scummvm/trunk/backends/platform/ds/arm9/source/cdaudio.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/fs/ds/ds-fs.h
===================================================================
--- scummvm/trunk/backends/fs/ds/ds-fs.h 2010-11-18 13:13:48 UTC (rev 54317)
+++ scummvm/trunk/backends/fs/ds/ds-fs.h 2010-11-18 13:17:25 UTC (rev 54318)
@@ -205,6 +205,14 @@
};
+// FIXME/TODO: Get rid of the following hacks. Top priority: Get rid of
+// the 'FILE' (re)definition. Simply calling it STD_FILE or so wold already
+// suffice (need to adjust affected code, of course).
+// Once the OSystem::logMessage() patch is in SVN, we should also be
+// able to get rid of stderr, stdout, stdin.
+// Moreover, the std_FOO() functions could then be moved to a private
+// header, or even completely merged into DSFileStream, and all other
+// DS code switch to use that.
#undef stderr
#undef stdout
#undef stdin
Modified: scummvm/trunk/backends/platform/ds/arm9/source/cdaudio.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/cdaudio.h 2010-11-18 13:13:48 UTC (rev 54317)
+++ scummvm/trunk/backends/platform/ds/arm9/source/cdaudio.h 2010-11-18 13:17:25 UTC (rev 54318)
@@ -29,6 +29,9 @@
namespace DS {
namespace CD {
+// FIXME/TODO: The code in this file should be turned into a custom
+// AudioCDManager subclass, see backends/audiocd/ and common/system.h
+
void setActive(bool active);
void playTrack(int track, int numLoops, int startFrame, int duration);
void stopTrack();
Modified: scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp 2010-11-18 13:13:48 UTC (rev 54317)
+++ scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp 2010-11-18 13:17:25 UTC (rev 54318)
@@ -700,6 +700,10 @@
void OSystem_DS::deleteMutex(MutexRef mutex) {
}
+// FIXME/TODO: The CD API as follows is *obsolete*
+// and should be replaced by an AudioCDManager subclass,
+// see backends/audiocd/ and common/system.h
+
bool OSystem_DS::openCD(int drive) {
return DS::CD::checkCD();
}
Modified: scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h 2010-11-18 13:13:48 UTC (rev 54317)
+++ scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h 2010-11-18 13:17:25 UTC (rev 54318)
@@ -124,9 +124,12 @@
virtual void unlockMutex(MutexRef mutex);
virtual void deleteMutex(MutexRef mutex);
+
+ // FIXME/TODO: The CD API as follows is *obsolete*
+ // and should be replaced by an AudioCDManager subclass,
+ // see backends/audiocd/ and common/system.h
virtual bool openCD(int drive);
virtual bool pollCD();
-
virtual void playCD(int track, int num_loops, int start_frame, int duration);
virtual void stopCD();
virtual void updateCD();
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