[Scummvm-cvs-logs] SF.net SVN: scummvm:[46632] scummvm/trunk/engines/sci

[m_kiewitz at users.sourceforge.net]

Revision: 46632
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46632&view=rev
Author:   m_kiewitz
Date:     2009-12-27 12:38:19 +0000 (Sun, 27 Dec 2009)

Log Message:
-----------
SCI/newmusic: moving commented assert

Modified Paths:
--------------
    scummvm/trunk/engines/sci/resource.cpp
    scummvm/trunk/engines/sci/sfx/music.cpp

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2009-12-27 12:33:47 UTC (rev 46631)
+++ scummvm/trunk/engines/sci/resource.cpp	2009-12-27 12:38:19 UTC (rev 46632)
@@ -1912,6 +1912,7 @@
 						_tracks[trackNr].digitalSampleRate = READ_LE_UINT16(channel->data);
 						_tracks[trackNr].digitalSampleSize = READ_LE_UINT16(channel->data + 2);
 						assert(READ_LE_UINT16(channel->data + 4) == 0); // Possibly a compression flag
+						//assert(READ_LE_UINT16(channelData + 6) == size);
 						channel->data += 8; // Skip over header
 						channel->size -= 8;
 					}

Modified: scummvm/trunk/engines/sci/sfx/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/music.cpp	2009-12-27 12:33:47 UTC (rev 46631)
+++ scummvm/trunk/engines/sci/sfx/music.cpp	2009-12-27 12:38:19 UTC (rev 46632)
@@ -311,7 +311,6 @@
 		// play digital sample
 		if (track->digitalChannelNr != -1) {
 			byte *channelData = track->channels[track->digitalChannelNr].data;
-			//assert(READ_LE_UINT16(channelData + 6) == size);
 			if (pSnd->pStreamAud)
 				delete pSnd->pStreamAud;
 			pSnd->pStreamAud = Audio::makeLinearInputStream(channelData, track->digitalSampleSize, track->digitalSampleRate,


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