diff options
| author | Paweł Kołodziejski | 2006-10-10 12:16:21 +0000 |
|---|---|---|
| committer | Paweł Kołodziejski | 2006-10-10 12:16:21 +0000 |
| commit | e85ab4b10fedf9660efffb386512ed6a36956422 (patch) | |
| tree | 2d0bbc3814009f3527d7926cd0f5674fdfcace68 /engines/scumm/scumm.cpp | |
| parent | 89f79acb84071d56c3758281287d9c3b0c0ed545 (diff) | |
| download | scummvm-rg350-e85ab4b10fedf9660efffb386512ed6a36956422.tar.gz scummvm-rg350-e85ab4b10fedf9660efffb386512ed6a36956422.tar.bz2 scummvm-rg350-e85ab4b10fedf9660efffb386512ed6a36956422.zip | |
now SmushPlayer is class created once same as SmushMixer while scumm engine creation. this allow finish play smush audio track finished to the end instead immediately stopped as it was happen before
svn-id: r24263
Diffstat (limited to 'engines/scumm/scumm.cpp')
| -rw-r--r-- | engines/scumm/scumm.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index 9ccf8b3838..fc47b5cbc4 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -42,6 +42,7 @@ #include "scumm/imuse/imuse.h" #include "scumm/imuse_digi/dimuse.h" #include "scumm/smush/smush_mixer.h" +#include "scumm/smush/smush_player.h" #include "scumm/insane/insane.h" #include "scumm/intern.h" #include "scumm/he/animation_he.h" @@ -779,6 +780,7 @@ ScummEngine_v7::ScummEngine_v7(OSystem *syst, const DetectorResult &dr) _smushActive = false; _insaneRunning = false; _smixer = NULL; + _splayer = NULL; _existLanguageFile = false; _languageBuffer = NULL; @@ -791,6 +793,10 @@ ScummEngine_v7::~ScummEngine_v7() { _smixer->stop(); delete _smixer; } + if (_splayer) { + _splayer->release(); + delete _splayer; + } free(_languageBuffer); free(_languageIndex); @@ -1107,6 +1113,8 @@ void ScummEngine_v7::setupScumm() { _insane = 0; _smixer = new SmushMixer(_mixer); + + _splayer = new SmushPlayer(this); } #endif |