LASTEXPRESS: Move sound filtering to base Sound class

 - Rename kSoundStatusRemoved to kSoundStatusClosed
 - Rename kSoundStatusClear2 to kSoundStatusCached
 - Remove sound cache handling

1 files changed, 3 insertions, 9 deletions

diff --git a/engines/lastexpress/sound/entry.h b/engines/lastexpress/sound/entry.h
index a466d31b3a..c175b7bd40 100644
--- a/engines/lastexpress/sound/entry.h
+++ b/engines/lastexpress/sound/entry.h
@@ -124,8 +124,7 @@ public:
 	Common::String   getName2()    { return _name2; }
 
 	// Streams
-	SimpleSound                *getSoundStream() { return _soundStream; }
-	byte                       *getSoundBuffer() { return _soundBuffer; }
+	SimpleSound *getSoundStream() { return _soundStream; }
 
 private:
 	LastExpressEngine *_engine;
@@ -156,16 +155,11 @@ private:
 
 	// Sound buffer & stream
 	bool _queued;
-	byte *_soundBuffer;
 	StreamedSound *_soundStream;    // the filtered sound stream
 
 	void setType(SoundFlag flag);
 	void setupStatus(SoundFlag flag);
-	void setupCache();
-	void setInCache();
-	void loadSoundData(Common::String name);
-
-	void applyFilter(int16 *buffer);
+	void loadStream(Common::String name);
 };
 
 //////////////////////////////////////////////////////////////////////////
@@ -184,7 +178,7 @@ public:
 
 	// Accessors
 	SoundStatusUnion getStatus() { return _status; }
-	SoundEntry *getSoundEntry() { return _sound; }
+	SoundEntry *getSoundEntry()  { return _sound; }
 
 private:
 	LastExpressEngine *_engine;