diff options
| author | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
|---|---|---|
| committer | Matthew Hoops | 2011-12-12 15:25:28 -0500 |
| commit | 00279659b22cbd5db739d5351e83a9fc2a2ae408 (patch) | |
| tree | 497f06f46820043cbdf1725652b8f0073223e24a /engines/sky/music/adlibmusic.h | |
| parent | d932df79bed5aac97e17c0920a5e75cb5ce733ee (diff) | |
| parent | d1628feb761acc9f4607f64de3eb620fea53bcc9 (diff) | |
| download | scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.gz scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.tar.bz2 scummvm-rg350-00279659b22cbd5db739d5351e83a9fc2a2ae408.zip | |
Merge remote branch 'upstream/master' into pegasus
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'engines/sky/music/adlibmusic.h')
| -rw-r--r-- | engines/sky/music/adlibmusic.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/engines/sky/music/adlibmusic.h b/engines/sky/music/adlibmusic.h index 2782a07be6..2161795b4c 100644 --- a/engines/sky/music/adlibmusic.h +++ b/engines/sky/music/adlibmusic.h @@ -26,7 +26,6 @@ #include "sky/music/musicbase.h" #include "audio/audiostream.h" #include "audio/fmopl.h" -#include "audio/mixer.h" namespace Sky { @@ -44,7 +43,6 @@ public: private: FM_OPL *_opl; - Audio::Mixer *_mixer; Audio::SoundHandle _soundHandle; uint8 *_initSequence; uint32 _sampleRate, _nextMusicPoll; |