aboutsummaryrefslogtreecommitdiff
path: root/x11.cpp
diff options
context:
space:
mode:
authorNicolas Bacca2002-04-05 00:00:46 +0000
committerNicolas Bacca2002-04-05 00:00:46 +0000
commit51f343dc0510446591ff4049047428e5162f721e (patch)
tree5c4d55976dbe6435c45671847fcb3d4209e4f551 /x11.cpp
parent2e288912a2878bde67bc1985efa76e4b10f1a439 (diff)
downloadscummvm-rg350-51f343dc0510446591ff4049047428e5162f721e.tar.gz
scummvm-rg350-51f343dc0510446591ff4049047428e5162f721e.tar.bz2
scummvm-rg350-51f343dc0510446591ff4049047428e5162f721e.zip
MP3 CD patch reorganized
svn-id: r3863
Diffstat (limited to 'x11.cpp')
-rw-r--r--x11.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/x11.cpp b/x11.cpp
index c7dd71c723..292234d691 100644
--- a/x11.cpp
+++ b/x11.cpp
@@ -26,6 +26,7 @@
#include "gui.h"
#include "sound.h"
#include "cdmusic.h"
+#include "mp3_cd.h"
#include <sys/time.h>
#include <unistd.h>
@@ -187,7 +188,10 @@ static void create_empty_cursor(Display *display,
/* No CD on the iPAQ => stub functions */
void cd_play(Scumm *s, int track, int num_loops, int start_frame, int end_frame) {
-/* Insert SDL.cpp MP3 code here :) */
+
+#ifdef COMPRESSED_SOUND_FILE
+ mp3_cd_play(s, track, num_loops, start_frame, end_frame);
+#endif
}
int cd_is_running(void) {
return 1;