diff options
| author | Max Horn | 2005-03-09 18:12:54 +0000 |
|---|---|---|
| committer | Max Horn | 2005-03-09 18:12:54 +0000 |
| commit | 0ec193b4be4113ccbc24f26f7bb4cefc3e3d6a41 (patch) | |
| tree | 16bc04d5b5ddc5945cf14bccb7ce53406aba0807 /scumm/imuse_digi | |
| parent | 13b8f678fc0ee6ab14e3264c58e858061fe625fd (diff) | |
| download | scummvm-rg350-0ec193b4be4113ccbc24f26f7bb4cefc3e3d6a41.tar.gz scummvm-rg350-0ec193b4be4113ccbc24f26f7bb4cefc3e3d6a41.tar.bz2 scummvm-rg350-0ec193b4be4113ccbc24f26f7bb4cefc3e3d6a41.zip | |
changing AudioDataType -> SoundType, so now the constant names match the name of the data type / the SoundMixer method names
svn-id: r17052
Diffstat (limited to 'scumm/imuse_digi')
| -rw-r--r-- | scumm/imuse_digi/dimuse.cpp | 16 | ||||
| -rw-r--r-- | scumm/imuse_digi/dimuse_track.cpp | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/scumm/imuse_digi/dimuse.cpp b/scumm/imuse_digi/dimuse.cpp index 73a7deb882..a86afca775 100644 --- a/scumm/imuse_digi/dimuse.cpp +++ b/scumm/imuse_digi/dimuse.cpp @@ -187,14 +187,14 @@ void IMuseDigital::saveOrLoad(Serializer *ser) { const int pan = (track->pan != 64) ? 2 * track->pan - 127 : 0; const int vol = track->vol / 1000; - SoundMixer::SoundType type = SoundMixer::kPlainAudioDataType; + SoundMixer::SoundType type = SoundMixer::kPlainSoundType; if (track->volGroupId == 1) - type = SoundMixer::kSpeechAudioDataType; + type = SoundMixer::kSpeechSoundType; if (track->volGroupId == 2) - type = SoundMixer::kSFXAudioDataType; + type = SoundMixer::kSFXSoundType; if (track->volGroupId == 3) - type = SoundMixer::kMusicAudioDataType; + type = SoundMixer::kMusicSoundType; _vm->_mixer->playInputStream(type, &track->handle, track->stream, -1, vol, pan, false); } @@ -241,14 +241,14 @@ void IMuseDigital::callback() { const int pan = (track->pan != 64) ? 2 * track->pan - 127 : 0; const int vol = track->vol / 1000; - SoundMixer::SoundType type = SoundMixer::kPlainAudioDataType; + SoundMixer::SoundType type = SoundMixer::kPlainSoundType; if (track->volGroupId == 1) - type = SoundMixer::kSpeechAudioDataType; + type = SoundMixer::kSpeechSoundType; if (track->volGroupId == 2) - type = SoundMixer::kSFXAudioDataType; + type = SoundMixer::kSFXSoundType; if (track->volGroupId == 3) - type = SoundMixer::kMusicAudioDataType; + type = SoundMixer::kMusicSoundType; if (track->stream) { byte *data = NULL; diff --git a/scumm/imuse_digi/dimuse_track.cpp b/scumm/imuse_digi/dimuse_track.cpp index 21bf0aa5e2..dc1c38161f 100644 --- a/scumm/imuse_digi/dimuse_track.cpp +++ b/scumm/imuse_digi/dimuse_track.cpp @@ -163,14 +163,14 @@ void IMuseDigital::startSound(int soundId, const char *soundName, int soundType, } else { const int pan = (track->pan != 64) ? 2 * track->pan - 127 : 0; const int vol = track->vol / 1000; - SoundMixer::SoundType type = SoundMixer::kPlainAudioDataType; + SoundMixer::SoundType type = SoundMixer::kPlainSoundType; if (track->volGroupId == 1) - type = SoundMixer::kSpeechAudioDataType; + type = SoundMixer::kSpeechSoundType; if (track->volGroupId == 2) - type = SoundMixer::kSFXAudioDataType; + type = SoundMixer::kSFXSoundType; if (track->volGroupId == 3) - type = SoundMixer::kMusicAudioDataType; + type = SoundMixer::kMusicSoundType; // setup 1 second stream wrapped buffer int32 streamBufferSize = track->iteration; @@ -303,14 +303,14 @@ IMuseDigital::Track *IMuseDigital::cloneToFadeOutTrack(Track *track, int fadeDel fadeTrack->volFadeStep = (fadeTrack->volFadeDest - fadeTrack->vol) * 60 * (1000 / _callbackFps) / (1000 * fadeDelay); fadeTrack->volFadeUsed = true; - SoundMixer::SoundType type = SoundMixer::kPlainAudioDataType; + SoundMixer::SoundType type = SoundMixer::kPlainSoundType; if (fadeTrack->volGroupId == 1) - type = SoundMixer::kSpeechAudioDataType; + type = SoundMixer::kSpeechSoundType; if (fadeTrack->volGroupId == 2) - type = SoundMixer::kSFXAudioDataType; + type = SoundMixer::kSFXSoundType; if (fadeTrack->volGroupId == 3) - type = SoundMixer::kMusicAudioDataType; + type = SoundMixer::kMusicSoundType; // setup 1 second stream wrapped buffer int32 streamBufferSize = fadeTrack->iteration; |