Merged revisions 43458-43468,43470-43471,43473-43475,43477,43479-43483,43485,43497-43498,43500,43503-43504,43507,43509-43510,43512-43515,43517,43519,43521,43523 via svnmerge from

https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

........
  r43458 | thebluegr | 2009-08-17 15:55:21 +1000 (Mon, 17 Aug 2009) | 8 lines
  
  - Simplified some functions to accept only the parts of the EngineState they need as parameters, instead of the whole EngineState
  - Moved the class table in the Segment manager - it's the only class using it directly
  - Removed the sci11 flag from save games (we already know this, we don't need to store it)
  - Moved script_get_segment() and get_class_address() inside the segment manager class
  - Removed the script_locate_by_segment wrapper
  - Simplified script_lookup_export() a lot by removing some paranoia checks
  - Added some WIP code for automatically determining the game id in the fallback detector (still not working)
  - General cleanup
........
  r43459 | lordhoto | 2009-08-17 17:36:08 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Fix compilation of the SCI engine. It seems that all of the SCI header files I touched (and probably others I luckily didn't touch) seem to assume that files including them will supply needed types. That looks like a major issue in SCI. Someone with knowledge of the SCI code should look into this and cleanup the includes of *all* SCI headers.
........
  r43460 | thebluegr | 2009-08-17 19:19:53 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Cleanup
........
  r43461 | strangerke | 2009-08-17 19:50:35 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Added OPCODEDRAW 0x85, with a specific workaround for Bambou hardcoded paths in scripts
........
  r43462 | strangerke | 2009-08-17 19:54:49 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Suppress useless parentheses
........
  r43463 | lordhoto | 2009-08-17 19:57:09 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Formatting.
........
  r43464 | strangerke | 2009-08-17 20:05:02 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Add back parenthesis (I wasn't aware of this convention, sorry) in saveload, and mimic this code in oPlaytoons_openItk
........
  r43465 | lordhoto | 2009-08-17 20:48:03 +1000 (Mon, 17 Aug 2009) | 2 lines
  
  - Add note about that modifing the parent stream will mess up SeekableSubReadStream and SeekableSubReadStreamEndian.
  - Link to SubReadStream documentation from SeekableSubReadStream and SeekableSubReadStreamEndian.
........
  r43466 | thebluegr | 2009-08-17 21:06:27 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Made sound effect playing code consistent for compressed and uncompressed sounds. MemoryReadStream is used again instead of SeekableSubReadStream, as there will be issues when multiple sound effects or voices are played simultaneously
........
  r43467 | thebluegr | 2009-08-17 21:11:38 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Ignore speech and sound effect samples with unknown compression, instead of trying to play them as raw sound. Some cleanup
........
  r43468 | dreammaster | 2009-08-17 21:36:09 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Fix for some more !!HIGH STRINGS!! when talking to the palace guards
........
  r43470 | thebluegr | 2009-08-17 21:49:07 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Simplified the sound playing code by removing the boolean variables for signed, stereo, endian and sample bit information - now sound flags are used instead. Some cleanup.
........
  r43471 | dreammaster | 2009-08-17 21:51:42 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Switched event loop while/do to do/while, to ensure event handling occurs even when the game is under heavy load
........
  r43473 | lordhoto | 2009-08-17 22:22:15 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Cleanup: don't copy the Kyrandia 1 Amiga credits data in a temporary buffer, and thus keeping it twice in memory.
........
  r43474 | lordhoto | 2009-08-17 22:22:30 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Clear input queue before displaying the credits in Kyrandia 1.
........
  r43475 | lordhoto | 2009-08-17 22:47:57 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Fix possible out of bounds access in Screen::drawShape.
........
  r43477 | joostp | 2009-08-17 22:57:37 +1000 (Mon, 17 Aug 2009) | 2 lines
  
  Commit (slightly) modified version of patch #2831248: Allow suspend/resume for PSP
........
  r43479 | thebluegr | 2009-08-17 23:16:40 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Added looping support to LinearDiskStream, needed by SAGA and perhaps other engines. Note that the loop end parameter is still not implemented
........
  r43480 | thebluegr | 2009-08-17 23:25:44 +1000 (Mon, 17 Aug 2009) | 2 lines
  
  - Removed the custom DigitalMusicInputStream used in SAGA for the digital music in ITE CD and replaced it with the common LinearDiskStream class
  - Removed leftover code which plays standalone tracks (it's not used anywhere)
........
  r43481 | lordhoto | 2009-08-17 23:49:56 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Slight cleanup to makeLinearDiskStream interface.
........
  r43482 | waltervn | 2009-08-18 01:49:22 +1000 (Tue, 18 Aug 2009) | 1 line
  
  SCI: Add autodetection for DoSound. Cleanup.
........
  r43483 | waltervn | 2009-08-18 02:07:47 +1000 (Tue, 18 Aug 2009) | 1 line
  
  SCI: Build fix.
........
  r43485 | thebluegr | 2009-08-18 04:25:51 +1000 (Tue, 18 Aug 2009) | 1 line
  
  Put back the code for playing external digital music, used by the MIDI enhancement project, which was removed in rev. #43480
........
  r43497 | waltervn | 2009-08-18 09:11:25 +1000 (Tue, 18 Aug 2009) | 1 line
  
  SCI: Fix kernel table for multilingual SCI01 games. Cleanup.
........
  r43498 | joostp | 2009-08-18 09:54:40 +1000 (Tue, 18 Aug 2009) | 2 lines
  
  PSP: increase optimization level and change clock rate to 333mhz
........
  r43500 | thebluegr | 2009-08-18 16:43:06 +1000 (Tue, 18 Aug 2009) | 1 line
  
  Applied agent-q's patch to the SAGA pathfinding code for all platforms - x and y should not ever be greater than 640 and 480 respectively, so it looks safe enough to be applied
........
  r43503 | thebluegr | 2009-08-18 19:12:41 +1000 (Tue, 18 Aug 2009) | 1 line
  
  Removed the maxMemory parameter of the resource manager and replaced it with a define
........
  r43504 | thebluegr | 2009-08-18 20:01:18 +1000 (Tue, 18 Aug 2009) | 2 lines
  
  - Added game ID detection to the fallback detector. We still need to map some of Sierra's internal IDs to our own ones
  - The class table is now created in the segment manager constructor
........
  r43507 | dreammaster | 2009-08-18 22:25:04 +1000 (Tue, 18 Aug 2009) | 1 line
  
  Bugfix for Castle Skorl problem reported on the list
........
  r43509 | thebluegr | 2009-08-18 22:49:34 +1000 (Tue, 18 Aug 2009) | 1 line
  
  Mapped some Sierra internal IDs to our own ones, and added a note about a hack currently used in the fallback detector
........
  r43510 | thebluegr | 2009-08-19 00:10:31 +1000 (Wed, 19 Aug 2009) | 1 line
  
  Started rewriting the SCI engine to use FSNode instead of file names. This is the proper solution for removing the hack in the fallback detector, but it still needs work. Also, reduced the things needed to be initialized a bit, so that the detection is a bit faster
........
  r43512 | lordhoto | 2009-08-19 01:31:26 +1000 (Wed, 19 Aug 2009) | 1 line
  
  Made AGOS, DRASCULA, GOB, GROOVIE, MADE, SCUMM and TINSEL properly stop CD audio playback on engine quit. (This only problem affected playback from CD, not from ripped audio files)
........
  r43513 | lordhoto | 2009-08-19 01:32:26 +1000 (Wed, 19 Aug 2009) | 2 lines
  
  - Destory AudioCDManager singleton after user quits a game, this saves a few bytes memory
  - Added FIXME to audiocd.h, concering why destroying the AudioCDManager can not quit CD playback right now
........
  r43514 | joostp | 2009-08-19 01:39:47 +1000 (Wed, 19 Aug 2009) | 2 lines
  
  PSP: disable dosbox OPL
........
  r43515 | lordhoto | 2009-08-19 01:41:00 +1000 (Wed, 19 Aug 2009) | 1 line
  
  Typos.
........
  r43517 | joostp | 2009-08-19 03:12:01 +1000 (Wed, 19 Aug 2009) | 2 lines
  
  PSP: Make R-trigger act as a context sensitive modifier key, remap ENTER to triangle
........
  r43519 | joostp | 2009-08-19 04:06:50 +1000 (Wed, 19 Aug 2009) | 2 lines
  
  Implement setCursorPalette(), correct hasFeature() <-> getFeatureState() mixup.
........
  r43521 | john_doe | 2009-08-19 05:42:13 +1000 (Wed, 19 Aug 2009) | 2 lines
  
  - PMV player: Use frame count from PVM file and fix incorrect "invalid chunk type" warning
  - Fix sprite drawing glitch with vertically flipped sprites (bug #2825925)
........
  r43523 | buddha_ | 2009-08-19 07:37:31 +1000 (Wed, 19 Aug 2009) | 1 line
  
  Possible fix for #2828330 (AGI: KQ1: Fast text box). If doesn't break anything else then should go to the branch-1-0-0 too, but haven't had the time to do much testing yet - thus committing to the trunk first.
........

svn-id: r43524

1 files changed, 1 insertions, 1 deletions

diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index 528cceb0cc..524dbf70ea 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -86,7 +86,7 @@ Sound::Sound(ScummEngine *parent, Audio::Mixer *mixer)
 
 Sound::~Sound() {
 	stopCDTimer();
-	AudioCD.destroy();
+	AudioCD.stop();
 	delete _sfxFile;
 }