aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2010-06-01 15:38:09 +0000
committerMax Horn2010-06-01 15:38:09 +0000
commitcaf1a6bee4bb60014290a2208ec0daa0c68496cd (patch)
tree70f2346bee53ab2ac71e02d758e6898d3c7a6a0c
parent9c92bd1b810621bdaa779bd3354b10ad048c7924 (diff)
downloadscummvm-rg350-caf1a6bee4bb60014290a2208ec0daa0c68496cd.tar.gz
scummvm-rg350-caf1a6bee4bb60014290a2208ec0daa0c68496cd.tar.bz2
scummvm-rg350-caf1a6bee4bb60014290a2208ec0daa0c68496cd.zip
Remove dead code from PS2 and GP2x backends
svn-id: r49374
-rw-r--r--backends/platform/gp2x/gp2x-common.h18
-rw-r--r--backends/platform/gp2x/gp2x.cpp25
-rw-r--r--backends/platform/ps2/systemps2.cpp17
-rw-r--r--backends/platform/ps2/systemps2.h6
4 files changed, 1 insertions, 65 deletions
diff --git a/backends/platform/gp2x/gp2x-common.h b/backends/platform/gp2x/gp2x-common.h
index 79eb3f65cf..9f3a79ff97 100644
--- a/backends/platform/gp2x/gp2x-common.h
+++ b/backends/platform/gp2x/gp2x-common.h
@@ -121,19 +121,6 @@ public:
virtual Audio::Mixer *getMixer();
- // Poll CD status
- // Returns true if cd audio is playing
- bool pollCD();
-
- // Play CD audio track
- void playCD(int track, int num_loops, int start_frame, int duration);
-
- // Stop CD audio track
- void stopCD();
-
- // Update CD audio status
- void updateCD();
-
// Quit
void quit();
@@ -206,11 +193,6 @@ protected:
bool _overlayVisible;
Graphics::PixelFormat _overlayFormat;
- // CD Audio
- SDL_CD *_cdrom;
- int _cdTrack, _cdNumLoops, _cdStartFrame, _cdDuration;
- uint32 _cdEndTime, _cdStopTime;
-
enum {
DF_WANT_RECT_OPTIM = 1 << 0
};
diff --git a/backends/platform/gp2x/gp2x.cpp b/backends/platform/gp2x/gp2x.cpp
index 3d4ed51c1f..8669671c4e 100644
--- a/backends/platform/gp2x/gp2x.cpp
+++ b/backends/platform/gp2x/gp2x.cpp
@@ -246,7 +246,7 @@ OSystem_GP2X::OSystem_GP2X()
_hwscreen(0), _screen(0), _tmpscreen(0),
_overlayVisible(false),
_overlayscreen(0), _tmpscreen2(0),
- _cdrom(0), _scalerProc(0), _modeChanged(false), _screenChangeCount(0), _dirtyChecksums(0),
+ _scalerProc(0), _modeChanged(false), _screenChangeCount(0), _dirtyChecksums(0),
_mouseVisible(false), _mouseNeedsRedraw(false), _mouseData(0), _mouseSurface(0),
_mouseOrigSurface(0), _cursorTargetScale(1), _cursorPaletteDisabled(true),
_joystick(0),
@@ -650,26 +650,3 @@ Audio::Mixer *OSystem_GP2X::getMixer() {
assert(_mixer);
return _mixer;
}
-
-#pragma mark -
-#pragma mark --- CD Audio ---
-#pragma mark -
-
-bool OSystem_GP2X::openCD(int drive) {
- return (_cdrom = NULL);
-}
-
-void OSystem_GP2X::stopCD() {
-}
-
-void OSystem_GP2X::playCD(int track, int num_loops, int start_frame, int duration) {
- return;
-}
-
-bool OSystem_GP2X::pollCD() {
- return false;
-}
-
-void OSystem_GP2X::updateCD() {
- return;
-}
diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp
index 49d583d1a1..7659d5194d 100644
--- a/backends/platform/ps2/systemps2.cpp
+++ b/backends/platform/ps2/systemps2.cpp
@@ -624,23 +624,6 @@ void OSystem_PS2::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x,
_screen->setMouseOverlay(buf, w, h, hotspot_x, hotspot_y, keycolor);
}
-bool OSystem_PS2::openCD(int drive) {
- return false;
-}
-
-bool OSystem_PS2::pollCD(void) {
- return false;
-}
-
-void OSystem_PS2::playCD(int track, int num_loops, int start_frame, int duration) {
-}
-
-void OSystem_PS2::stopCD(void) {
-}
-
-void OSystem_PS2::updateCD(void) {
-}
-
void OSystem_PS2::showOverlay(void) {
_screen->showOverlay();
}
diff --git a/backends/platform/ps2/systemps2.h b/backends/platform/ps2/systemps2.h
index 0068ffd93f..78973ed3f0 100644
--- a/backends/platform/ps2/systemps2.h
+++ b/backends/platform/ps2/systemps2.h
@@ -97,12 +97,6 @@ public:
virtual Audio::Mixer *getMixer();
- 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();
-
virtual MutexRef createMutex(void);
virtual void lockMutex(MutexRef mutex);
virtual void unlockMutex(MutexRef mutex);