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/audiocd | |
| 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/audiocd')
| -rw-r--r-- | backends/audiocd/audiocd.h | 3 | ||||
| -rw-r--r-- | backends/audiocd/default/default-audiocd.cpp | 5 | ||||
| -rw-r--r-- | backends/audiocd/default/default-audiocd.h | 7 |
3 files changed, 13 insertions, 2 deletions
diff --git a/backends/audiocd/audiocd.h b/backends/audiocd/audiocd.h index 6eae8e096b..72a01fd87e 100644 --- a/backends/audiocd/audiocd.h +++ b/backends/audiocd/audiocd.h @@ -109,10 +109,9 @@ public: /** * Initialize the specified CD drive for audio playback. - * @param drive the drive id * @return true if the CD drive was inited successfully */ - virtual bool openCD(int drive) = 0; + virtual bool openCD() = 0; /** * Poll CD status. diff --git a/backends/audiocd/default/default-audiocd.cpp b/backends/audiocd/default/default-audiocd.cpp index abf80ac4cd..0c5bb8df03 100644 --- a/backends/audiocd/default/default-audiocd.cpp +++ b/backends/audiocd/default/default-audiocd.cpp @@ -22,6 +22,7 @@ #include "backends/audiocd/default/default-audiocd.h" #include "audio/audiostream.h" +#include "common/config-manager.h" #include "common/system.h" DefaultAudioCDManager::DefaultAudioCDManager() { @@ -152,3 +153,7 @@ DefaultAudioCDManager::Status DefaultAudioCDManager::getStatus() const { info.playing = isPlaying(); return info; } + +bool DefaultAudioCDManager::openCD() { + return openCD(ConfMan.getInt("cdrom")); +} diff --git a/backends/audiocd/default/default-audiocd.h b/backends/audiocd/default/default-audiocd.h index 9e4ba6b33e..1d64690add 100644 --- a/backends/audiocd/default/default-audiocd.h +++ b/backends/audiocd/default/default-audiocd.h @@ -42,6 +42,13 @@ public: void update(); virtual Status getStatus() const; // Subclasses should override for better status results + bool openCD(); + + /** + * Open a CD using the specified drive index + * @param drive The index of the drive + * @note The index is implementation-defined, but 0 is always the best choice + */ virtual bool openCD(int drive) { return false; } virtual void updateCD() {} virtual bool pollCD() const { return false; } |