aboutsummaryrefslogtreecommitdiff
path: root/engines/agi
diff options
context:
space:
mode:
authorFilippos Karapetis2007-11-19 22:37:52 +0000
committerFilippos Karapetis2007-11-19 22:37:52 +0000
commit2d3316a570475c01cd6fed60f35e2f5ab497e0ee (patch)
tree0583e98d8a33aca1a61cb2a11f891b9070a6472d /engines/agi
parent3996e3daac13778d79cc572f63825b7a88a96bca (diff)
downloadscummvm-rg350-2d3316a570475c01cd6fed60f35e2f5ab497e0ee.tar.gz
scummvm-rg350-2d3316a570475c01cd6fed60f35e2f5ab497e0ee.tar.bz2
scummvm-rg350-2d3316a570475c01cd6fed60f35e2f5ab497e0ee.zip
_speakerStream should be public. Also, when preAGI engine closes, the speaker handle is freed
svn-id: r29573
Diffstat (limited to 'engines/agi')
-rw-r--r--engines/agi/preagi.cpp1
-rw-r--r--engines/agi/preagi.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/engines/agi/preagi.cpp b/engines/agi/preagi.cpp
index 413f9250d0..8679de6003 100644
--- a/engines/agi/preagi.cpp
+++ b/engines/agi/preagi.cpp
@@ -196,6 +196,7 @@ void PreAgiEngine::initialize() {
}
PreAgiEngine::~PreAgiEngine() {
+ _mixer->stopHandle(_speakerHandle);
delete _speakerStream;
}
diff --git a/engines/agi/preagi.h b/engines/agi/preagi.h
index 0644a185c0..ff7bcc789d 100644
--- a/engines/agi/preagi.h
+++ b/engines/agi/preagi.h
@@ -57,6 +57,7 @@ public:
SoundMgr *_sound;
PictureMgr *_picture;
PreAGI_Console *_console;
+ Audio::PCSpeaker *_speakerStream;
void clearImageStack() {}
void recordImageStackCall(uint8 type, int16 p1, int16 p2, int16 p3,
@@ -95,7 +96,6 @@ public:
private:
int _defaultColor;
- Audio::PCSpeaker *_speakerStream;
Audio::SoundHandle _speakerHandle;
};