aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schickel2015-01-25 21:51:54 +0100
committerJohannes Schickel2015-01-25 21:51:54 +0100
commitb00050439f0f602cb54500f7fda268a7589b4c8b (patch)
treed5185dddd18bf7a88f3e40d89a2681922990566a
parent99f4dafa72d497529fb7a15dcecb56fe3f717d37 (diff)
downloadscummvm-rg350-b00050439f0f602cb54500f7fda268a7589b4c8b.tar.gz
scummvm-rg350-b00050439f0f602cb54500f7fda268a7589b4c8b.tar.bz2
scummvm-rg350-b00050439f0f602cb54500f7fda268a7589b4c8b.zip
SDL: Guard audio CD code to be SDL 1.2 only.
-rw-r--r--backends/audiocd/sdl/sdl-audiocd.cpp7
-rw-r--r--backends/audiocd/sdl/sdl-audiocd.h4
2 files changed, 10 insertions, 1 deletions
diff --git a/backends/audiocd/sdl/sdl-audiocd.cpp b/backends/audiocd/sdl/sdl-audiocd.cpp
index 5093c03a1c..c7b089af09 100644
--- a/backends/audiocd/sdl/sdl-audiocd.cpp
+++ b/backends/audiocd/sdl/sdl-audiocd.cpp
@@ -24,9 +24,12 @@
#if defined(SDL_BACKEND)
-#include "common/textconsole.h"
#include "backends/audiocd/sdl/sdl-audiocd.h"
+#if !SDL_VERSION_ATLEAST(1, 3, 0)
+
+#include "common/textconsole.h"
+
SdlAudioCDManager::SdlAudioCDManager()
:
_cdrom(0),
@@ -133,4 +136,6 @@ void SdlAudioCDManager::updateCD() {
}
}
+#endif // !SDL_VERSION_ATLEAST(1, 3, 0)
+
#endif
diff --git a/backends/audiocd/sdl/sdl-audiocd.h b/backends/audiocd/sdl/sdl-audiocd.h
index ff98fcdd77..783d4fe0f0 100644
--- a/backends/audiocd/sdl/sdl-audiocd.h
+++ b/backends/audiocd/sdl/sdl-audiocd.h
@@ -27,6 +27,8 @@
#include "backends/platform/sdl/sdl-sys.h"
+#if !SDL_VERSION_ATLEAST(1, 3, 0)
+
/**
* The SDL audio cd manager. Implements real audio cd playback.
*/
@@ -47,4 +49,6 @@ protected:
uint32 _cdEndTime, _cdStopTime;
};
+#endif // !SDL_VERSION_ATLEAST(1, 3, 0)
+
#endif