diff options
| author | Max Horn | 2010-11-08 22:53:36 +0000 |
|---|---|---|
| committer | Max Horn | 2010-11-08 22:53:36 +0000 |
| commit | 82e473bc3b1498325bad28d804e4314f0c3a528c (patch) | |
| tree | f186d8b9eeb665a81897deca3a3fadcf74007c16 /engines/saga/music.h | |
| parent | 4242229c91c356bdd90c66ce8c0642488a1b4bf5 (diff) | |
| parent | 74a53df11b51fa4956745c086b2e6351b8383568 (diff) | |
| download | scummvm-rg350-82e473bc3b1498325bad28d804e4314f0c3a528c.tar.gz scummvm-rg350-82e473bc3b1498325bad28d804e4314f0c3a528c.tar.bz2 scummvm-rg350-82e473bc3b1498325bad28d804e4314f0c3a528c.zip | |
BACKENDS: Partial merge of gsoc2010-opengl: Audio CD changes only
This commit contains the AudioCDManager changes from the gsoc2010-opengl
branch. The other changes in that branch are restricted to the backends
directory only (plus configure).
The Nintendo DS and Dreamcast ports still need to be ported over to
the new Audio CD system, but that should be fairly easy to do.
svn-id: r54147
Diffstat (limited to 'engines/saga/music.h')
| -rw-r--r-- | engines/saga/music.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/saga/music.h b/engines/saga/music.h index b4d868ed78..c7fef7225b 100644 --- a/engines/saga/music.h +++ b/engines/saga/music.h @@ -28,9 +28,9 @@ #ifndef SAGA_MUSIC_H #define SAGA_MUSIC_H -#include "sound/audiocd.h" #include "sound/mididrv.h" #include "sound/midiparser.h" +#include "sound/mixer.h" #include "sound/decoders/mp3.h" #include "sound/decoders/vorbis.h" #include "sound/decoders/flac.h" |