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

[thebluegr at users.sourceforge.net]

Revision: 46872
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46872&view=rev
Author:   thebluegr
Date:     2010-01-02 01:40:10 +0000 (Sat, 02 Jan 2010)

Log Message:
-----------
SCI/new sound code: disabled some unused code and named a previously unknown variable of the sound channel data

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

Modified: scummvm/trunk/engines/sci/resource.cpp
===================================================================
--- scummvm/trunk/engines/sci/resource.cpp	2010-01-02 01:09:49 UTC (rev 46871)
+++ scummvm/trunk/engines/sci/resource.cpp	2010-01-02 01:40:10 UTC (rev 46872)
@@ -1944,7 +1944,7 @@
 				_tracks[trackNr].digitalSampleSize = 0;
 				for (channelNr = 0; channelNr < _tracks[trackNr].channelCount; channelNr++) {
 					channel = &_tracks[trackNr].channels[channelNr];
-					channel->unk = READ_LE_UINT16(data);
+					channel->prio = READ_LE_UINT16(data);
 					channel->data = resource->data + READ_LE_UINT16(data + 2) + 2;
 					channel->size = READ_LE_UINT16(data + 4) - 2; // Not counting channel header
 					channel->number = *(channel->data - 2);
@@ -1980,7 +1980,7 @@
 		error("SoundResource: SCI version %d is unsupported", _soundVersion);
 	}
 }
-//----------------------------------------------------
+
 SoundResource::~SoundResource() {
 	for (int trackNr = 0; trackNr < _trackCount; trackNr++)
 		delete[] _tracks[trackNr].channels;
@@ -1988,7 +1988,8 @@
 
 	_resMan->unlockResource(_innerResource);
 }
-//----------------------------------------------------
+
+#if 0
 SoundResource::Track* SoundResource::getTrackByNumber(uint16 number) {
 	if (_soundVersion <= SCI_VERSION_0_LATE)
 		return &_tracks[0];
@@ -1997,6 +1998,7 @@
 		return &_tracks[number];
 	return NULL;
 }
+#endif
 
 SoundResource::Track* SoundResource::getTrackByType(TrackType type) {
 	if (_soundVersion <= SCI_VERSION_0_LATE)

Modified: scummvm/trunk/engines/sci/resource.h
===================================================================
--- scummvm/trunk/engines/sci/resource.h	2010-01-02 01:09:49 UTC (rev 46871)
+++ scummvm/trunk/engines/sci/resource.h	2010-01-02 01:40:10 UTC (rev 46872)
@@ -446,7 +446,7 @@
 	struct Channel {
 		byte number;
 		byte poly;
-		uint16 unk;
+		uint16 prio;
 		uint16 size;
 		byte *data;
 		long time;
@@ -464,7 +464,9 @@
 public:
 	SoundResource(uint32 resNumber, ResourceManager *resMan, SciVersion soundVersion);
 	~SoundResource();
+#if 0
 	Track *getTrackByNumber(uint16 number);
+#endif
 	Track *getTrackByType(TrackType type);
 	int getChannelFilterMask(int hardwareMask);
 


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