libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 21:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
svn-id: r46872
This commit is contained in:
Filippos Karapetis 2010-01-02 01:40:10 +00:00
parent 94fb4762e2
commit a927cff256
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
engines/sci/resource.cpp
View File

@ -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)

4
engines/sci/resource.h
View File

@ -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);