diff options
| author | Johannes Schickel | 2016-03-13 14:20:20 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2016-03-13 14:20:20 +0100 |
| commit | 5340df3faf9ee73bc1102ebb5f95c5d82c37df7f (patch) | |
| tree | 2d2e9f95cdb32c9d668232a045ec8fdeb15dd3f1 | |
| parent | 8cd4b881e3e675f5aec8a98f0a1b8b7223a39fba (diff) | |
| download | scummvm-rg350-5340df3faf9ee73bc1102ebb5f95c5d82c37df7f.tar.gz scummvm-rg350-5340df3faf9ee73bc1102ebb5f95c5d82c37df7f.tar.bz2 scummvm-rg350-5340df3faf9ee73bc1102ebb5f95c5d82c37df7f.zip | |
POSIX: Cleanup AudioCD manager creation.
| -rw-r--r-- | backends/platform/sdl/posix/posix.cpp | 7 | ||||
| -rw-r--r-- | backends/platform/sdl/posix/posix.h | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/backends/platform/sdl/posix/posix.cpp b/backends/platform/sdl/posix/posix.cpp index 3989bd0043..e2a642b288 100644 --- a/backends/platform/sdl/posix/posix.cpp +++ b/backends/platform/sdl/posix/posix.cpp @@ -243,12 +243,13 @@ bool OSystem_POSIX::displayLogFile() { return WIFEXITED(status) && WEXITSTATUS(status) == 0; } -#ifdef USE_LINUXCD AudioCDManager *OSystem_POSIX::createAudioCDManager() { +#ifdef USE_LINUXCD return createLinuxAudioCDManager(); -} - +#else + return OSystem_SDL::createAudioCDManager(); #endif +} #endif diff --git a/backends/platform/sdl/posix/posix.h b/backends/platform/sdl/posix/posix.h index 9f69bd227f..0514d30191 100644 --- a/backends/platform/sdl/posix/posix.h +++ b/backends/platform/sdl/posix/posix.h @@ -60,10 +60,7 @@ protected: virtual Common::WriteStream *createLogFile(); -#ifdef USE_LINUXCD - // Override createAudioCDManager() for Linux virtual AudioCDManager *createAudioCDManager(); -#endif }; #endif |