[Scummvm-cvs-logs] SF.net SVN: scummvm: [29446] scummvm/trunk/engines/cine

[sev at users.sourceforge.net]

Revision: 29446
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29446&view=rev
Author:   sev
Date:     2007-11-07 14:28:01 -0800 (Wed, 07 Nov 2007)

Log Message:
-----------
Patches #1773489: "FW: Fixes for German Amiga Version"

Modified Paths:
--------------
    scummvm/trunk/engines/cine/sound.cpp
    scummvm/trunk/engines/cine/unpack.cpp

Modified: scummvm/trunk/engines/cine/sound.cpp
===================================================================
--- scummvm/trunk/engines/cine/sound.cpp	2007-11-07 09:39:48 UTC (rev 29445)
+++ scummvm/trunk/engines/cine/sound.cpp	2007-11-07 22:28:01 UTC (rev 29446)
@@ -798,12 +798,17 @@
 void PaulaSound::playMusic() {
 	_mixer->stopHandle(_moduleHandle);
 	if (_moduleStream) {
-		_mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_moduleHandle, _moduleStream);
+		_mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_moduleHandle, _moduleStream, -1, 255, 0, false);
 	}
 }
 
 void PaulaSound::stopMusic() {
 	_mixer->stopHandle(_moduleHandle);
+
+	_mixer->pauseAll(true);
+
+	for(int i = 0;i < NUM_CHANNELS;i++)
+		_soundChannelsTable[i].data = 0;
 }
 
 void PaulaSound::fadeOutMusic() {

Modified: scummvm/trunk/engines/cine/unpack.cpp
===================================================================
--- scummvm/trunk/engines/cine/unpack.cpp	2007-11-07 09:39:48 UTC (rev 29445)
+++ scummvm/trunk/engines/cine/unpack.cpp	2007-11-07 22:28:01 UTC (rev 29446)
@@ -116,7 +116,7 @@
 				unpackHelper2(&uc, 12);
 			}
 		}
-	} while (uc.datasize > 0);
+	} while (uc.datasize > 0 && uc.src >= src - 4);
 	return uc.crc == 0;
 }
 


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