renamed AudioInputStream -> AudioStream

svn-id: r12110

4 files changed, 9 insertions, 9 deletions

diff --git a/scumm/imuse_digi.cpp b/scumm/imuse_digi.cpp
index 09a1c0d45d..9ec10fe1ab 100644
--- a/scumm/imuse_digi.cpp
+++ b/scumm/imuse_digi.cpp
@@ -746,7 +746,7 @@ void IMuseDigital::callback() {
 	}
 }
 
-void IMuseDigital::startSound(int sound, byte *voiceBundleData, AudioInputStream *input) {
+void IMuseDigital::startSound(int sound, byte *voiceBundleData, AudioStream *input) {
 	debug(5, "IMuseDigital::startSound(%d)", sound);
 	int l, r;
 
@@ -782,7 +782,7 @@ void IMuseDigital::startSound(int sound, byte *voiceBundleData, AudioInputStream
 			if (input) {
 				// Do nothing here, we already have an audio stream
 			} else if (READ_UINT32(ptr) == MKID('Crea')) {
-				// Create an AudioInputStream
+				// Create an AudioStream
 				input = makeVOCStream(ptr);
 			} else if (READ_UINT32(ptr) == MKID('iMUS')) {
 				uint32 tag;
@@ -922,7 +922,7 @@ void IMuseDigital::startSound(int sound, byte *voiceBundleData, AudioInputStream
 				} else
 					error("IMuseDigital::startSound(): Can't handle %d bit samples", bits);
 
-				// Create an AudioInputStream
+				// Create an AudioStream
 				input = makeLinearInputStream(freq, mixerFlags | SoundMixer::FLAG_AUTOFREE, data, size, 0, 0);
 			} else {
 				error("IMuseDigital::startSound(): Unknown sound format");
diff --git a/scumm/imuse_digi.h b/scumm/imuse_digi.h
index a81ea5c39c..5843b8b197 100644
--- a/scumm/imuse_digi.h
+++ b/scumm/imuse_digi.h
@@ -27,7 +27,7 @@
 #include "scumm/music.h"
 #include "sound/mixer.h"
 
-class AudioInputStream;
+class AudioStream;
 
 namespace Scumm {
 
@@ -81,7 +81,7 @@ private:
 		bool used;
 		bool started;
 		PlayingSoundHandle handle;
-		AudioInputStream *stream;
+		AudioStream *stream;
 		
 		Channel();
 	};
@@ -128,7 +128,7 @@ public:
 	void stopBundleMusic();
 	void playBundleSound(const char *sound);
 
-	void startSound(int sound, byte *voiceBundleData, AudioInputStream *input);
+	void startSound(int sound, byte *voiceBundleData, AudioStream *input);
 
 public:
 	IMuseDigital(ScummEngine *scumm);
diff --git a/scumm/player_mod.h b/scumm/player_mod.h
index 64db0ede8d..6b6b349c6c 100644
--- a/scumm/player_mod.h
+++ b/scumm/player_mod.h
@@ -25,7 +25,7 @@
 
 #include "scumm/scumm.h"
 
-class AudioInputStream;
+class AudioStream;
 class RateConverter;
 
 namespace Scumm {
@@ -61,7 +61,7 @@ private:
 		int8 pan;
 		uint16 freq;
 		RateConverter *converter;
-		AudioInputStream *input;
+		AudioStream *input;
 	};
 
 	SoundMixer *_mixer;
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index 13217e710c..f61f416bee 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -813,7 +813,7 @@ void Sound::pauseSounds(bool pause) {
 
 void Sound::startSfxSound(File *file, int file_size, PlayingSoundHandle *handle, int id) {
 
-	AudioInputStream *input;
+	AudioStream *input;
 	
 
 	if (file_size > 0) {