[Scummvm-cvs-logs] SF.net SVN: scummvm:[44117] scummvm/trunk/engines/kyra/sound_towns.cpp

[athrxx at users.sourceforge.net]

Revision: 44117
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44117&view=rev
Author:   athrxx
Date:     2009-09-16 20:42:10 +0000 (Wed, 16 Sep 2009)

Log Message:
-----------
Kyra/LoL: fix pc98 audio driver destructor

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sound_towns.cpp

Modified: scummvm/trunk/engines/kyra/sound_towns.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_towns.cpp	2009-09-16 20:05:12 UTC (rev 44116)
+++ scummvm/trunk/engines/kyra/sound_towns.cpp	2009-09-16 20:42:10 UTC (rev 44117)
@@ -1622,6 +1622,9 @@
 	virtual void timerCallbackA() = 0;
 	virtual void timerCallbackB() = 0;
 
+	void lock() { _mutex.lock(); }
+	void unlock() { _mutex.unlock(); }
+
 	const int _numChan;
 	const int _numSSG;
 	const bool _hasPercussion;
@@ -1630,6 +1633,8 @@
 	void nextTick(int32 *buffer, uint32 bufferSize);
 	void generateOutput(int32 &leftSample, int32 &rightSample, int32 *del, int32 *feed);
 
+	Common::Mutex _mutex;
+
 	struct ChanInternal {
 		uint16 frqTemp;
 		bool enableLeft;
@@ -1715,16 +1720,11 @@
 	void setMusicTempo(uint8 tempo);
 	void setSfxTempo(uint16 tempo);
 
-	void lock() { _mutex.lock(); }
-	void unlock() { _mutex.unlock(); }
-
 	TownsPC98_OpnChannel **_channels;
 	TownsPC98_OpnChannelSSG **_ssgChannels;
 	TownsPC98_OpnSfxChannel **_sfxChannels;
 	TownsPC98_OpnChannelPCM *_rhythmChannel;
 
-	Common::Mutex _mutex;
-
 	const uint8 *_opnCarrier;
 	const uint8 *_opnFreqTable;
 	const uint8 *_opnFreqTableSSG;
@@ -2941,6 +2941,7 @@
 }
 
 TownsPC98_OpnCore::~TownsPC98_OpnCore() {
+	_mixer->stopHandle(_soundHandle);
 	delete _ssg;
 	delete _prc;
 	delete[] _chanInternal;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.