From a927cff2569ba78922639fd12a1ba7b91871e6af Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sat, 2 Jan 2010 01:40:10 +0000
Subject: SCI/new sound code: disabled some unused code and named a previously
 unknown variable of the sound channel data

svn-id: r46872
---
 engines/sci/resource.cpp | 8 +++++---
 engines/sci/resource.h   | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index c039cfe260..e77b6987c2 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -1944,7 +1944,7 @@ SoundResource::SoundResource(uint32 resNumber, ResourceManager *resMan, SciVersi
 				_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 @@ SoundResource::SoundResource(uint32 resNumber, ResourceManager *resMan, SciVersi
 		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 @@ SoundResource::~SoundResource() {
 
 	_resMan->unlockResource(_innerResource);
 }
-//----------------------------------------------------
+
+#if 0
 SoundResource::Track* SoundResource::getTrackByNumber(uint16 number) {
 	if (_soundVersion <= SCI_VERSION_0_LATE)
 		return &_tracks[0];
@@ -1997,6 +1998,7 @@ SoundResource::Track* SoundResource::getTrackByNumber(uint16 number) {
 		return &_tracks[number];
 	return NULL;
 }
+#endif
 
 SoundResource::Track* SoundResource::getTrackByType(TrackType type) {
 	if (_soundVersion <= SCI_VERSION_0_LATE)
diff --git a/engines/sci/resource.h b/engines/sci/resource.h
index f2ef41b908..e49347dc10 100644
--- a/engines/sci/resource.h
+++ b/engines/sci/resource.h
@@ -446,7 +446,7 @@ public:
 	struct Channel {
 		byte number;
 		byte poly;
-		uint16 unk;
+		uint16 prio;
 		uint16 size;
 		byte *data;
 		long time;
@@ -464,7 +464,9 @@ public:
 public:
 	SoundResource(uint32 resNumber, ResourceManager *resMan, SciVersion soundVersion);
 	~SoundResource();
+#if 0
 	Track *getTrackByNumber(uint16 number);
+#endif
 	Track *getTrackByType(TrackType type);
 	int getChannelFilterMask(int hardwareMask);
 
-- 
cgit v1.2.3