diff options
| author | Max Horn | 2005-05-11 00:01:44 +0000 |
|---|---|---|
| committer | Max Horn | 2005-05-11 00:01:44 +0000 |
| commit | 2de46dc8eb173ca06a107d5353f2209944284115 (patch) | |
| tree | 2119f03a2883659d2b5fbbc70db31273271370e0 /scumm/smush | |
| parent | 1a615346abab8f234c3dbd1c55e78b179bca9d87 (diff) | |
| download | scummvm-rg350-2de46dc8eb173ca06a107d5353f2209944284115.tar.gz scummvm-rg350-2de46dc8eb173ca06a107d5353f2209944284115.tar.bz2 scummvm-rg350-2de46dc8eb173ca06a107d5353f2209944284115.zip | |
Moved some more stuff to namespace Audio (enough for tonight)
svn-id: r18040
Diffstat (limited to 'scumm/smush')
| -rw-r--r-- | scumm/smush/smush_mixer.h | 2 | ||||
| -rw-r--r-- | scumm/smush/smush_player.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scumm/smush/smush_mixer.h b/scumm/smush/smush_mixer.h index 0f6417f721..cff529b5c6 100644 --- a/scumm/smush/smush_mixer.h +++ b/scumm/smush/smush_mixer.h @@ -39,7 +39,7 @@ private: struct channels { int id; SmushChannel *chan; - SoundHandle handle; + Audio::SoundHandle handle; AppendableAudioStream *stream; } _channels[NUM_CHANNELS]; diff --git a/scumm/smush/smush_player.h b/scumm/smush/smush_player.h index dc57258dbf..7b6b4ded18 100644 --- a/scumm/smush/smush_player.h +++ b/scumm/smush/smush_player.h @@ -56,10 +56,10 @@ private: bool _skips[37]; int32 _frame; - SoundHandle _IACTchannel; + Audio::SoundHandle _IACTchannel; AppendableAudioStream *_IACTstream; - SoundHandle _compressedFileSoundHandle; + Audio::SoundHandle _compressedFileSoundHandle; bool _compressedFileMode; Common::File _compressedFile; byte _IACToutput[4096]; |