diff options
author | Matthew Hoops | 2015-09-29 21:00:56 -0400 |
---|---|---|
committer | Johannes Schickel | 2016-03-13 13:52:24 +0100 |
commit | fb6fe1332aaa9ab4d0ec0ad4ee8015ce4076bd85 (patch) | |
tree | cc1284f92298cfd8307ba6985f4105bdce147324 /backends/platform | |
parent | d85eb8ded68a20de383d84064aacd1a4c81db4e9 (diff) | |
download | scummvm-rg350-fb6fe1332aaa9ab4d0ec0ad4ee8015ce4076bd85.tar.gz scummvm-rg350-fb6fe1332aaa9ab4d0ec0ad4ee8015ce4076bd85.tar.bz2 scummvm-rg350-fb6fe1332aaa9ab4d0ec0ad4ee8015ce4076bd85.zip |
BACKENDS: Move to an openCD() without parameters as the public API
Diffstat (limited to 'backends/platform')
-rw-r--r-- | backends/platform/dc/dc.h | 2 | ||||
-rw-r--r-- | backends/platform/dc/dcmain.cpp | 2 | ||||
-rw-r--r-- | backends/platform/ds/arm9/source/osystem_ds.cpp | 2 | ||||
-rw-r--r-- | backends/platform/ds/arm9/source/osystem_ds.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/backends/platform/dc/dc.h b/backends/platform/dc/dc.h index d8ab549c3a..80e484f6f8 100644 --- a/backends/platform/dc/dc.h +++ b/backends/platform/dc/dc.h @@ -58,7 +58,7 @@ class DCHardware { class DCCDManager : public DefaultAudioCDManager { // Initialize the specified CD drive for audio playback. - bool openCD(int drive); + bool openCD(); // Poll cdrom status // Returns true if cd audio is playing diff --git a/backends/platform/dc/dcmain.cpp b/backends/platform/dc/dcmain.cpp index eede796991..aa8430afc8 100644 --- a/backends/platform/dc/dcmain.cpp +++ b/backends/platform/dc/dcmain.cpp @@ -123,7 +123,7 @@ void DCCDManager::updateCD() // Dummy. The CD drive takes care of itself. } -bool DCCDManager::openCD(int drive) +bool DCCDManager::openCD() { // Dummy. return true; diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp index c53f57523d..f23192cd9d 100644 --- a/backends/platform/ds/arm9/source/osystem_ds.cpp +++ b/backends/platform/ds/arm9/source/osystem_ds.cpp @@ -715,7 +715,7 @@ void OSystem_DS::deleteMutex(MutexRef mutex) { // and should be replaced by an AudioCDManager subclass, // see backends/audiocd/ and common/system.h -bool OSystem_DS::openCD(int drive) { +bool OSystem_DS::openCD() { 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 f4dbac66f7..9b66e24b88 100644 --- a/backends/platform/ds/arm9/source/osystem_ds.h +++ b/backends/platform/ds/arm9/source/osystem_ds.h @@ -130,7 +130,7 @@ public: // 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 openCD(); virtual bool pollCD(); virtual void playCD(int track, int num_loops, int start_frame, int duration); virtual void stopCD(); |