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 /sword2/driver/animation.cpp | |
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 'sword2/driver/animation.cpp')
-rw-r--r-- | sword2/driver/animation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sword2/driver/animation.cpp b/sword2/driver/animation.cpp index d70397eb4e..8e3e8958b6 100644 --- a/sword2/driver/animation.cpp +++ b/sword2/driver/animation.cpp @@ -168,7 +168,7 @@ void MoviePlayer::drawTextObject(AnimationState *anim, MovieTextObject *obj) { */ int32 MoviePlayer::play(const char *filename, MovieTextObject *text[], int32 leadInRes, int32 leadOutRes) { - SoundHandle leadInHandle; + Audio::SoundHandle leadInHandle; // This happens if the user quits during the "eye" smacker if (_vm->_quit) @@ -246,7 +246,7 @@ int32 MoviePlayer::play(const char *filename, MovieTextObject *text[], int32 lea void MoviePlayer::playMPEG(const char *filename, MovieTextObject *text[], byte *leadOut, uint32 leadOutLen) { uint frameCounter = 0, textCounter = 0; - SoundHandle handle; + Audio::SoundHandle handle; bool skipCutscene = false, textVisible = false; uint32 flags = Audio::Mixer::FLAG_16BITS; bool startNextText = false; @@ -452,7 +452,7 @@ void MoviePlayer::playDummy(const char *filename, MovieTextObject *text[], byte tmpPal[255 * 4 + 2] = 255; _vm->_screen->setPalette(0, 256, tmpPal, RDPAL_INSTANT); - SoundHandle handle; + Audio::SoundHandle handle; bool skipCutscene = false; |