LASTEXPRESS: Update sound timer and sound entry playing

 - Move filtering to SoundEntry class
 - Make some methods of SoundEntry class private
 - Add methods to check if a StreamedSound/AppendableSound is done playing

2 files changed, 23 insertions, 1 deletions

diff --git a/engines/lastexpress/data/snd.cpp b/engines/lastexpress/data/snd.cpp
index d92ebbc5e3..fa2d8a2e51 100644
--- a/engines/lastexpress/data/snd.cpp
+++ b/engines/lastexpress/data/snd.cpp
@@ -103,7 +103,8 @@ void SimpleSound::play(Audio::AudioStream *as) {
 //////////////////////////////////////////////////////////////////////////
 // StreamedSound
 //////////////////////////////////////////////////////////////////////////
-StreamedSound::StreamedSound() {}
+StreamedSound::StreamedSound() : _loaded(false) {}
+
 StreamedSound::~StreamedSound() {}
 
 bool StreamedSound::load(Common::SeekableReadStream *stream) {
@@ -120,9 +121,18 @@ bool StreamedSound::load(Common::SeekableReadStream *stream) {
 	// Start playing the decoded audio stream
 	play(as);
 
+	_loaded = true;
+
 	return true;
 }
 
+bool StreamedSound::isFinished() {
+	if (!_loaded)
+		return false;
+
+	return !g_system->getMixer()->isSoundHandleActive(_handle);
+}
+
 //////////////////////////////////////////////////////////////////////////
 // StreamedSound
 //////////////////////////////////////////////////////////////////////////
@@ -172,4 +182,8 @@ void AppendableSound::finish() {
 	_finished = true;
 }
 
+bool AppendableSound::isFinished() {
+	return _as->endOfStream();
+}
+
 } // End of namespace LastExpress
diff --git a/engines/lastexpress/data/snd.h b/engines/lastexpress/data/snd.h
index 95a136ee1c..1c34e4f950 100644
--- a/engines/lastexpress/data/snd.h
+++ b/engines/lastexpress/data/snd.h
@@ -55,6 +55,7 @@ public:
 	virtual ~SimpleSound();
 
 	void stop() const;
+	virtual bool isFinished() = 0;
 
 protected:
 	void loadHeader(Common::SeekableReadStream *in);
@@ -76,6 +77,11 @@ public:
 	~StreamedSound();
 
 	bool load(Common::SeekableReadStream *stream);
+
+	virtual bool isFinished();
+
+private:
+	bool _loaded;
 };
 
 class AppendableSound : public SimpleSound {
@@ -87,6 +93,8 @@ public:
 	void queueBuffer(Common::SeekableReadStream *bufferIn);
 	void finish();
 
+	virtual bool isFinished();
+
 private:
 	Audio::QueuingAudioStream *_as;
 	bool _finished;