diff options
| author | Max Horn | 2005-05-10 23:48:48 +0000 |
|---|---|---|
| committer | Max Horn | 2005-05-10 23:48:48 +0000 |
| commit | 1a615346abab8f234c3dbd1c55e78b179bca9d87 (patch) | |
| tree | f687ac73ffbfa29088a403b6311bb4db13265fde /sky/intro.h | |
| parent | 72f4c03b0b9a6918a359b967ebc400a2701981d9 (diff) | |
| download | scummvm-rg350-1a615346abab8f234c3dbd1c55e78b179bca9d87.tar.gz scummvm-rg350-1a615346abab8f234c3dbd1c55e78b179bca9d87.tar.bz2 scummvm-rg350-1a615346abab8f234c3dbd1c55e78b179bca9d87.zip | |
Moved class SoundMixer to Audio::Mixer (didn't call the namespace 'Sound' because we already have many classes with that name)
svn-id: r18039
Diffstat (limited to 'sky/intro.h')
| -rw-r--r-- | sky/intro.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sky/intro.h b/sky/intro.h index 2e97663781..e7840fa120 100644 --- a/sky/intro.h +++ b/sky/intro.h @@ -36,7 +36,7 @@ class Text; class Intro { public: - Intro(Disk *disk, Screen *screen, MusicBase *music, Sound *sound, Text *text, SoundMixer *mixer, OSystem *system); + Intro(Disk *disk, Screen *screen, MusicBase *music, Sound *sound, Text *text, Audio::Mixer *mixer, OSystem *system); ~Intro(void); bool doIntro(bool floppyIntro); bool _quitProg; @@ -51,7 +51,7 @@ private: Sound *_skySound; Text *_skyText; OSystem *_system; - SoundMixer *_mixer; + Audio::Mixer *_mixer; uint8 *_textBuf, *_saveBuf; uint8 *_bgBuf; |