KYRA: (EOB/Amiga) - minor audio driver improvements

(mostly paranoia fixes)

1 files changed, 9 insertions, 8 deletions

diff --git a/engines/kyra/sound/drivers/audiomaster2.cpp b/engines/kyra/sound/drivers/audiomaster2.cpp
index 261c813b0f..5fb8043cf5 100644
--- a/engines/kyra/sound/drivers/audiomaster2.cpp
+++ b/engines/kyra/sound/drivers/audiomaster2.cpp
@@ -22,7 +22,7 @@
 
 #ifdef ENABLE_EOB
 
-#include "kyra/resource/resource.h"
+#include "kyra/kyra_v1.h"
 #include "kyra/sound/drivers/audiomaster2.h"
 
 #include "audio/mods/paula.h"
@@ -892,6 +892,8 @@ void AudioMaster2ResourceManager::initResource(SoundResource *resource) {
 	if (!resource)
 		return;
 
+	Common::StackLock lock(_mutex);
+
 	SoundResource *res = retrieveFromChain(resource->getName());
 	// The driver does not replace resources with the same name, but disposes the new resource instead.
 	// So these names seem to be considered "globally unique".
@@ -1198,12 +1200,11 @@ AudioMaster2Internal::AudioMaster2Internal(Audio::Mixer *mixer) : Paula(true, mi
 }
 
 AudioMaster2Internal::~AudioMaster2Internal() {
-	Common::StackLock lock(_mutex);
-
 	stopPaula();
-
 	_mixer->stopHandle(_soundHandle);
 
+	Common::StackLock lock(_mutex);
+
 	delete _res;
 	delete _io;
 }
@@ -1284,7 +1285,7 @@ void AudioMaster2Internal::fadeOut(int delay) {
 }
 
 bool AudioMaster2Internal::isFading() {
-	return _io->isFading();
+	return _ready ? _io->isFading() : false;
 }
 
 void AudioMaster2Internal::setMusicVolume(int volume) {
@@ -1313,18 +1314,18 @@ void AudioMaster2Internal::resetCounter() {
 }
 
 int AudioMaster2Internal::getPlayDuration() {
-	return _durationCounter;
+	return _ready ? _durationCounter : 0;
 }
 
 void AudioMaster2Internal::sync(SoundResource *res) {
 	if (!_ready || !res)
 		return;
 
+	Common::StackLock lock(_mutex);
+
 	if (res->getType() != 1)
 		return;
 
-	Common::StackLock lock(_mutex);
-
 	SoundResourceSMUS *smus = static_cast<SoundResourceSMUS*>(res);
 	_io->_tempo = smus->getTempo();
 	smus->setSync(_io->_sync);