aboutsummaryrefslogtreecommitdiff
path: root/backends
diff options
context:
space:
mode:
authorMax Horn2010-11-18 13:17:25 +0000
committerMax Horn2010-11-18 13:17:25 +0000
commit51a954c1dd07c475b01c898ac8614f5a2a83185b (patch)
tree6d9d822bb3fdbfd56107b6a88c1b52f5eb22028f /backends
parent16d9e0f14a840e05c2d8bb38c55ab5696f29a0fa (diff)
downloadscummvm-rg350-51a954c1dd07c475b01c898ac8614f5a2a83185b.tar.gz
scummvm-rg350-51a954c1dd07c475b01c898ac8614f5a2a83185b.tar.bz2
scummvm-rg350-51a954c1dd07c475b01c898ac8614f5a2a83185b.zip
DS: Add some FIXME/TODO comments on changes that need to be applied to the DS backend
svn-id: r54318
Diffstat (limited to 'backends')
-rw-r--r--backends/fs/ds/ds-fs.h8
-rw-r--r--backends/platform/ds/arm9/source/cdaudio.h3
-rw-r--r--backends/platform/ds/arm9/source/osystem_ds.cpp4
-rw-r--r--backends/platform/ds/arm9/source/osystem_ds.h5
4 files changed, 19 insertions, 1 deletions
diff --git a/backends/fs/ds/ds-fs.h b/backends/fs/ds/ds-fs.h
index 6961022848..0a9ba1e48b 100644
--- a/backends/fs/ds/ds-fs.h
+++ b/backends/fs/ds/ds-fs.h
@@ -205,6 +205,14 @@ public:
};
+// 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
diff --git a/backends/platform/ds/arm9/source/cdaudio.h b/backends/platform/ds/arm9/source/cdaudio.h
index 6e53ef7bd2..7a85c97dbd 100644
--- a/backends/platform/ds/arm9/source/cdaudio.h
+++ b/backends/platform/ds/arm9/source/cdaudio.h
@@ -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();
diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp
index c4ff241de0..55e3be6cca 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.cpp
+++ b/backends/platform/ds/arm9/source/osystem_ds.cpp
@@ -700,6 +700,10 @@ void OSystem_DS::unlockMutex(MutexRef mutex) {
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();
}
diff --git a/backends/platform/ds/arm9/source/osystem_ds.h b/backends/platform/ds/arm9/source/osystem_ds.h
index 65ac3f4f7e..50a4353e18 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.h
+++ b/backends/platform/ds/arm9/source/osystem_ds.h
@@ -124,9 +124,12 @@ public:
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();