SUPERNOVA: Renames Music/AudioIndex to Music/AudioId

6 files changed, 14 insertions, 14 deletions

diff --git a/engines/supernova/resman.cpp b/engines/supernova/resman.cpp
index 73973f819e..9bfede8782 100644
--- a/engines/supernova/resman.cpp
+++ b/engines/supernova/resman.cpp
@@ -185,14 +185,14 @@ void ResourceManager::initImages() {
 	}
 }
 
-Audio::SeekableAudioStream *ResourceManager::getSoundStream(AudioIndex index) {
+Audio::SeekableAudioStream *ResourceManager::getSoundStream(AudioId index) {
 	Audio::SeekableAudioStream *stream = _soundSamples[index];
 	stream->rewind();
 
 	return stream;
 }
 
-Audio::AudioStream *ResourceManager::getSoundStream(MusicIndex index) const {
+Audio::AudioStream *ResourceManager::getSoundStream(MusicId index) const {
 	switch (index) {
 	case kMusicIntro:
 		return _musicIntro;
diff --git a/engines/supernova/resman.h b/engines/supernova/resman.h
index f44ab89788..cca38b2f74 100644
--- a/engines/supernova/resman.h
+++ b/engines/supernova/resman.h
@@ -47,8 +47,8 @@ public:
 	ResourceManager();
 	~ResourceManager();
 
-	Audio::SeekableAudioStream *getSoundStream(AudioIndex index);
-	Audio::AudioStream *getSoundStream(MusicIndex index) const;
+	Audio::SeekableAudioStream *getSoundStream(AudioId index);
+	Audio::AudioStream *getSoundStream(MusicId index) const;
 	MSNImage *getImage(int filenumber) const;
 	const byte *getImage(CursorId id) const;
 
diff --git a/engines/supernova/sound.cpp b/engines/supernova/sound.cpp
index 03e33e8bc4..e7f3ce83bd 100644
--- a/engines/supernova/sound.cpp
+++ b/engines/supernova/sound.cpp
@@ -37,7 +37,7 @@ Sound::Sound(Audio::Mixer *mixer, ResourceManager *resMan)
 	, _resMan(resMan) {
 }
 
-void Sound::play(AudioIndex index) {
+void Sound::play(AudioId index) {
 	Audio::AudioStream *stream = _resMan->getSoundStream(index);
 
 	stop();
@@ -45,7 +45,7 @@ void Sound::play(AudioIndex index) {
 					   -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO);
 }
 
-void Sound::play(MusicIndex index) {
+void Sound::play(MusicId index) {
 	Audio::AudioStream *stream = _resMan->getSoundStream(index);
 
 	stop();
diff --git a/engines/supernova/sound.h b/engines/supernova/sound.h
index f33a291835..100c9a372b 100644
--- a/engines/supernova/sound.h
+++ b/engines/supernova/sound.h
@@ -30,7 +30,7 @@ namespace Supernova {
 class SupernovaEngine;
 class ResourceManager;
 
-enum AudioIndex {
+enum AudioId {
 	kAudioFoundLocation,        // 44|0
 	kAudioCrash,                // 45|0
 	kAudioVoiceHalt,            // 46|0
@@ -54,7 +54,7 @@ enum AudioIndex {
 	kAudioNumSamples
 };
 
-enum MusicIndex {
+enum MusicId {
 	kMusicIntro = 49,
 	kMusicOutro = 52
 };
@@ -65,8 +65,8 @@ public:
 public:
 	Sound(Audio::Mixer *mixer, ResourceManager *resMan);
 
-	void play(AudioIndex index);
-	void play(MusicIndex index);
+	void play(AudioId index);
+	void play(MusicId index);
 	void stop();
 	bool isPlaying();
 private:
diff --git a/engines/supernova/supernova.cpp b/engines/supernova/supernova.cpp
index da88cc0054..d9c6d6d392 100644
--- a/engines/supernova/supernova.cpp
+++ b/engines/supernova/supernova.cpp
@@ -239,11 +239,11 @@ void SupernovaEngine::setGameString(int idx, const Common::String &string) {
 	_gameStrings[idx] = string;
 }
 
-void SupernovaEngine::playSound(AudioIndex sample) {
+void SupernovaEngine::playSound(AudioId sample) {
 	_sound->play(sample);
 }
 
-void SupernovaEngine::playSound(MusicIndex index) {
+void SupernovaEngine::playSound(MusicId index) {
 	_sound->play(index);
 }
 
diff --git a/engines/supernova/supernova.h b/engines/supernova/supernova.h
index b33a4893dc..9544f075cb 100644
--- a/engines/supernova/supernova.h
+++ b/engines/supernova/supernova.h
@@ -91,8 +91,8 @@ public:
 	void setGameString(int idx, const Common::String &string);
 
 	// forwarding calls
-	void playSound(AudioIndex sample);
-	void playSound(MusicIndex index);
+	void playSound(AudioId sample);
+	void playSound(MusicId index);
 	void paletteFadeIn();
 	void paletteFadeOut();
 	void paletteBrightness();