AUDIO: Rename Mixer::playInputStream to playStream

svn-id: r48637

8 files changed, 8 insertions, 8 deletions

diff --git a/sound/audiocd.cpp b/sound/audiocd.cpp
index b579048973..7afbd12d03 100644
--- a/sound/audiocd.cpp
+++ b/sound/audiocd.cpp
@@ -78,7 +78,7 @@ void AudioCDManager::play(int track, int numLoops, int startFrame, int duration,
 			repetitions. Finally, -1 means infinitely many
 			*/
 			_emulating = true;
-			_mixer->playInputStream(Mixer::kMusicSoundType, &_handle,
+			_mixer->playStream(Mixer::kMusicSoundType, &_handle,
 			                        makeLoopingAudioStream(stream, start, end, (numLoops < 1) ? numLoops + 1 : numLoops));
 		} else {
 			_emulating = false;
diff --git a/sound/mixer.cpp b/sound/mixer.cpp
index dab1f6144d..bb4ad469f8 100644
--- a/sound/mixer.cpp
+++ b/sound/mixer.cpp
@@ -212,7 +212,7 @@ void MixerImpl::insertChannel(SoundHandle *handle, Channel *chan) {
 		*handle = chanHandle;
 }
 
-void MixerImpl::playInputStream(
+void MixerImpl::playStream(
 			SoundType type,
 			SoundHandle *handle,
 			AudioStream *input,
diff --git a/sound/mixer.h b/sound/mixer.h
index 92c2a87edb..50702cf8d5 100644
--- a/sound/mixer.h
+++ b/sound/mixer.h
@@ -115,7 +115,7 @@ public:
 	 *                  not stop this particular stream
 	 * @param reverseStereo	a flag indicating whether left and right channels shall be swapped
 	 */
-	virtual void playInputStream(
+	virtual void playStream(
 		SoundType type,
 		SoundHandle *handle,
 		AudioStream *input,
diff --git a/sound/mixer_intern.h b/sound/mixer_intern.h
index 2ccd1ff2bf..014be7abf2 100644
--- a/sound/mixer_intern.h
+++ b/sound/mixer_intern.h
@@ -75,7 +75,7 @@ public:
 
 	virtual bool isReady() const { return _mixerReady; }
 
-	virtual void playInputStream(
+	virtual void playStream(
 		SoundType type,
 		SoundHandle *handle,
 		AudioStream *input,
diff --git a/sound/softsynth/adlib.cpp b/sound/softsynth/adlib.cpp
index c7a14d3f50..6697cef646 100644
--- a/sound/softsynth/adlib.cpp
+++ b/sound/softsynth/adlib.cpp
@@ -918,7 +918,7 @@ int MidiDriver_ADLIB::open() {
 	adlib_write(0xBD, 0x00);
 	create_lookup_table();
 
-	_mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+	_mixer->playStream(Audio::Mixer::kPlainSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
 
 	return 0;
 }
diff --git a/sound/softsynth/fluidsynth.cpp b/sound/softsynth/fluidsynth.cpp
index 57294488a6..c3bd782cc1 100644
--- a/sound/softsynth/fluidsynth.cpp
+++ b/sound/softsynth/fluidsynth.cpp
@@ -144,7 +144,7 @@ int MidiDriver_FluidSynth::open() {
 	MidiDriver_Emulated::open();
 
 	// The MT-32 emulator uses kSFXSoundType here. I don't know why.
-	_mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_handle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+	_mixer->playStream(Audio::Mixer::kMusicSoundType, &_handle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
 	return 0;
 }
 
diff --git a/sound/softsynth/mt32.cpp b/sound/softsynth/mt32.cpp
index 1863ec9c67..8ce8310524 100644
--- a/sound/softsynth/mt32.cpp
+++ b/sound/softsynth/mt32.cpp
@@ -287,7 +287,7 @@ int MidiDriver_MT32::open() {
 	_initialising = false;
 	g_system->fillScreen(0);
 	g_system->updateScreen();
-	_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_handle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+	_mixer->playStream(Audio::Mixer::kSFXSoundType, &_handle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
 	return 0;
 }
 
diff --git a/sound/softsynth/ym2612.cpp b/sound/softsynth/ym2612.cpp
index 2dbf2ec522..e337bc4ab9 100644
--- a/sound/softsynth/ym2612.cpp
+++ b/sound/softsynth/ym2612.cpp
@@ -587,7 +587,7 @@ int MidiDriver_YM2612::open() {
 
 	MidiDriver_Emulated::open();
 
-	_mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
+	_mixer->playStream(Audio::Mixer::kPlainSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, DisposeAfterUse::NO, true);
 	return 0;
 }