aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sound/audio.cpp
diff options
context:
space:
mode:
authorMax Horn2010-02-17 23:37:59 +0000
committerMax Horn2010-02-17 23:37:59 +0000
commit86e34c34643ddd3920025c3423ece4e1c3aaeda1 (patch)
tree313ff024f8da5d6786a423fe24392b9e80344a4e /engines/sci/sound/audio.cpp
parent903b694574a08ce9e3b4186eebbe06197157daaa (diff)
downloadscummvm-rg350-86e34c34643ddd3920025c3423ece4e1c3aaeda1.tar.gz
scummvm-rg350-86e34c34643ddd3920025c3423ece4e1c3aaeda1.tar.bz2
scummvm-rg350-86e34c34643ddd3920025c3423ece4e1c3aaeda1.zip
SCI: Rename some members of class Resource
svn-id: r48085
Diffstat (limited to 'engines/sci/sound/audio.cpp')
-rw-r--r--engines/sci/sound/audio.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/sound/audio.cpp b/engines/sci/sound/audio.cpp
index 336aa04aef..4643448dc4 100644
--- a/engines/sci/sound/audio.cpp
+++ b/engines/sci/sound/audio.cpp
@@ -205,7 +205,7 @@ Audio::RewindableAudioStream *AudioPlayer::getAudioStream(uint32 number, uint32
uint32 size = 0;
byte *data = 0;
byte flags = 0;
- Sci::Resource* audioRes;
+ Sci::Resource *audioRes;
if (volume == 65535) {
audioRes = _resMan->findResource(ResourceId(kResourceTypeAudio, number), false);
@@ -224,11 +224,11 @@ Audio::RewindableAudioStream *AudioPlayer::getAudioStream(uint32 number, uint32
byte audioFlags;
- if (audioRes->headerSize > 0) {
+ if (audioRes->_headerSize > 0) {
// SCI1.1
- Common::MemoryReadStream headerStream(audioRes->header, audioRes->headerSize, DisposeAfterUse::NO);
+ Common::MemoryReadStream headerStream(audioRes->_header, audioRes->_headerSize, DisposeAfterUse::NO);
- if (readSOLHeader(&headerStream, audioRes->headerSize, size, _audioRate, audioFlags)) {
+ if (readSOLHeader(&headerStream, audioRes->_headerSize, size, _audioRate, audioFlags)) {
Common::MemoryReadStream dataStream(audioRes->data, audioRes->size, DisposeAfterUse::NO);
data = readSOLAudio(&dataStream, size, audioFlags, flags);
}