[Scummvm-cvs-logs] CVS: scummvm/scumm imuse_digi.cpp,1.111,1.112 imuse_digi.h,1.30,1.31 player_mod.h,2.11,2.12 sound.cpp,1.306,1.307

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv11166/scumm

Modified Files:
	imuse_digi.cpp imuse_digi.h player_mod.h sound.cpp 
Log Message:
renamed AudioInputStream ->  AudioStream

Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- imuse_digi.cpp	3 Jan 2004 00:55:40 -0000	1.111
+++ imuse_digi.cpp	3 Jan 2004 14:10:13 -0000	1.112
@@ -746,7 +746,7 @@
 	}
 }
 
-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 @@
 			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 @@
 				} 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");

Index: imuse_digi.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- imuse_digi.h	3 Jan 2004 00:55:40 -0000	1.30
+++ imuse_digi.h	3 Jan 2004 14:10:13 -0000	1.31
@@ -27,7 +27,7 @@
 #include "scumm/music.h"
 #include "sound/mixer.h"
 
-class AudioInputStream;
+class AudioStream;
 
 namespace Scumm {
 
@@ -81,7 +81,7 @@
 		bool used;
 		bool started;
 		PlayingSoundHandle handle;
-		AudioInputStream *stream;
+		AudioStream *stream;
 		
 		Channel();
 	};
@@ -128,7 +128,7 @@
 	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);

Index: player_mod.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/player_mod.h,v
retrieving revision 2.11
retrieving revision 2.12
diff -u -d -r2.11 -r2.12
--- player_mod.h	28 Dec 2003 00:19:56 -0000	2.11
+++ player_mod.h	3 Jan 2004 14:10:13 -0000	2.12
@@ -25,7 +25,7 @@
 
 #include "scumm/scumm.h"
 
-class AudioInputStream;
+class AudioStream;
 class RateConverter;
 
 namespace Scumm {
@@ -61,7 +61,7 @@
 		int8 pan;
 		uint16 freq;
 		RateConverter *converter;
-		AudioInputStream *input;
+		AudioStream *input;
 	};
 
 	SoundMixer *_mixer;

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -d -r1.306 -r1.307
--- sound.cpp	3 Jan 2004 00:55:40 -0000	1.306
+++ sound.cpp	3 Jan 2004 14:10:13 -0000	1.307
@@ -813,7 +813,7 @@
 
 void Sound::startSfxSound(File *file, int file_size, PlayingSoundHandle *handle, int id) {
 
-	AudioInputStream *input;
+	AudioStream *input;
 	
 
 	if (file_size > 0) {