diff options
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/flac.cpp | 2 | ||||
| -rw-r--r-- | sound/mixer.h | 14 | ||||
| -rw-r--r-- | sound/mp3.cpp | 2 | ||||
| -rw-r--r-- | sound/softsynth/mt32.cpp | 2 | ||||
| -rw-r--r-- | sound/vorbis.cpp | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/sound/flac.cpp b/sound/flac.cpp index ff56ed6ee8..eb8e0a1bec 100644 --- a/sound/flac.cpp +++ b/sound/flac.cpp @@ -783,7 +783,7 @@ void FlacTrackInfo::play(SoundMixer *mixer, PlayingSoundHandle *handle, int star flac->setLastSample(0); if (flac->seekAbsolute(static_cast<FLAC__uint64>(startFrame) * (info.sample_rate / 75))) { - mixer->playInputStream(SoundMixer::kMusicAudioDataType, handle, flac); + mixer->playInputStream(SoundMixer::kMusicSoundType, handle, flac); return; } // startSample is beyond the existing Samples diff --git a/sound/mixer.h b/sound/mixer.h index b75edcb4b0..aef5602c03 100644 --- a/sound/mixer.h +++ b/sound/mixer.h @@ -71,11 +71,11 @@ public: }; enum SoundType { - kPlainAudioDataType = 0, + kPlainSoundType = 0, - kMusicAudioDataType = 1, - kSFXAudioDataType = 2, - kSpeechAudioDataType = 3 + kMusicSoundType = 1, + kSFXSoundType = 2, + kSpeechSoundType = 3 }; enum { @@ -126,7 +126,7 @@ public: * is not limited to it. The premix stream is invoked by the mixer whenever * it needs to generate any data, before any other mixing takes place. */ - void setupPremix(AudioStream *stream, SoundType type = kPlainAudioDataType); + void setupPremix(AudioStream *stream, SoundType type = kPlainSoundType); @@ -140,7 +140,7 @@ public: void *sound, uint32 size, uint rate, byte flags, int id = -1, byte volume = 255, int8 balance = 0, uint32 loopStart = 0, uint32 loopEnd = 0, - SoundType type = kSFXAudioDataType); + SoundType type = kSFXSoundType); /** * Start playing the given audio input stream. @@ -245,7 +245,7 @@ public: /** * Check whether any channel of the given sound type is active. * For example, this can be used to check whether any SFX sound - * is currently playing, by checking for type kSFXAudioDataType. + * is currently playing, by checking for type kSFXSoundType. * * @param type the sound type to look for * @return true if any channels of the specified type are active. diff --git a/sound/mp3.cpp b/sound/mp3.cpp index 47c93a4df7..708d3396b9 100644 --- a/sound/mp3.cpp +++ b/sound/mp3.cpp @@ -380,7 +380,7 @@ void MP3TrackInfo::play(SoundMixer *mixer, PlayingSoundHandle *handle, int start // Play it AudioStream *input = new MP3InputStream(_file, durationTime); - mixer->playInputStream(SoundMixer::kMusicAudioDataType, handle, input); + mixer->playInputStream(SoundMixer::kMusicSoundType, handle, input); } MP3TrackInfo::~MP3TrackInfo() { diff --git a/sound/softsynth/mt32.cpp b/sound/softsynth/mt32.cpp index 61c4e9ff04..ad3f41af6d 100644 --- a/sound/softsynth/mt32.cpp +++ b/sound/softsynth/mt32.cpp @@ -269,7 +269,7 @@ int MidiDriver_MT32::open() { _initialising = false; g_system->clearScreen(); g_system->updateScreen(); - _mixer->playInputStream(SoundMixer::kSFXAudioDataType, &_handle, this, -1, 255, 0, false, true); + _mixer->playInputStream(SoundMixer::kSFXSoundType, &_handle, this, -1, 255, 0, false, true); return 0; } diff --git a/sound/vorbis.cpp b/sound/vorbis.cpp index e79a5f8552..8886a63a05 100644 --- a/sound/vorbis.cpp +++ b/sound/vorbis.cpp @@ -178,7 +178,7 @@ void VorbisTrackInfo::play(SoundMixer *mixer, PlayingSoundHandle *handle, int st #endif AudioStream *input = makeVorbisStream(&_ov_file, duration * ov_info(&_ov_file, -1)->rate / 75); - mixer->playInputStream(SoundMixer::kMusicAudioDataType, handle, input); + mixer->playInputStream(SoundMixer::kMusicSoundType, handle, input); } DigitalTrackInfo *getVorbisTrack(int track) { |