aboutsummaryrefslogtreecommitdiff
path: root/sound/mixer.h
diff options
context:
space:
mode:
Diffstat (limited to 'sound/mixer.h')
-rw-r--r--sound/mixer.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/mixer.h b/sound/mixer.h
index 50702cf8d5..65d5d18cc6 100644
--- a/sound/mixer.h
+++ b/sound/mixer.h
@@ -59,7 +59,7 @@ public:
/**
* The main audio mixer handles mixing of an arbitrary number of
- * input audio streams (in the form of AudioStream instances).
+ * audio streams (in the form of AudioStream instances).
*/
class Mixer {
public:
@@ -96,7 +96,7 @@ public:
/**
- * Start playing the given audio input stream.
+ * Start playing the given audio stream.
*
* Note that the sound id assigned below is unique. At most one stream
* with a given id can play at any given time. Trying to play a sound
@@ -105,7 +105,7 @@ public:
* @param type the type (voice/sfx/music) of the stream
* @param handle a SoundHandle which can be used to reference and control
* the stream via suitable mixer methods
- * @param input the actual AudioStream to be played
+ * @param stream the actual AudioStream to be played
* @param id a unique id assigned to this stream
* @param volume the volume with which to play the sound, ranging from 0 to 255
* @param balance the balance with which to play the sound, ranging from -128 to 127
@@ -118,7 +118,7 @@ public:
virtual void playStream(
SoundType type,
SoundHandle *handle,
- AudioStream *input,
+ AudioStream *stream,
int id = -1,
byte volume = kMaxChannelVolume,
int8 balance = 0,